From cbdaa0559af3b8ae9c8cf8287d30916d5f81ee3c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 05 十一月 2020 13:56:16 +0800
Subject: [PATCH] 调整showlable
---
app/src/main/java/com/basic/security/activity/MainActivity.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..53cfea5 100644
--- a/app/src/main/java/com/basic/security/activity/MainActivity.java
+++ b/app/src/main/java/com/basic/security/activity/MainActivity.java
@@ -1,10 +1,12 @@
package com.basic.security.activity;
+import android.content.Intent;
import android.media.MediaPlayer;
import android.os.SystemClock;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.view.View;
+import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.MediaController;
@@ -17,8 +19,12 @@
import com.basic.security.base.BaseFragment;
import com.basic.security.fragment.HomeFragment;
import com.basic.security.fragment.SettingFragment;
+import com.basic.security.manager.SettingManager;
+import com.basic.security.service.KeepLifeService;
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;
@@ -47,6 +53,8 @@
public VideoView fullscreenVideoView;
@ViewById
public TextView currentTime;
+ @ViewById
+ public TextView appTitle;
@ViewById
public ImageView exit_fullscreen;
@ViewById
@@ -95,8 +103,10 @@
fragment_home.pullAlarmDataList();
fragment_home.playAlarmSound();
KeyboardUtil.setupUI(fragment_setting.getView());
-// KeyboardUtil.setupUI(mainActivityView);
-// ffmpeg();
+ stopService(new Intent(this, KeepLifeService.class));
+ startService(new Intent(this, KeepLifeService.class));
+
+ appTitle.setText(SettingManager.getAppTitle());
}
@Background
@@ -141,6 +151,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);
@@ -148,8 +166,8 @@
}
public void goto_home() {
- hideOneFragment(fragment_setting);
showOneFragment(fragment_home);
+ hideOneFragment(fragment_setting);
fragment_home.goto_top();
}
@@ -223,7 +241,8 @@
@Override
public void onBackPressed() {
- exit_fullscreen();
+ android.os.Process.killProcess(android.os.Process.myPid());
+ System.exit(0);
}
public boolean notInFullscreenMode() {
@@ -233,4 +252,5 @@
}
return true;
}
+
}
--
Gitblit v1.8.0