From e6a8bdd23d6f5cb46ac650285829573280edcdf6 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 15 七月 2019 16:51:11 +0800
Subject: [PATCH] a
---
app/src/main/java/com/basic/security/activity/MainActivity.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/basic/security/activity/MainActivity.java b/app/src/main/java/com/basic/security/activity/MainActivity.java
index 3406507..cf9c539 100644
--- a/app/src/main/java/com/basic/security/activity/MainActivity.java
+++ b/app/src/main/java/com/basic/security/activity/MainActivity.java
@@ -19,6 +19,8 @@
import com.basic.security.fragment.SettingFragment;
import com.basic.security.utils.FFmpeg;
import com.basic.security.utils.KeyboardUtil;
+import com.basic.security.utils.LztekAndroidRoot;
+import com.basic.security.widget.AuthDialog;
import com.basic.security.widget.MyMediaController;
import com.bumptech.glide.Glide;
@@ -95,8 +97,6 @@
fragment_home.pullAlarmDataList();
fragment_home.playAlarmSound();
KeyboardUtil.setupUI(fragment_setting.getView());
-// KeyboardUtil.setupUI(mainActivityView);
-// ffmpeg();
}
@Background
@@ -141,6 +141,14 @@
@Click
public void goto_setting() {
+ if (currentFragment == fragment_home) {
+// do_goto_setting();
+ AuthDialog authDialog = new AuthDialog(this);
+ authDialog.show();
+ }
+ }
+
+ public void do_goto_setting() {
exit_fullscreen();
hideOneFragment(fragment_home);
showOneFragment(fragment_setting);
@@ -223,7 +231,8 @@
@Override
public void onBackPressed() {
- exit_fullscreen();
+ android.os.Process.killProcess(android.os.Process.myPid());
+ System.exit(0);
}
public boolean notInFullscreenMode() {
@@ -233,4 +242,5 @@
}
return true;
}
+
}
--
Gitblit v1.8.0