From af3480f93219c486f51d6aeac5e910dac8f9c382 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 19 三月 2020 15:51:25 +0800
Subject: [PATCH] 2020-03-19 1.HDLDiyImageVerticalSeekBar 进度修改为从下到上。
---
app/src/main/res/layout/activity_setting.xml | 1 -
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java | 21 ++++++++++++++++++++-
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 6 +++---
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
index 9fe35d5..957b70e 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
@@ -162,8 +162,27 @@
return;
}
proDialog.show();
+// HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴︺��
- HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴︺��
+ switch (gModeState) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴︺��
+ break;
+ case 5:
+ proDialog.dismiss();
+ //褰撳墠鍦扮儹妯″紡涓鸿嚜鍔�
+ showToast("鑷姩妯″紡锛屼笉鑳芥帶鍒舵俯搴�");
+ break;
+ default:
+ proDialog.dismiss();
+ //褰撳墠鍦扮儹妯″紡涓鸿嚜鍔�
+ showToast("鏈煡妯″紡锛屼笉鑳芥帶鍒舵俯搴�");
+ break;
+
+ }
// switch (gModeState) {
//
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 20ea30c..6c98ddb 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -133,7 +133,6 @@
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:gravity="center|left"
- android:inputType="number"
android:hint="SDK澶囨敞"
android:textSize="16dp"
android:text="SDK鐗规畩璁惧"
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
index 129a88e..2ed4b1f 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -405,9 +405,9 @@
* 鎺у埗鍦扮儹妯″潡娓╁害
*
* @param info
- * @param state 2020-03-15
+ * @param tempInt 2020-03-15
*/
- public static void geothermalCtrlTemp(final AppliancesInfo info, int state) {
+ public static void geothermalCtrlTemp(final AppliancesInfo info, int tempInt) {
// HDLDeviceManager.isGeothermalCtrlSuccess = false;
HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
if (geothermalCtrlFailTimer != null) {
@@ -415,7 +415,7 @@
geothermalCtrlFailTimer = null;
}
if (info.getBigType() == Configuration.GEOTHERMAL_BIG_TYPE) {
- byte[] sendbytes = GeothermalParser.getGeothermalAddByteTemp(info, state);
+ byte[] sendbytes = GeothermalParser.getGeothermalAddByteTemp(info, tempInt);
addSendData(info, sendbytes, Configuration.CONTROL);
geothermalCtrlFailTimer = new Timer();
--
Gitblit v1.8.0