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

@@ -218,12 +218,15 @@ public class DBService {

                         PhotoBean photoBean = null;
              

                         SQLiteDatabase db = null;
              

                         Cursor c = null;
              

                +        String currentSession = Preferences.getInstance().getCurrentSession();
              

                         synchronized (DB_LOCK) {
              

                             try {
              

                                 db = dbHelper.getReadableDatabase();
              

                                 db.beginTransaction();
              

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

                -                        + DBHelper.PHOTO_INFO_COLUMNS.UPLOADED_STATUS + " = '" + 0 + "'"+"  order by "
              

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

                +                        +" and "+DBHelper.PHOTO_INFO_COLUMNS.SESSION_ID+" <>" +"'"+currentSession
              

                +                        +"'  order by "
              

                                         + DBHelper.PHOTO_INFO_COLUMNS.CAPTURE_TIME + " desc limit 1 ", null);
              

                                 if (c.moveToNext()) {
              

                                     photoBean = cursor2PhotoBean(c);
              

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

@@ -64,6 +64,14 @@ public class Preferences {

                         return mPrefs.getString("mac",NullStr);
              

                     }
              

                 
              

                +    public String getCurrentSession(){
              

                +        return mPrefs.getString("currentSession", NullStr);
              

                +    }
              

                +
              

                +    public void setCurrentSession(String currentSession){
              

                +        mPrefs.edit().putString("currentSession",currentSession).commit();
              

                +    }
              

                +
              

                     public void clearPrefs(){
              

                         mPrefs.edit().clear().commit();
              

                     }
              

app/src/main/java/ai/pai/lensman/session/SessionActivity.java

@@ -106,11 +106,13 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie

                 
              

                     @OnClick(R.id.title_bar_back_layout)
              

                     void backToMain(){
              

                +        presenter.stop();
              

                         finish();
              

                     }
              

                 
              

                     @OnClick(R.id.btn_session_complete)
              

                     void onSessionComplete(){
              

                +        presenter.stop();
              

                         finish();
              

                     }
              

                 
              
@@ -158,4 +160,10 @@ public class SessionActivity extends BaseActivity implements SessionContract.Vie

                             startActivity(new Intent(this, PrinterSettingActivity.class));
              

                         }
              

                     }
              

                +
              

                +    @Override
              

                +    public void onBackPressed() {
              

                +        presenter.stop();
              

                +        super.onBackPressed();
              

                +    }
              

                 }
              

app/src/main/java/ai/pai/lensman/session/SessionPresenter.java

@@ -9,6 +9,7 @@ import ai.pai.lensman.BuildConfig;

                 import ai.pai.lensman.bean.PhotoBean;
              

                 import ai.pai.lensman.bean.SessionBean;
              

                 import ai.pai.lensman.db.DBService;
              

                +import ai.pai.lensman.db.Preferences;
              

                 import ai.pai.lensman.service.UploadService;
              

                 
              

                 
              
@@ -40,11 +41,13 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter

                             }
              

                         }
              

                         interactor.startSession();
              

                +        Preferences.getInstance().setCurrentSession(sessionBean.sessionId);
              

                     }
              

                 
              

                     @Override
              

                     public void stop() {
              

                         interactor.endSession();
              

                +        Preferences.getInstance().setCurrentSession("");
              

                         isWorking = false;
              

                     }