10 年之前 · 9bf6663737
--- a/app/src/main/java/ai/pai/lensman/db/DBService.java
+++ b/app/src/main/java/ai/pai/lensman/db/DBService.java
@@ -226,14 +226,15 @@ public class DBService {
 
                                         + DBHelper.PHOTO_INFO_COLUMNS.CAPTURE_TIME + " desc limit 1 ", null);
              
 
                                 if (c.moveToNext()) {
              
 
                                     photoBean = cursor2PhotoBean(c);
              
 
                -                }else {
              
 
                -                    c = db.rawQuery("select * from " + DBHelper.PHOTO_INFO_TABLE +  " where "
              
 
                -                            + DBHelper.PHOTO_INFO_COLUMNS.UPLOADED_STATUS + " = '" + -1 + "'"+"  order by "
              
 
                -                            + DBHelper.PHOTO_INFO_COLUMNS.CAPTURE_TIME + " desc limit 1 ", null);
              
 
                -                    if (c.moveToNext()) {
              
 
                -                        photoBean = cursor2PhotoBean(c);
              
 
                -                    }
              
 
                                 }
              
 
                +//                else {
              
 
                +//                    c = db.rawQuery("select * from " + DBHelper.PHOTO_INFO_TABLE +  " where "
              
 
                +//                            + DBHelper.PHOTO_INFO_COLUMNS.UPLOADED_STATUS + " = '" + -1 + "'"+"  order by "
              
 
                +//                            + DBHelper.PHOTO_INFO_COLUMNS.CAPTURE_TIME + " desc limit 1 ", null);
              
 
                +//                    if (c.moveToNext()) {
              
 
                +//                        photoBean = cursor2PhotoBean(c);
              
 
                +//                    }
              
 
                +//                }
              
 
                                 db.setTransactionSuccessful();
              
 
                             } catch (Exception e) {
              
 
                                 LogHelper.d(TAG, "dbservice getNextUploadPhotoBean error happen " + e);
              
--- a/app/src/main/java/ai/pai/lensman/service/UploadTask.java
+++ b/app/src/main/java/ai/pai/lensman/service/UploadTask.java
@@ -25,33 +25,35 @@ public class UploadTask extends AsyncTask<Void, Integer, Boolean> {
 
                 
              
 
                     @Override
              
 
                     protected Boolean doInBackground(Void... params) {
              
 
                -        try {
              
 
                -            String dirPath = ai.pai.lensman.utils.Constants.APP_IMAGE_DIR + File.separator + bean.sessionId
              
 
                -                    + File.separator + ai.pai.lensman.utils.Constants.THUMBNAIL_DIR_NAME;
              
 
                -            File dir = new File(dirPath);
              
 
                -            dir.mkdirs();
              
 
                -            File photo = new File(dir, bean.photoName);
              
 
                -            LogHelper.d(TAG, "上传照片 " + bean);
              
 
                -            if (photo.exists() && photo.isFile()) {
              
 
                -                PhotoUploadUtils photoUploadUtils = new PhotoUploadUtils(UrlContainer.PHOTO_UPLOAD_URL + "?timestamp=" + System.currentTimeMillis());
              
 
                -                photoUploadUtils.addFileParameter("photo", photo);
              
 
                -                photoUploadUtils.addTextParameter("user_id", bean.lensmanId);
              
 
                -                photoUploadUtils.addTextParameter("session_id", bean.sessionId);
              
 
                -                photoUploadUtils.addTextParameter("photo_id", String.valueOf(bean.photoId));
              
 
                -                photoUploadUtils.addTextParameter("nickname",Preferences.getInstance().getUserName());
              
 
                +        for(int k = 0 ; k< 5;k++){
              
 
                +            try {
              
 
                +                String dirPath = ai.pai.lensman.utils.Constants.APP_IMAGE_DIR + File.separator + bean.sessionId
              
 
                +                        + File.separator + ai.pai.lensman.utils.Constants.THUMBNAIL_DIR_NAME;
              
 
                +                File dir = new File(dirPath);
              
 
                +                dir.mkdirs();
              
 
                +                File photo = new File(dir, bean.photoName);
              
 
                +                LogHelper.d(TAG, "上传照片 第"+k+"次尝试"+ bean);
              
 
                +                if (photo.exists() && photo.isFile()) {
              
 
                +                    PhotoUploadUtils photoUploadUtils = new PhotoUploadUtils(UrlContainer.PHOTO_UPLOAD_URL + "?timestamp=" + System.currentTimeMillis());
              
 
                +                    photoUploadUtils.addFileParameter("photo", photo);
              
 
                +                    photoUploadUtils.addTextParameter("user_id", bean.lensmanId);
              
 
                +                    photoUploadUtils.addTextParameter("session_id", bean.sessionId);
              
 
                +                    photoUploadUtils.addTextParameter("photo_id", String.valueOf(bean.photoId));
              
 
                +                    photoUploadUtils.addTextParameter("nickname",Preferences.getInstance().getUserName());
              
 
                 
              
 
                -                String result = new String(photoUploadUtils.send(), "UTF-8");
              
 
                -                JSONObject resultObj = new JSONObject(result);
              
 
                -                if (resultObj.getInt("status") == 200) {
              
 
                -                    LogHelper.d(TAG, "上传 UploadTask upload result ok ");
              
 
                -                    return true;
              
 
                +                    String result = new String(photoUploadUtils.send(), "UTF-8");
              
 
                +                    JSONObject resultObj = new JSONObject(result);
              
 
                +                    if (resultObj.getInt("status") == 200) {
              
 
                +                        LogHelper.d(TAG, "上传 UploadTask upload result ok ");
              
 
                +                        return true;
              
 
                +                    }
              
 
                +                } else {
              
 
                +                    return false;
              
 
                                 }
              
 
                -            } else {
              
 
                -                return false;
              
 
                -            }
              
 
                 
              
 
                -        } catch (Exception e) {
              
 
                -            LogHelper.d(TAG, "上传发生异常 UploadTask :" + bean + " error:" + e);
              
 
                +            } catch (Exception e) {
              
 
                +                LogHelper.d(TAG, "上传发生异常 UploadTask :" + bean + " error:" + e);
              
 
                +            }
              
 
                         }
              
 
                         return false;
              
 
                     }
              
--- a/app/src/main/java/ai/pai/lensman/upload/SessionRecyclerAdapter.java
+++ b/app/src/main/java/ai/pai/lensman/upload/SessionRecyclerAdapter.java
@@ -98,14 +98,18 @@ public class SessionRecyclerAdapter extends RecyclerView.Adapter<SessionRecycler
 
                                     error++;
              
 
                                 }
              
 
                             }
              
 
                +            holder.uploadProgressBar.setProgressDrawable(context.getResources().getDrawable(R.drawable.progress_upload_bg));
              
 
                             if(error>0){
              
 
                                 holder.uploadStatus.setText(R.string.upload_error);
              
 
                +                holder.uploadProgressBar.setProgressDrawable(context.getResources().getDrawable(R.drawable.progress_upload_fail_bg));
              
 
                             }else if(uploaded<photoList.size()){
              
 
                                 holder.uploadStatus.setText(R.string.upload_processing);
              
 
                             }else{
              
 
                                 holder.uploadStatus.setText(R.string.upload_success);
              
 
                             }
              
 
                -            holder.uploadProgressBar.setProgress(100*uploaded/photoList.size());
              
 
                +            holder.uploadProgressBar.setMax(photoList.size());
              
 
                +            holder.uploadProgressBar.setProgress(uploaded);
              
 
                +
              
 
                         }
              
 
                         holder.itemView.setOnClickListener(new View.OnClickListener(){
              
 
                             @Override
              
--- a/app/src/main/java/ai/pai/lensman/upload/UploadPresenter.java
+++ b/app/src/main/java/ai/pai/lensman/upload/UploadPresenter.java
@@ -111,10 +111,10 @@ public class UploadPresenter implements UploadContract.Presenter,BaseInteractor.
 
                     @Override
              
 
                     public synchronized void onPhotoUploaded(PhotoBean bean) {
              
 
                         int position = sessionList.size()-bean.sessionSeq;
              
 
                -        LogHelper.d("czy","onPhotoUploaded and notify UI change at "+position);
              
 
                         if(position < 0 || position>=sessionList.size()){
              
 
                             return;
              
 
                         }
              
 
                +        LogHelper.d("czy","onPhotoUploaded and notify UI change at "+position);
              
 
                         SessionBean sessionBean = sessionList.get(position);
              
 
                         ArrayList<PhotoBean> photoList = sessionBean.sessionPhotos;
              
 
                         if(photoList==null || photoList.size()==0){
              
@@ -136,10 +136,10 @@ public class UploadPresenter implements UploadContract.Presenter,BaseInteractor.
 
                     @Override
              
 
                     public synchronized void onPhotoUploadError(PhotoBean bean) {
              
 
                         int position = sessionList.size()-bean.sessionSeq;
              
 
                -        LogHelper.d("czy","onPhotoUploadError and notify UI change at "+position);
              
 
                         if(position < 0 || position>=sessionList.size()){
              
 
                             return;
              
 
                         }
              
 
                +        LogHelper.d("czy","onPhotoUploadError and notify UI change at "+position);
              
 
                         SessionBean sessionBean = sessionList.get(position);
              
 
                         ArrayList<PhotoBean> photoList = sessionBean.sessionPhotos;
              
 
                         if(photoList==null || photoList.size()==0){
              
--- a/app/src/main/res/drawable-xhdpi/progress_bg.png
+++ b/app/src/main/res/drawable-xhdpi/progress_bg.png
--- a/app/src/main/res/drawable-xhdpi/progress_drawable.png
+++ b/app/src/main/res/drawable-xhdpi/progress_drawable.png
--- a/app/src/main/res/drawable-xhdpi/progress_fail_drawable.png
+++ b/app/src/main/res/drawable-xhdpi/progress_fail_drawable.png
--- a/app/src/main/res/drawable/progress_upload_bg.xml
+++ b/app/src/main/res/drawable/progress_upload_bg.xml
@@ -0,0 +1,26 @@
 
                +<?xml version="1.0" encoding="utf-8"?>
              
 
                +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
              
 
                +    <item android:id="@android:id/background">
              
 
                +        <shape>
              
 
                +            <corners android:radius="1px" />
              
 
                +            <solid android:color="@color/dark_grey" />
              
 
                +        </shape>
              
 
                +    </item>
              
 
                +    <item android:id="@android:id/secondaryProgress">
              
 
                +        <clip>
              
 
                +            <shape>
              
 
                +                <corners android:radius="1px" />
              
 
                +                <solid android:color="@color/light_blue" />
              
 
                +            </shape>
              
 
                +        </clip>
              
 
                +    </item>
              
 
                +    <item android:id="@android:id/progress">
              
 
                +        <clip>
              
 
                +            <shape>
              
 
                +                <corners android:radius="1px" />
              
 
                +                <solid android:color="@color/light_blue" />
              
 
                +            </shape>
              
 
                +        </clip>
              
 
                +    </item>
              
 
                +
              
 
                +</layer-list>
              
--- a/app/src/main/res/drawable/progress_upload_fail_bg.xml
+++ b/app/src/main/res/drawable/progress_upload_fail_bg.xml
@@ -0,0 +1,26 @@
 
                +<?xml version="1.0" encoding="utf-8"?>
              
 
                +<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
              
 
                +    <item android:id="@android:id/background">
              
 
                +        <shape>
              
 
                +            <corners android:radius="1px" />
              
 
                +            <solid android:color="@color/dark_grey" />
              
 
                +        </shape>
              
 
                +    </item>
              
 
                +    <item android:id="@android:id/secondaryProgress">
              
 
                +        <clip>
              
 
                +            <shape>
              
 
                +                <corners android:radius="1px" />
              
 
                +                <solid android:color="@color/red" />
              
 
                +            </shape>
              
 
                +        </clip>
              
 
                +    </item>
              
 
                +    <item android:id="@android:id/progress">
              
 
                +        <clip>
              
 
                +            <shape>
              
 
                +                <corners android:radius="1px" />
              
 
                +                <solid android:color="@color/red" />
              
 
                +            </shape>
              
 
                +        </clip>
              
 
                +    </item>
              
 
                +
              
 
                +</layer-list>
              
--- a/app/src/main/res/layout/activity_upload.xml
+++ b/app/src/main/res/layout/activity_upload.xml
@@ -47,6 +47,7 @@
 
                         android:id="@+id/recycler_view_sessions"
              
 
                         android:layout_width="match_parent"
              
 
                         android:layout_height="match_parent"
              
 
                +        android:layout_marginBottom="50dp"
              
 
                         android:layout_below="@id/title_layout"/>
              
 
                 
              
 
                 
              
--- a/app/src/main/res/layout/session_item.xml
+++ b/app/src/main/res/layout/session_item.xml
@@ -39,9 +39,8 @@
 
                             android:id="@+id/pb_session_upload"
              
 
                             android:layout_width="match_parent"
              
 
                             android:layout_height="4dp"
              
 
                -            android:progressDrawable="@drawable/progress_drawable"
              
 
                +            android:progressDrawable="@drawable/progress_upload_bg"
              
 
                             style="?android:attr/progressBarStyleHorizontal"
              
 
                -            android:background="@drawable/progress_bg"
              
 
                             android:layout_marginLeft="10dp"
              
 
                             android:layout_marginRight="10dp"
              
 
                             android:layout_marginBottom="8dp"
              
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,10 +4,12 @@
 
                     <color name="colorPrimaryDark">#2E78E5</color>
              
 
                     <color name="colorAccent">#0BBE06</color>
              
 
                 
              
 
                +    <color name="light_blue">#1E90FF</color>
              
 
                     <color name="white">#ffffffff</color>
              
 
                     <color name="transparent">#00000000</color>
              
 
                     <color name="black">#000000</color>
              
 
                     <color name="grey">#999999</color>
              
 
                +    <color name="red">#FF0000</color>
              
 
                     <color name="text_white">#FFFFFF</color>
              
 
                     <color name="background_white">#FFFFFF</color>
              
 
                     <color name="background_light_grey_color">#F0F0F0</color>