V3.0.7 修正自動預設小客車

app/build.gradle

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

app/release/output-metadata.json

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

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

@@ -36,12 +36,11 @@ public class T02AutoVehicleTypeActivity extends AppCompatActivity {
     private void first(){
         Intent intent = getIntent();
         Bundle bundle = new Bundle();
-        VehicleType vehicleType= new VehicleType("1","自小客");
+        VehicleType vehicleType= new VehicleType("01","自小客");
         bundle.putParcelable("VehicleType",vehicleType);
         intent.putExtras(bundle);
         setResult(RESULT_OK, intent);
         finish();
-
     }
 
 }

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

@@ -122,7 +122,7 @@ public class T02StartActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         // 初始化例外處理器
-        CrashHandlers.getInstance().init(this);
+        CrashHandlers.getInstance().init(this);//Errorlog產生器
 
         dataBinding = DataBindingUtil.setContentView(this, R.layout.activity_t02_start);
         dataBinding.setLifecycleOwner(this);
@@ -187,11 +187,9 @@ public class T02StartActivity extends AppCompatActivity {
         if (blueToothViewModel != null){
             blueToothViewModel.disconnect();
         }
-
         if (t02StartViewModel != null){
             t02StartViewModel.stopTimer();
         }
-
         // 關閉 Activity 前，須將相關附屬的 windows視窗關閉，避免內存洩漏
         if (alertDialogProgress != null){
             alertDialogProgress.dismiss();
@@ -833,7 +831,6 @@ public class T02StartActivity extends AppCompatActivity {
                 }else if(result==0)
                 {
                     t03CumulativeTimeDataBinding.diaCumulativeTimeTextView.setText(simpleDate.format(finalTime2));//兩時間相等
-
                 }
                 //將資料儲存進currentCase
                 tempCase.finalTime =calendar.getTime();
@@ -1160,7 +1157,6 @@ public class T02StartActivity extends AppCompatActivity {
             bundle.putParcelable("Shift", shift);
             intent.putExtras(bundle);
             searchingParkingSpaceActivityResultLauncher.launch(intent);
-
         }else {
             // 無車格，直接進入手動選取車格
             btnParkingSpaceOnClicked();
@@ -1229,10 +1225,10 @@ public class T02StartActivity extends AppCompatActivity {
                     }
                     break;
                 case VEHICLE_BRAND:
-                    if (tempCase.vehicleBrand == null){{
+                    if (tempCase.vehicleBrand == null){
                         index = i;
                         break  outerloop;
-                    }}
+                    }
                 default:
                     break;
             }
@@ -1294,9 +1290,7 @@ public class T02StartActivity extends AppCompatActivity {
         bundle.putInt("UserId", currentUser.id);
         bundle.putParcelable("Shift", shift);
         intent.putExtras(bundle);
-
         gpsSearchModeActivityResultLauncher.launch(intent);
-
     }
 
     private void go2PlateAndSpaceConfirm(BoxInfo boxInfo){

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

@@ -39,7 +39,6 @@ public class T03ListFilesActivity extends AppCompatActivity {
     private int userId;
     private Shift shift;
     private String plateNumber;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -71,7 +70,7 @@ public class T03ListFilesActivity extends AppCompatActivity {
             }
         });
         infoRepository = new InfoRepository(getApplication());
-        // caseAndAllCasePhotos = infoRepository.caseDao.getAllWithCasePhotoByShitAndUserId(shift, userId);
+        //caseAndAllCasePhotos = infoRepository.caseDao.getAllWithCasePhotoByShitAndUserId(shift, userId);
         caseAndAllCasePhotos = infoRepository.getAllCaseWithCasePhotoByShiftAndUserToday(shift, userId);
         caseListAdapter.submitList(caseAndAllCasePhotos);
         dataBinding.rvCaseList.setLayoutManager(new LinearLayoutManager(this));