From 145de2dcd3124f236e7d06bcdee17c7be08048b1 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期一, 11 十一月 2024 18:34:13 +0800
Subject: [PATCH] 修改搜索按照index索引
---
app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AddDevicesManuallyActivity.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AddDevicesManuallyActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AddDevicesManuallyActivity.java
index 461fe27..cb1e581 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AddDevicesManuallyActivity.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/AddDevicesManuallyActivity.java
@@ -2,7 +2,6 @@
import android.os.Bundle;
-import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.View;
import android.widget.AdapterView;
@@ -12,6 +11,8 @@
import android.widget.RelativeLayout;
import android.widget.Spinner;
import android.widget.TextView;
+
+import androidx.annotation.NonNull;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
@@ -35,11 +36,12 @@
private EditText subnetIDEditText;
private EditText deviceIDEditText;
private EditText channelNumEditText;
+ private EditText indexEditText;
private EditText remarksEditText;
private Button addButton;
-// private String subnetIDStr, deviceIDStr, channelNumStr, remarksStr;
- private int subnetID, deviceID, channelNum;
- private String remarksStr;
+ // private String subnetIDStr, deviceIDStr, channelNumStr, remarksStr;
+ private int subnetID, deviceID, channelNum, index;
+ private String remarksStr;
private int deviceTypeId = 0;
private static final String[] deviceTypeItems = {"瀹夐槻妯″潡", "闊充箰妯″潡", "浼犳劅鍣ㄦā鍧�"};
@@ -76,6 +78,7 @@
subnetIDEditText = findViewById(R.id.et_subnetID);
deviceIDEditText = findViewById(R.id.et_deviceID);
channelNumEditText = findViewById(R.id.et_channelNum);
+ indexEditText = findViewById(R.id.et_index);
remarksEditText = findViewById(R.id.et_remarks);
addButton = findViewById(R.id.btn_add);
@@ -124,24 +127,24 @@
boolean isSuccess = false;
if (deviceTypeId == 0) {
- isSuccess = HDLDeviceManager.addSecurityDevicesManually(subnetID, deviceID, channelNum, remarksStr);
- } else if(deviceTypeId == 1) {
- isSuccess = HDLDeviceManager.addAudioDevicesManually(subnetID, deviceID, channelNum, remarksStr);
- }else {
+ isSuccess = HDLDeviceManager.addSecurityDevicesManually(subnetID, deviceID, channelNum, index, remarksStr);
+ } else if (deviceTypeId == 1) {
+ isSuccess = HDLDeviceManager.addAudioDevicesManually(subnetID, deviceID, channelNum, index, remarksStr);
+ } else {
//鎸囧畾澶х被鍜屽皬绫诲弬鏁� 鍖哄垎妯″潡绫诲瀷
- isSuccess = HDLDeviceManager.addDevicesManuallyWithoutSearching(Configuration.SENSOR_BIG_TYPE,11 ,subnetID, deviceID, channelNum, remarksStr);
+ isSuccess = HDLDeviceManager.addDevicesManuallyWithoutSearching(Configuration.SENSOR_BIG_TYPE, 11, subnetID, deviceID, channelNum, index, remarksStr);
}
- if(isSuccess){
+ if (isSuccess) {
showToast("娣诲姞鎴愬姛");
finish();
- }else {
+ } else {
showToast("娣诲姞澶辫触");
}
}
- private void addButtonAction(){
- String subnetIDStr = subnetIDEditText.getText().toString();
+ private void addButtonAction() {
+ String subnetIDStr = subnetIDEditText.getText().toString();
if (TextUtils.isEmpty(subnetIDStr)) {
showToast("瀛愮綉鍙蜂笉鑳戒负绌�");
return;
@@ -159,6 +162,12 @@
return;
}
+ String indexStr = indexEditText.getText().toString();
+ if (TextUtils.isEmpty(indexStr)) {
+ showToast("搴忓垪鍙蜂笉鑳戒负绌�");
+ return;
+ }
+
String remarksString = remarksEditText.getText().toString();
if (TextUtils.isEmpty(remarksString)) {
showToast("澶囨敞涓嶈兘涓虹┖");
@@ -166,20 +175,21 @@
}
- subnetID = Integer.parseInt(subnetIDStr);
- deviceID = Integer.parseInt(deviceIDStr);
- channelNum = Integer.parseInt(channelNumStr);
- remarksStr = remarksString;
- String mes = "";
+ subnetID = Integer.parseInt(subnetIDStr);
+ deviceID = Integer.parseInt(deviceIDStr);
+ channelNum = Integer.parseInt(channelNumStr);
+ index = Integer.parseInt(indexStr);
+ remarksStr = remarksString;
+ String mes = "";
mes = "璁惧绫诲瀷锛�" + deviceTypeItems[deviceTypeId];
- mes += "\n瀛愮綉鍙凤細" + subnetIDStr +"\n璁惧鍙凤細" + deviceIDStr +"\n鍥炶矾鍙凤細" + channelNumStr +"\n澶囨敞鍚嶏細" + remarksStr;
+ mes += "\n瀛愮綉鍙凤細" + subnetIDStr + "\n璁惧鍙凤細" + deviceIDStr + "\n鍥炶矾鍙凤細" + channelNumStr + "\n搴忓垪鍙凤細" + indexStr + "\n澶囨敞鍚嶏細" + remarksStr;
showTipDialog(mes);
}
private void showTipDialog(String message) {
- MaterialDialog mMaterialDialog = new MaterialDialog.Builder(this)
+ MaterialDialog mMaterialDialog = new MaterialDialog.Builder(this)
.title("鏄惁纭畾娣诲姞璇ヨ澶囷紵")
.content(message)
.positiveText(R.string.ok)
@@ -198,7 +208,6 @@
}).build();
mMaterialDialog.show();
}
-
}
--
Gitblit v1.8.0