diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 065ae3b..d7e7e85 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Message import android.view.KeyEvent +import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.WindowManager @@ -149,16 +150,21 @@ * rtsp流IP地址,默认是192.168.10.137 * */ private fun modifyCameraIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_camera_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_camera_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, value) @@ -172,16 +178,21 @@ * 板子tcp通信IP地址,默认是192.168.10.51 * */ private fun modifySocketIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_socket_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_socket_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, value) diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 065ae3b..d7e7e85 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Message import android.view.KeyEvent +import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.WindowManager @@ -149,16 +150,21 @@ * rtsp流IP地址,默认是192.168.10.137 * */ private fun modifyCameraIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_camera_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_camera_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, value) @@ -172,16 +178,21 @@ * 板子tcp通信IP地址,默认是192.168.10.51 * */ private fun modifySocketIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_socket_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_socket_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, value) diff --git a/app/src/main/res/layout/dialog_input_camera_ip.xml b/app/src/main/res/layout/dialog_input_camera_ip.xml index fbe2a59..718363c 100644 --- a/app/src/main/res/layout/dialog_input_camera_ip.xml +++ b/app/src/main/res/layout/dialog_input_camera_ip.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入安全树视频相机IP地址" + android:hint="安全树视频相机IP地址" android:inputType="textEmailAddress" android:padding="@dimen/dp_10" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 065ae3b..d7e7e85 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Message import android.view.KeyEvent +import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.WindowManager @@ -149,16 +150,21 @@ * rtsp流IP地址,默认是192.168.10.137 * */ private fun modifyCameraIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_camera_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_camera_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, value) @@ -172,16 +178,21 @@ * 板子tcp通信IP地址,默认是192.168.10.51 * */ private fun modifySocketIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_socket_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_socket_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, value) diff --git a/app/src/main/res/layout/dialog_input_camera_ip.xml b/app/src/main/res/layout/dialog_input_camera_ip.xml index fbe2a59..718363c 100644 --- a/app/src/main/res/layout/dialog_input_camera_ip.xml +++ b/app/src/main/res/layout/dialog_input_camera_ip.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入安全树视频相机IP地址" + android:hint="安全树视频相机IP地址" android:inputType="textEmailAddress" android:padding="@dimen/dp_10" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/dialog_input_socket_ip.xml b/app/src/main/res/layout/dialog_input_socket_ip.xml index c923fc0..57fe20c 100644 --- a/app/src/main/res/layout/dialog_input_socket_ip.xml +++ b/app/src/main/res/layout/dialog_input_socket_ip.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入安全树数据通信IP地址" + android:hint="安全树数据通信IP地址" android:inputType="textEmailAddress" android:padding="@dimen/dp_10" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 065ae3b..d7e7e85 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Message import android.view.KeyEvent +import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.WindowManager @@ -149,16 +150,21 @@ * rtsp流IP地址,默认是192.168.10.137 * */ private fun modifyCameraIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_camera_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_camera_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_CAMERA_IP_KEY, value) @@ -172,16 +178,21 @@ * 板子tcp通信IP地址,默认是192.168.10.51 * */ private fun modifySocketIp() { + val oldValue = SaveKeyValues.getValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, "") as String + + val view = LayoutInflater.from(this).inflate(R.layout.dialog_input_socket_ip, null) + val inputView = view.findViewById(R.id.inputView) + if (oldValue != "") { + inputView?.setText(oldValue) + } + AlertDialog.Builder(this) .setTitle(getString(R.string.app_name)) .setIcon(R.mipmap.ic_launcher) - .setView(R.layout.dialog_input_socket_ip) + .setView(view) .setCancelable(false) .setNegativeButton("取消") { _, _ -> } - .setPositiveButton("确定") { dialog, _ -> - val inputView = (dialog as AlertDialog).findViewById( - R.id.inputView - ) + .setPositiveButton("确定") { _, _ -> val value = inputView?.text.toString() if (value.isNotBlank()) { SaveKeyValues.putValue(LocaleConstant.SAFE_TREE_SOCKET_IP_KEY, value) diff --git a/app/src/main/res/layout/dialog_input_camera_ip.xml b/app/src/main/res/layout/dialog_input_camera_ip.xml index fbe2a59..718363c 100644 --- a/app/src/main/res/layout/dialog_input_camera_ip.xml +++ b/app/src/main/res/layout/dialog_input_camera_ip.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入安全树视频相机IP地址" + android:hint="安全树视频相机IP地址" android:inputType="textEmailAddress" android:padding="@dimen/dp_10" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/dialog_input_socket_ip.xml b/app/src/main/res/layout/dialog_input_socket_ip.xml index c923fc0..57fe20c 100644 --- a/app/src/main/res/layout/dialog_input_socket_ip.xml +++ b/app/src/main/res/layout/dialog_input_socket_ip.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@null" - android:hint="请输入安全树数据通信IP地址" + android:hint="安全树数据通信IP地址" android:inputType="textEmailAddress" android:padding="@dimen/dp_10" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/fragment_methane_monitor.xml b/app/src/main/res/layout/fragment_methane_monitor.xml index d6e0aac..9a30cc7 100644 --- a/app/src/main/res/layout/fragment_methane_monitor.xml +++ b/app/src/main/res/layout/fragment_methane_monitor.xml @@ -75,7 +75,6 @@ android:maxLength="4" android:padding="@dimen/dp_5" android:singleLine="true" - android:text="0.1" android:textColor="@color/black" android:textSize="@dimen/sp_16" />