app/src/main/java/ai/pai/lensman/bean/PhotoBean.java

@@ -46,6 +46,7 @@ public class PhotoBean implements Serializable{

                                 "photoId=" + photoId +
              

                                 ", photoName='" + photoName + '\'' +
              

                                 ", sessionSeq=" + sessionSeq +
              

                +                ", captureTime=" + captureTime +
              

                                 '}';
              

                     }
              

                 
              

app/src/main/java/ai/pai/lensman/db/DBService.java

@@ -101,7 +101,7 @@ public class DBService {

                     public void addPhotoBean(PhotoBean bean){
              

                         SQLiteDatabase db = null;
              

                         synchronized (DB_LOCK) {
              

                -            LogHelper.d(TAG,"dbservice addUploadPhoto "+bean.photoId);
              

                +            LogHelper.d(TAG,"dbservice addUploadPhoto "+bean);
              

                             try {
              

                                 db = dbHelper.getWritableDatabase();
              

                                 db.beginTransaction();
              
@@ -227,7 +227,7 @@ public class DBService {

                             try {
              

                                 db = dbHelper.getReadableDatabase();
              

                                 db.beginTransaction();
              

                -                long time = (System.currentTimeMillis()-30_1000);
              

                +                long time = (System.currentTimeMillis()-30_000);
              

                                 c = db.rawQuery("select * from " + DBHelper.PHOTO_INFO_TABLE +  " where "
              

                                         + DBHelper.PHOTO_INFO_COLUMNS.UPLOADED_STATUS + " = '" + 0 + "'"
              

                                         +" and "+DBHelper.PHOTO_INFO_COLUMNS.CAPTURE_TIME+" <" +"'"+time
              

app/src/main/java/ai/pai/lensman/service/UploadService.java

@@ -3,7 +3,9 @@ package ai.pai.lensman.service;

                 import android.app.Service;
              

                 import android.content.Intent;
              

                 import android.os.Binder;
              

                +import android.os.Handler;
              

                 import android.os.IBinder;
              

                +import android.os.Message;
              

                 
              

                 import com.android.common.executors.ThreadExecutor;
              

                 import com.android.common.utils.LogHelper;
              
@@ -11,14 +13,22 @@ import com.android.common.utils.LogHelper;

                 import ai.pai.lensman.bean.PhotoBean;
              

                 import ai.pai.lensman.db.DBService;
              

                 
              

                -public class UploadService extends Service implements UploadTask.OnPhotoUploadListener{
              

                +public class UploadService extends Service implements UploadTask.OnPhotoUploadListener,Handler.Callback{
              

                 
              

                     private PhotoBean currentPhoto;
              

                     private PhotoUploadListener listener;
              

                +    private Handler handler;
              

                +    private static final int MSG_TRY_UPLOAD = 4567;
              

                 
              

                     private static final String TAG = "UploadService";
              

                 
              

                     @Override
              

                +    public void onCreate() {
              

                +        super.onCreate();
              

                +        handler = new Handler(this);
              

                +    }
              

                +
              

                +    @Override
              

                     public IBinder onBind(Intent intent) {
              

                         return new MyBinder();
              

                     }
              
@@ -39,8 +49,11 @@ public class UploadService extends Service implements UploadTask.OnPhotoUploadLi

                             LogHelper.d(TAG,"当前有图片正在上传"+currentPhoto);
              

                             return;
              

                         }
              

                +        LogHelper.d(TAG,"查询是否有可以上传的照片，时间="+System.currentTimeMillis());
              

                          currentPhoto = DBService.getInstance().getNextUploadPhoto();
              

                         if(currentPhoto==null){
              

                +            handler.removeMessages(MSG_TRY_UPLOAD);
              

                +            handler.sendEmptyMessageDelayed(MSG_TRY_UPLOAD,2000);
              

                             LogHelper.d(TAG,"本地图片已全部上传");
              

                             return;
              

                         }
              
@@ -78,6 +91,15 @@ public class UploadService extends Service implements UploadTask.OnPhotoUploadLi

                         this.listener = listener;
              

                     }
              

                 
              

                +    @Override
              

                +    public boolean handleMessage(Message message) {
              

                +        if(message.what == MSG_TRY_UPLOAD){
              

                +            startUpload();
              

                +            return true;
              

                +        }
              

                +        return false;
              

                +    }
              

                +
              

                     public interface PhotoUploadListener{
              

                         void onPhotoUploaded(PhotoBean bean);
              

                         void onPhotoUploadError(PhotoBean bean);