upload UI
chengzhenyu
3 changed files with 8 additions and 6 deletions
+ 3
- 2
app/src/main/java/ai/pai/lensman/session/SessionInteractor.java
@@ -15,6 +15,7 @@ import java.net.HttpURLConnection; |
||
| 15 | 15 |
import java.net.URL; |
| 16 | 16 |
import java.util.ArrayList; |
| 17 | 17 |
import java.util.HashMap; |
| 18 |
+import java.util.Random; |
|
| 18 | 19 |
import java.util.Timer; |
| 19 | 20 |
import java.util.TimerTask; |
| 20 | 21 |
|
@@ -57,7 +58,7 @@ public class SessionInteractor {
|
||
| 57 | 58 |
cancelTask(sessionStartTask); |
| 58 | 59 |
HashMap<String,String> params = new HashMap<>(); |
| 59 | 60 |
params.put("lensman",sessionBean.lensmanId);
|
| 60 |
- params.put("session",sessionBean.sessionId);
|
|
| 61 |
+ params.put("session",sessionBean.sessionId+"_"+new Random().nextInt(123456));
|
|
| 61 | 62 |
sessionStartTask = new HttpPostTask(params){
|
| 62 | 63 |
@Override |
| 63 | 64 |
protected boolean parseResponse(String response) {
|
@@ -101,7 +102,7 @@ public class SessionInteractor {
|
||
| 101 | 102 |
public void run() {
|
| 102 | 103 |
fetchThumbnailTask(); |
| 103 | 104 |
} |
| 104 |
- },1000,100); |
|
| 105 |
+ },1000,1000); |
|
| 105 | 106 |
} |
| 106 | 107 |
|
| 107 | 108 |
private void fetchThumbnailTask(){
|
+ 2
- 1
app/src/main/java/ai/pai/lensman/session/SessionPresenter.java
@@ -52,7 +52,8 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter |
||
| 52 | 52 |
|
| 53 | 53 |
@Override |
| 54 | 54 |
public void onSessionStartError(String session) {
|
| 55 |
- sessionView.showToast("session启动失败");
|
|
| 55 |
+ sessionView.showToast("session启动失败,自动重试中");
|
|
| 56 |
+ interactor.startSession(); |
|
| 56 | 57 |
} |
| 57 | 58 |
|
| 58 | 59 |
@Override |
+ 3
- 3
app/src/main/java/ai/pai/lensman/upload/SessionRecyclerAdapter.java
@@ -100,12 +100,12 @@ public class SessionRecyclerAdapter extends RecyclerView.Adapter<SessionRecycler |
||
| 100 | 100 |
} |
| 101 | 101 |
holder.uploadProgressBar.setProgressDrawable(context.getResources().getDrawable(R.drawable.progress_upload_bg)); |
| 102 | 102 |
if(error>0){
|
| 103 |
- holder.uploadStatus.setText(R.string.upload_error); |
|
| 103 |
+ holder.uploadStatus.setText("("+uploaded+"/"+photoList.size()+") "+context.getString(R.string.upload_error));
|
|
| 104 | 104 |
holder.uploadProgressBar.setProgressDrawable(context.getResources().getDrawable(R.drawable.progress_upload_fail_bg)); |
| 105 | 105 |
}else if(uploaded<photoList.size()){
|
| 106 |
- holder.uploadStatus.setText(R.string.upload_processing); |
|
| 106 |
+ holder.uploadStatus.setText("("+uploaded+"/"+photoList.size()+") "+context.getString(R.string.upload_processing));
|
|
| 107 | 107 |
}else{
|
| 108 |
- holder.uploadStatus.setText(R.string.upload_success); |
|
| 108 |
+ holder.uploadStatus.setText("("+uploaded+"/"+photoList.size()+") "+context.getString(R.string.upload_success));
|
|
| 109 | 109 |
} |
| 110 | 110 |
holder.uploadProgressBar.setMax(photoList.size()); |
| 111 | 111 |
holder.uploadProgressBar.setProgress(uploaded); |