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