v3.0.6

更新預設自小客(限自動下一步)

app/release/output-metadata.json

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

app/src/main/AndroidManifest.xml

@@ -100,6 +100,11 @@
             android:exported="false"
             android:screenOrientation="portrait"
             />
+        <activity
+            android:name=".view.T02AutoVehicleTypeActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            />
         <activity
             android:name=".view.T02SelectVehicleColor"
             android:exported="false"

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

+package ecom.android.newparkapp.view;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import java.util.List;
+
+import ecom.android.newparkapp.R;
+import ecom.android.newparkapp.adapter.SelectVehicleTypeAdapter;
+import ecom.android.newparkapp.databinding.ActivityT02SelectVehicleTypeBinding;
+import ecom.android.newparkapp.entity.Case;
+import ecom.android.newparkapp.entity.VehicleType;
+import ecom.android.newparkapp.repository.InfoRepository;
+
+public class T02AutoVehicleTypeActivity extends AppCompatActivity {
+    private ActivityT02SelectVehicleTypeBinding dataBinding;
+    private SelectVehicleTypeAdapter selectVehicleTypeAdapter;
+
+    private InfoRepository infoRepository;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        dataBinding = DataBindingUtil.setContentView(this, R.layout.activity_t02_select_vehicle_type);
+        infoRepository = new InfoRepository(getApplication());
+        infoRepository.vehicleTypeDao.getAllLiveData().observe(this, vehicleTypes -> {selectVehicleTypeAdapter.submitList(vehicleTypes);});
+        dataBinding.rvSelectOption.setLayoutManager(new GridLayoutManager(this,2));
+        dataBinding.rvSelectOption.setAdapter(selectVehicleTypeAdapter);
+        first();
+    }
+    private void first(){
+        Intent intent = getIntent();
+        Bundle bundle = new Bundle();
+        VehicleType vehicleType= new VehicleType("1","自小客");
+        bundle.putParcelable("VehicleType",vehicleType);
+        intent.putExtras(bundle);
+        setResult(RESULT_OK, intent);
+        finish();
+
+    }
+
+}

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

@@ -80,7 +80,6 @@ public class T02PlateAndSpaceConfirmActivity extends AppCompatActivity {
         }catch (NullPointerException nullPointerException){
             nullPointerException.printStackTrace();
         }
-        resetRecyclerView(savedInstanceState);
         plateNumber = boxInfo == null ? null : boxInfo.getPlateNumbs();
         if (userId == -1 || shift == null || location == null ){
             finish();
@@ -106,8 +105,6 @@ public class T02PlateAndSpaceConfirmActivity extends AppCompatActivity {
         dataBinding.rvRenewSpaceOption.setLayoutManager(new GridLayoutManager(this, 2));//
         dataBinding.rvRenewSpaceOption.setAdapter(reNewCandidateSpaceAdapter);
 
-
-
         //
         plateImageInit();
         layoutInit();
@@ -181,7 +178,6 @@ public class T02PlateAndSpaceConfirmActivity extends AppCompatActivity {
             if (road != null){
                 roadString = road.code + " "+ road.name;
             }
-
             dataBinding.btnSelectRoad.setText(roadString);
         });
         t02SelectSpaceViewModel.getCurrentSpace().observe(this, spaces -> {
@@ -194,7 +190,6 @@ public class T02PlateAndSpaceConfirmActivity extends AppCompatActivity {
                 rvSpaceOptionGridLayoutManager.scrollToPosition(index);
             }
         });
-
     }
 
     private void btnSelectRoadOnClicked(){
@@ -220,23 +215,11 @@ public class T02PlateAndSpaceConfirmActivity extends AppCompatActivity {
         keyInPlateNumberActivityResultLauncher.launch(intent);
     }
 
-    private  void resetRecyclerView(Bundle savedInstanceState)
-    {
-        /*// 初始化 RecyclerView
-        recyclerView = findViewById(R.id.rv_space_option);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.setAdapter(new MyAdapter());
 
-        // 如果有保存的状态，则恢复滚动位置
-        if (savedInstanceState != null) {
-            onRestoreInstanceState(savedInstanceState);
-        }*/
-    }
     private void nextStage(Space space){
         boolean isNewCase = false;
         Intent intent = getIntent();
         Bundle bundle = new Bundle();
-
         List<Case> selectedCases = infoRepository.getAllCaseByShitAndUserIdAndPlateNumberAndSpaceIdToday(shift, userId, plateNumber, space.id);
         if (selectedCases.size() == 0){
             // 新單

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

@@ -60,6 +60,7 @@ public class T02SelectSpaceActivity extends AppCompatActivity {
 
 
 
+
     private void eventBinding(){
         dataBinding.btnSelectSpaceBack.setOnClickListener(view -> spaceSelected(null));
 

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

@@ -575,6 +575,15 @@ public class T02StartActivity extends AppCompatActivity {
         intent.setClass(this, T02SelectVehicleTypeActivity.class);
         intent.putExtras(bundle);
         vehicleTypeResultLauncher.launch(intent);
+
+    }
+    private void btnautoVehicleTypeOnClicked() {
+        Intent intent = new Intent();
+        Bundle bundle = new Bundle();
+        intent.setClass(this, T02AutoVehicleTypeActivity.class);
+        intent.putExtras(bundle);
+        vehicleTypeResultLauncher.launch(intent);
+
     }
 
     private void btnTimeNowOnClicked() {
@@ -1097,7 +1106,8 @@ public class T02StartActivity extends AppCompatActivity {
                 Toast.makeText(this, "請先確認資料後再列印", Toast.LENGTH_LONG).show();
                 return;
             }
-            if (blueToothViewModel.getBlueToothStatus().getValue() != BlueToothViewModel.BlueToothStatus.CONNECT_SUCCESS){
+            if (blueToothViewModel.getBlueToothStatus().getValue() != BlueToothViewModel.BlueToothStatus.CONNECT_SUCCESS)
+            {
                 Toast.makeText(this, "請先連結藍芽印表機裝置", Toast.LENGTH_SHORT).show();
                 return;
             }
@@ -1243,8 +1253,9 @@ public class T02StartActivity extends AppCompatActivity {
                 break;
             case VEHICLE_TYPE:
                 if (tempCase.vehicleType == null){
-                    tempCase.vehicleType= new VehicleType("1","自小客");//1130627預設自小客車
-                    autoNext(enable, nextStage);
+                    //tempCase.vehicleType= new VehicleType("1","自小客");//1130627預設自小客車
+                    //autoNext(enable, nextStage);
+                    btnautoVehicleTypeOnClicked();
                     //btnVehicleTypeOnClicked();
                 }else {
                     autoNext(enable, nextStage);

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

@@ -124,7 +124,6 @@ public class T03ListFilesActivity extends AppCompatActivity {
         caseListAdapter.submitList(caseAndAllCasePhotos);
         dataBinding.rvCaseList.setLayoutManager(new LinearLayoutManager(this));
         dataBinding.rvCaseList.setAdapter(caseListAdapter);
-
         caseListAdapter.notifyDataSetChanged();
     }
 }
\ No newline at end of file