From 512cae0fd797fac428f07d9d955f880e9ee353c1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 30 七月 2020 19:45:01 +0800
Subject: [PATCH] 修改人脸显示
---
app/src/main/java/com/basic/security/fragment/SettingFragment.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/basic/security/fragment/SettingFragment.java b/app/src/main/java/com/basic/security/fragment/SettingFragment.java
index fd9f303..a625694 100644
--- a/app/src/main/java/com/basic/security/fragment/SettingFragment.java
+++ b/app/src/main/java/com/basic/security/fragment/SettingFragment.java
@@ -1,5 +1,6 @@
package com.basic.security.fragment;
+import android.content.Intent;
import android.media.MediaPlayer;
import android.text.TextUtils;
import android.view.View;
@@ -40,6 +41,8 @@
@ViewById
public EditText ip;
+ @ViewById
+ public EditText title;
@ViewById
public EditText port;
@ViewById
@@ -96,11 +99,11 @@
public void show() {
saved = false;
initData(SettingManager.getIpStr(), SettingManager.getSecondStr(),
- SettingManager.getAlarmAudioStr(), SettingManager.getPortStr(), SettingManager.getKeepTime(), SettingManager.getKeepTimeType());
+ SettingManager.getAlarmAudioStr(), SettingManager.getPortStr(), SettingManager.getKeepTime(), SettingManager.getKeepTimeType(), SettingManager.getAppTitle());
}
@UiThread
- public void initData(String ipStr, String secondStr, String alarmAudioStr, String portStr, String keepTimeStr, String keepTimeTypeStr) {
+ public void initData(String ipStr, String secondStr, String alarmAudioStr, String portStr, String keepTimeStr, String keepTimeTypeStr, String appTitle) {
if (second != null) {
second.setSelection(getSelectedIndex(secondArray, secondStr));
}
@@ -119,6 +122,9 @@
}
if (portStr != null) {
port.setText(portStr);
+ }
+ if (appTitle != null) {
+ title.setText(appTitle);
}
oldPassword.setText("");
newPassword.setText("");
@@ -348,7 +354,7 @@
return false;
}
- private boolean validateDate() {// 楠岃瘉杈撳叆鐨勪俊鎭槸鍚︽纭�
+ private boolean validateDate() {
String ip = ip_address.getText().toString();
if (ip.equals("") || !ipCheck(ip)) {
ip_address.setFocusable(true);
@@ -390,6 +396,7 @@
String keepTimeTypeStr = keepTimeType.getSelectedItem().toString();
String ipStr = ip.getText().toString().trim();
String portStr = port.getText().toString().trim();
+ String appTitle = title.getText().toString().trim();
String oldPasswordStr = oldPassword.getText().toString().trim();
String newPasswordStr = newPassword.getText().toString().trim();
String newPassword2Str = newPassword2.getText().toString().trim();
@@ -434,6 +441,7 @@
setting.put(Setting.ip, ipStr);
setting.put(Setting.second, secondStr);
setting.put(Setting.port, portStr);
+ setting.put(Setting.appTitle, appTitle);
setting.put(Setting.password, password);
setting.put(Setting.keepTime, keepTimeStr);
setting.put(Setting.keepTimeType, keepTimeTypeStr);
@@ -446,6 +454,13 @@
HomePlayAlarmSound.shouldRestartSound = true;
SocketClient.needRestart = true;
}
+// try {
+// if (Constants.NativeLib) {
+// refreshAddrInfo(mLztek.getEthEnable());
+// }
+// } catch (Exception e){
+// e.printStackTrace();
+// }
}
@Click
@@ -461,5 +476,8 @@
android.os.Process.killProcess(android.os.Process.myPid());
System.exit(0);
}
-
+ @Click
+ public void open_system_setting() {
+ startActivityForResult(new Intent(android.provider.Settings.ACTION_SETTINGS), 0);
+ }
}
--
Gitblit v1.8.0