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/CtrlLightActivity.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlLightActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlLightActivity.java
index dc273ad..c2f772c 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlLightActivity.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlLightActivity.java
@@ -2,8 +2,10 @@
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
+import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -25,10 +27,13 @@
* 璋冨厜妯″潡锛岀户鐢靛櫒妯″潡鎺у埗椤甸潰
*/
public class CtrlLightActivity extends BaseActivity {
- /**Topbar*/
+ /**
+ * Topbar
+ */
private RelativeLayout topBarBack;
private TextView topBarTitle;
- private Button lightBtn;
+ private Button lightBtn, brightnessBtn;
+ private EditText brightnessEt;
private TextView lightText;
private AppliancesInfo appliancesInfo;
private int lightState;
@@ -83,6 +88,8 @@
private void initView() {
lightBtn = findViewById(R.id.ctrlbtn);
lightText = findViewById(R.id.lightText);
+ brightnessBtn = findViewById(R.id.ctrl_brightness);
+ brightnessEt = findViewById(R.id.et_brightness);
}
@@ -92,8 +99,19 @@
@Override
public void onClick(View v) {
HDLCommand.lightCtrl(appliancesInfo, lightState);
- HDLLog.Log("lightBtn: 璁剧疆浜害" + lightState);
-// HDLCommand.lightCtrl(appliancesInfo,50);
+ HDLLog.Log("lightBtn: 寮�鍏崇伅" + lightState);
+ }
+ });
+ brightnessBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String brightnessStr = brightnessEt.getText().toString();
+ if (TextUtils.isEmpty(brightnessStr)) {
+ showToast("璁剧疆鐨勪寒搴︿笉鑳戒负绌�");
+ return;
+ }
+ HDLCommand.lightCtrl(appliancesInfo, Integer.parseInt(brightnessStr));
+ HDLLog.Log("brightnessBtn: 璁剧疆浜害" + brightnessStr);
}
});
}
@@ -105,14 +123,16 @@
case HDLApConfig.TYPE_LIGHT_MIX_DIMMER:
case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
if (appliancesInfo.getCurState() != null) {
- int curLightState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurState());
+ int curLightState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurState());
lightText.setText("褰撳墠鐏厜浜害锛�" + curLightState);
- lightBtn.setText("褰撳墠鐏厜浜害锛�" + curLightState);
- if (curLightState == 100) {
- lightState = 0;
- } else {
+
+ if (curLightState == 0) {
lightState = 100;
+ lightBtn.setText("寮�鐏�");
+ } else {
+ lightState = 0;
+ lightBtn.setText("鍏崇伅");
}
} else {
lightText.setText("鏈幏鍙栧埌鐏厜浜害");
@@ -148,15 +168,22 @@
return;
}
int brightness = event.getLightCtrlBackInfo().getBrightness();
- lightState = brightness == 100 ? 0 : 100;//濡傛灉杩斿洖100閲嶇疆鐘舵�佷负0锛屽弽涔嬮噸缃姸鎬�100
- lightBtn.setText("褰撳墠浜害 = " + brightness);
lightText.setText("褰撳墠浜害 = " + brightness);
+
+ if (brightness == 0) {
+ lightState = 100;
+ lightBtn.setText("寮�鐏�");
+ } else {
+ lightState = 0;
+ lightBtn.setText("鍏崇伅");
+ }
+
/*浠ヤ笅涓虹伅鍏夋帹閫佺ず渚嬩唬鐮侊紝鍙互璇嗗埆鍝釜缁х數鍣紝鍝釜璋冨厜鐏紝鍝釜鍥炶矾锛屼篃鍙敤浣滄帶鍒跺洖棣堛��
鎸夐渶姹傝皟鐢�*/
String remarks = event.getLightCtrlBackInfo().getRemarks();//鑾峰彇杩斿洖鐨勭伅鍏夊娉ㄣ�傚鏋滄瘡涓伅鍏夊洖璺娉ㄩ兘鍞竴锛屽彲浠ョ洿鎺ラ�氳繃澶囨敞鍒ゆ柇
String parentRemarks = event.getLightCtrlBackInfo().getParentRemarks();//鑾峰彇缁х數鍣ㄦ垨璋冨厜鐏娉ㄣ�傝繖閲屽彲浠ョ煡閬撴槸鍝釜璁惧杩斿洖鐨�
int num = event.getLightCtrlBackInfo().getChannelNum();//鑾峰彇鍥炶矾鍙枫�傝繖閲屽彲浠ヨ幏鍙栧埌杩欎釜缁х數鍣ㄦ垨璋冨厜鐏殑鍥炶矾鍙�
- showToast("妯″潡锛�" + parentRemarks + " 鐨� " + remarks + " 鍥炶矾锛屽洖璺彿涓猴細" + num + " 杩斿洖" + " 浜害涓猴細" + brightness);
+ showToast(remarks + " 鍥炶矾锛屽洖璺彿涓猴細" + num + " 杩斿洖" + " 浜害涓猴細" + brightness);
HDLLog.Log("褰撳墠浜害 = " + brightness);
}
}
@@ -182,10 +209,16 @@
showToast("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- int brightness = HDLUtlis.getIntegerByObject(event.getAppliancesInfo().getCurState());
- lightBtn.setText("浜害 = " + brightness);
+ int brightness = HDLUtlis.getIntegerByObject(event.getAppliancesInfo().getCurState());
+ if (brightness == 0) {
+ lightState = 100;
+ lightBtn.setText("寮�鐏�");
+ } else {
+ lightState = 0;
+ lightBtn.setText("鍏崇伅");
+ }
lightText.setText("褰撳墠浜害 = " + brightness);
- showToast("鑾峰彇鐘舵�佽繑鍥烇細浜害 = " + brightness);
+ showToast("鑾峰彇鐘舵�佽繑鍥烇細浜害 = " + brightness);
}
break;
default:
--
Gitblit v1.8.0