V3.0.1

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdk 27
         targetSdk 30
         versionCode 1
-        versionName "Dev Ver.3.0.0(無車辨)"
+        versionName "Dev Ver.3.0.1(無車辨)"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "Dev Ver.3.0.0(無車辨)",
+      "versionName": "Dev Ver.3.0.1(無車辨)",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/ecom/android/newparkapp/dao/CaseDao.java

@@ -71,6 +71,10 @@ public interface CaseDao {
 
     @Query("SELECT * FROM `case` WHERE billingNumber2 IN (:billingNumber2s)")
     List<Case> loadAllByIds(String[] billingNumber2s);
+
+
+    @Query("SELECT * FROM `case` WHERE billingNumber2 = :newbillingNumber2 ")
+    int caseExists(String newbillingNumber2);
     @Insert
     void insertAll(Case... cases);
 

app/src/main/java/ecom/android/newparkapp/view/T02StartActivity.java

@@ -469,7 +469,16 @@ public class T02StartActivity extends AppCompatActivity {
                 if (photoFile == null) {
                     return;
                 }
-                t02StartViewModel.addNewPhotos(photoFile);
+                //tempCase.caseStatus = CaseStatus.CHANGED;
+
+                if(t02StartViewModel.getCurrentCase().getValue().caseStatus !=CaseStatus.NEW)
+                {
+                    t02StartViewModel.addNewPhotos(photoFile);
+                }
+                else
+                {
+                    Toast.makeText(this, "請於成功開單後再添加照片", Toast.LENGTH_LONG).show();
+                }
             }
         });
 
@@ -1056,8 +1065,6 @@ public class T02StartActivity extends AppCompatActivity {
                 t02StartViewModel.saveCurrentCase(false);
                 dataBinding.btnCancelbill.setEnabled(true);
                 closedatachange();
-
-
             }else {
                 Toast.makeText(this, "請先確認資料後再列印", Toast.LENGTH_LONG).show();
                 return;
@@ -1083,7 +1090,6 @@ public class T02StartActivity extends AppCompatActivity {
                 Toast.makeText(this, "請先連結藍芽印表機裝置", Toast.LENGTH_SHORT).show();
                 return;
             }
-
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle("是否重新列印");
             builder.setNegativeButton("否", new DialogInterface.OnClickListener() {
@@ -1101,7 +1107,6 @@ public class T02StartActivity extends AppCompatActivity {
                     blueToothViewModel.printCase(finalTempCase);
                 }
             });
-
             builder.create().show();
         }
     }

app/src/main/java/ecom/android/newparkapp/viewModel/T02StartViewModel.java

@@ -413,29 +413,31 @@ public class T02StartViewModel extends AndroidViewModel {
         switch (tempCase.caseStatus){
             case NEW:
                 infoRepository.executorService.execute(() -> {
-                    tempCase.caseStatus = CaseStatus.LIST;
-                    infoRepository.caseDao.insertAll(tempCase);
+                    // 检查案件是否已存在 否則新增案件
+                   // if (infoRepository.caseDao.caseExists(tempCase.billingNumber2)>0) {}
+                        tempCase.caseStatus = CaseStatus.LIST;
+                        infoRepository.caseDao.insertAll(tempCase);
+                        for (int i = 0 ; i < tempCasePhoto.size(); i++){
+                            infoRepository.casePhotoDao.insertAll(tempCasePhoto.get(i));
+                        }
+                        tempCasePhoto.clear();
 
-                    for (int i = 0 ; i < tempCasePhoto.size(); i++){
-                        infoRepository.casePhotoDao.insertAll(tempCasePhoto.get(i));
-                    }
-                    tempCasePhoto.clear();
+                        //存進併檔用文字檔
 
-                   //存進併檔用文字檔
+                        Common.writeTXT(getApplication(), tempCase.datePath, tempCase.userDateFileName, tempCase.getDetailString());
+                        updateIdx(tempCase);
 
-                    Common.writeTXT(getApplication(), tempCase.datePath, tempCase.userDateFileName, tempCase.getDetailString());
-                    updateIdx(tempCase);
+                        Common.writeTXT(getApplication(), tempCase.uploadPath, tempCase.getUploadFileName(), tempCase.getDetailString());
 
-                    Common.writeTXT(getApplication(), tempCase.uploadPath, tempCase.getUploadFileName(), tempCase.getDetailString());
+                        // 跳至新單
+                        if (isFinish2New){
+                            currentCase.postValue(newCase());
+                        }
 
-                    // 跳至新單
-                    if (isFinish2New){
-                        currentCase.postValue(newCase());
-                    }
+                        // 加入清單
+                        cases.add(tempCase);
+                        caseCursor.postValue(caseCursor.getValue() + 1);
 
-                    // 加入清單
-                    cases.add(tempCase);
-                    caseCursor.postValue(caseCursor.getValue() + 1);
                 });
                 break;
             case LIST:
@@ -600,13 +602,18 @@ public class T02StartViewModel extends AndroidViewModel {
         if (tempCase.caseStatus != CaseStatus.NEW) {
             tempCase.caseStatus = CaseStatus.CHANGED;
         }
-
         currentCase.setValue(tempCase);
     }
 
     public void addNewPhotos(File photoFile){
-        setNewCasePhoto(photoFile);
-        saveCurrentCase(false);
+        Case tempCase = currentCase.getValue();
+        //tempCase.caseStatus = CaseStatus.CHANGED;
+        if(tempCase.caseStatus!=CaseStatus.NEW)
+        {
+            setNewCasePhoto(photoFile);
+            saveCurrentCase(false);//0524
+        }
+
     }
 
 
@@ -925,7 +932,6 @@ public class T02StartViewModel extends AndroidViewModel {
         String plateNumber = "";
         Bitmap bitmap = BitmapFactory.decodeFile(filePath);
         bitmap = Common.turnPictureDegree(bitmap, filePath);
-
         byte[] imageDataBytes = bitampToByteArray(bitmap);
         BoxInfo[] boxInfos = null;
         boxInfos = EcomALPR.retinaplate_detect(bitmap, imageDataBytes, bitmap.getWidth(), bitmap.getHeight(), threshold, nms_threshold);