Procházet zdrojové kódy

1.重写首页柜子展示,由于代码质量太低导致各种无法控制的BUG
2.修复诸多小BUG

JaycePC před 2 týdny
rodič
revize
8aef434540
2 změnil soubory, kde provedl 2 přidání a 18 odebrání
  1. 1 1
      app/build.gradle
  2. 1 17
      app/src/main/java/xn/hxp/ui/MainActivity.java

+ 1 - 1
app/build.gradle

@@ -13,7 +13,7 @@ android {
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdk 28
         versionCode 1
-        versionName "2.2"
+        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true

+ 1 - 17
app/src/main/java/xn/hxp/ui/MainActivity.java

@@ -59,7 +59,6 @@ import xn.hxp.ui.login.FacialCardActivity;
 import xn.hxp.ui.login.ScanLoginActivity;
 import xn.hxp.ui.login.SwipeActivity;
 import xn.hxp.ui.plan.PlanAddActivity;
-import xn.hxp.ui.plan.already.AlreadyActivity;
 import xn.hxp.ui.still.ChemicalsAlsoActivity;
 import xn.hxp.ui.still.MsdsActivity;
 import xn.hxp.ui.uses.UseActivity;
@@ -70,7 +69,6 @@ import xn.hxp.utils.SharedPreferencesHelper;
 import xn.hxp.utils.TimeUpdater;
 import xn.hxp.utils.UiManager;
 import xn.hxp.weidith.CustomDialog;
-import xn.hxp.weidith.PlanDialog;
 
 public class MainActivity extends BaseActivity {
 
@@ -86,7 +84,6 @@ public class MainActivity extends BaseActivity {
     private int MAX_TIME = 60;
     private static final int WHAT_COUNT_DOWN = 1;
     private TimeTickReceiver timeTickReceiver = new TimeTickReceiver();
-    private PlanDialog planDialog;
     private CountDownTimer heartbeatCdTimer;
 
     @Override
@@ -434,20 +431,7 @@ public class MainActivity extends BaseActivity {
                 //新增
                 if (ChemicalApp.userData != null) {
                     if (ChemicalApp.administrators || ChemicalApp.responsibles) {
-                        planDialog = new PlanDialog(MainActivity.this, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                UiManager.INSTANCE.switcher(MainActivity.this, AlreadyActivity.class);
-                                planDialog.dismiss();
-                            }
-                        }, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                UiManager.INSTANCE.switcher(MainActivity.this, PlanAddActivity.class);
-                                planDialog.dismiss();
-                            }
-                        });
-                        planDialog.show();
+                        UiManager.INSTANCE.switcher(MainActivity.this, PlanAddActivity.class);
                     } else {
                         customDialogView(2, "当前人员无权限");
                     }