From 52f8575a2fa0590c28b5d784399c51a8af2f790a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 二月 2020 15:26:04 +0800
Subject: [PATCH] 2020-2-28 1.增加小类是3的音乐播放器支持
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java | 109 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 49 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 740955b..f474c9a 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
@@ -150,7 +150,7 @@
public void onClick(View view) {
String tempStr = tempEditText.getText().toString();
- if (TextUtils.isEmpty(tempStr) || TextUtils.isEmpty(tempStr)) {
+ if (TextUtils.isEmpty(tempStr)) {
showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
return;
}
@@ -309,41 +309,43 @@
showToast("鍦扮儹妯″潡,杩斿洖鏁版嵁涓虹┖");
return;
}
-
- String message = "";
GeothermalBackInfo mGeothermalBackInfo = event.getGeothermalBackInfo();
+ showGeothermalBackInfo(mGeothermalBackInfo);
- switch (ctrlId) { //ctrlId 褰撳墠鎺у埗绫诲瀷,鍙弽棣堟帶鍒剁殑鐘舵��
- case GeothermalParser.gSwich:
- message = getSwichStateString(mGeothermalBackInfo.getIsOn());
- break;
- case GeothermalParser.gMode:
- message = getModeStateString(mGeothermalBackInfo.getgMode());
- break;
- case GeothermalParser.gNormalTemp:
-// gTempState = mGeothermalBackInfo.getgNormalTemp();
- message = "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
- break;
+// String message = "";
+// GeothermalBackInfo mGeothermalBackInfo = event.getGeothermalBackInfo();
-
- case GeothermalParser.gDayTemp:
- message = "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
- break;
- case GeothermalParser.gNightTemp:
- message = "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
- break;
- case GeothermalParser.gLeaveTemp:
- message = "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
- break;
- default:
- break;
-
- }
-
-
- mTextView.setText(message);
- showToast(message);
- HDLLog.I(message);
+// switch (ctrlId) { //ctrlId 褰撳墠鎺у埗绫诲瀷,鍙弽棣堟帶鍒剁殑鐘舵��
+// case GeothermalParser.gSwich:
+// message = getSwichStateString(mGeothermalBackInfo.getIsOn());
+// break;
+// case GeothermalParser.gMode:
+// message = getModeStateString(mGeothermalBackInfo.getgMode());
+// break;
+// case GeothermalParser.gNormalTemp:
+//// gTempState = mGeothermalBackInfo.getgNormalTemp();
+// message = "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
+// break;
+//
+//
+// case GeothermalParser.gDayTemp:
+// message = "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
+// break;
+// case GeothermalParser.gNightTemp:
+// message = "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
+// break;
+// case GeothermalParser.gLeaveTemp:
+// message = "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
+// break;
+// default:
+// break;
+//
+// }
+//
+//
+// mTextView.setText(message);
+// showToast(message);
+// HDLLog.I(message);
}
}
@@ -369,26 +371,35 @@
return;
}
- if(mGeothermalBackInfo.getIsOn() == GeothermalParser.gSwichOn) {
- message = getSwichStateString(mGeothermalBackInfo.getIsOn());
-
- message += "\n" + getModeStateString(mGeothermalBackInfo.getgMode());
- message += "\n" + "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
- message += "\n" + "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
- message += "\n" + "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
- message += "\n" + "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
- }else {
- message = getSwichStateString(mGeothermalBackInfo.getIsOn());
- }
-
-
- mTextView.setText(message);
- showToast(message);
- HDLLog.I(message);
+ showGeothermalBackInfo(mGeothermalBackInfo);
}
break;
}
}
}
+
+ /**
+ * showGeothermalBackInfo
+ * @param mGeothermalBackInfo
+ */
+ private void showGeothermalBackInfo(GeothermalBackInfo mGeothermalBackInfo){
+ String message = "";
+ if(mGeothermalBackInfo.getIsOn() == GeothermalParser.gSwichOn) {
+ message = getSwichStateString(mGeothermalBackInfo.getIsOn());
+
+ message += "\n" + getModeStateString(mGeothermalBackInfo.getgMode());
+ message += "\n" + "鏅�氭ā寮忔俯搴︼細" + mGeothermalBackInfo.getgNormalTemp();
+ message += "\n" + "鐧藉ぉ妯″紡娓╁害锛�" + mGeothermalBackInfo.getgDayTemp();
+ message += "\n" + "澶滈棿妯″紡娓╁害锛�" + mGeothermalBackInfo.getgNightTemp();
+ message += "\n" + "绂诲紑妯″紡娓╁害锛�" + mGeothermalBackInfo.getgLeaveTemp();
+ }else {
+ message = getSwichStateString(mGeothermalBackInfo.getIsOn());
+ }
+
+
+ mTextView.setText(message);
+ showToast(message);
+ HDLLog.I(message);
+ }
}
--
Gitblit v1.8.0