From 70658288824174b5ecd8a022ecfc053a19aa292d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 八月 2021 16:36:14 +0800
Subject: [PATCH] 2021-08-10 1.更新
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/FreshAirActivity.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/FreshAirActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/FreshAirActivity.java
index 3169827..12d84e4 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/FreshAirActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/FreshAirActivity.java
@@ -1,6 +1,7 @@
package com.hdl.sdk.hdl_sdk.activity;
+import android.app.ProgressDialog;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
@@ -34,6 +35,8 @@
private int airSpeedState;
private int ctrlId;
+ private ProgressDialog proDialog;
+
/**
* 瑕佹敞鍐屼娇鐢‥ventBus锛岃繖閲岃璁剧疆杩斿洖true
*
@@ -61,6 +64,8 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ proDialog.dismiss();
+ HDLLog.I("onDestroy: FreshAirActivity");
}
private void initcurState() {
@@ -73,7 +78,10 @@
btn_speed = findViewById(com.hdl.sdk.hdl_sdk.R.id.btn_speed);
btn_mode = findViewById(com.hdl.sdk.hdl_sdk.R.id.btn_mode);
-
+ proDialog = new ProgressDialog(this);
+ proDialog.setTitle("姝ｅ湪鍙戦�佹帶鍒跺懡浠�...");
+ proDialog.setMessage("璇疯�愬績绛夊緟");
+ proDialog.onStart();
}
private void initClickOnEvent() {
@@ -81,6 +89,7 @@
btn_switch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ proDialog.show();
ctrlId = FreshAirParser.freshAirSwich;
//婕旂ず褰撳墠鐘舵�佷负鍏筹紝璁剧疆涓哄紑銆傚紑锛岃缃负鍏炽��
if (airSwitchState == 0) {
@@ -97,6 +106,7 @@
btn_speed.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ proDialog.show();
ctrlId = FreshAirParser.freshAirSpeed;
switch (airSpeedState) {
case 0:
@@ -130,6 +140,7 @@
btn_mode.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
+ proDialog.show();
ctrlId = FreshAirParser.freshAirMode;
switch (airModeState) {
case 0:
@@ -142,7 +153,7 @@
break;
case 2:
//鑻ュ綋鍓嶆ā寮忔櫤鑳斤紝鍒欑偣鍑绘寜閽缃负瀹氭椂
- HDLCommand.freshAirCtrl(appliancesInfo, FreshAirParser.freshAirMode, FreshAirParser.freshAirModeAuto);
+ HDLCommand.freshAirCtrl(appliancesInfo, FreshAirParser.freshAirMode, FreshAirParser.freshAirModeTiming);
break;
case 3:
//鑻ュ綋鍓嶆ā寮忓畾鏃讹紝鍒欑偣鍑绘寜閽缃负鎵嬪姩
@@ -218,13 +229,14 @@
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFreshAirFeedBackEventMain(FreshAirFeedBackEvent event) {
+ proDialog.dismiss();
if (event.getFreshAirBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getFreshAirBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getFreshAirBackInfo().getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
) {
//鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
- showToast("绌鸿皟鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
+ showToast("鏂伴鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
}
@@ -245,12 +257,14 @@
}
+ //*********鏍规嵁闇�姹傛樉绀�*********
message += "\n" + "瀹ゅ唴娓╁害锛�" + mFreshAirBackInfo.getInTemp();
message += "\n" + "瀹ゅ娓╁害锛�" + mFreshAirBackInfo.getOutTemp();
message += "\n" + "瀹ゅ唴婀垮害锛�" + mFreshAirBackInfo.getHumidty();
message += "\n" + "PM2.5锛�" + mFreshAirBackInfo.getInTemp();
message += "\n" + "TVOC锛�" + mFreshAirBackInfo.getInTemp();
message += "\n" + "CO2锛�" + mFreshAirBackInfo.getInTemp();
+ //*********鏍规嵁闇�姹傛樉绀�*********
mTextView.setText(message);
showToast(message);
@@ -260,6 +274,7 @@
@Subscribe(threadMode = ThreadMode.MAIN)
public void onDeviceStateEventMain(DeviceStateEvent event) {
+ proDialog.dismiss();
if (event.getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
) {
@@ -278,15 +293,20 @@
return;
}
- message += "\n" + getSwichStateString(mFreshAirBackInfo.getIsOn());
- message += "\n" + getSpeedStateString(mFreshAirBackInfo.getFreshAirSpeed());
- message += "\n" + getModeStateString(mFreshAirBackInfo.getFreshAirMode());
- message += "\n" + "瀹ゅ唴娓╁害锛�" + mFreshAirBackInfo.getInTemp();
- message += "\n" + "瀹ゅ娓╁害锛�" + mFreshAirBackInfo.getOutTemp();
- message += "\n" + "瀹ゅ唴婀垮害锛�" + mFreshAirBackInfo.getHumidty();
- message += "\n" + "PM2.5锛�" + mFreshAirBackInfo.getInTemp();
- message += "\n" + "TVOC锛�" + mFreshAirBackInfo.getInTemp();
- message += "\n" + "CO2锛�" + mFreshAirBackInfo.getInTemp();
+ if(mFreshAirBackInfo.getIsOn() == FreshAirParser.freshAirOn) {
+ message = getSwichStateString(mFreshAirBackInfo.getIsOn());
+ message += "\n" + getSpeedStateString(mFreshAirBackInfo.getFreshAirSpeed());
+ message += "\n" + getModeStateString(mFreshAirBackInfo.getFreshAirMode());
+
+ message += "\n" + "瀹ゅ唴娓╁害锛�" + mFreshAirBackInfo.getInTemp();
+ message += "\n" + "瀹ゅ娓╁害锛�" + mFreshAirBackInfo.getOutTemp();
+ message += "\n" + "瀹ゅ唴婀垮害锛�" + mFreshAirBackInfo.getHumidty();
+ message += "\n" + "PM2.5锛�" + mFreshAirBackInfo.getInTemp();
+ message += "\n" + "TVOC锛�" + mFreshAirBackInfo.getInTemp();
+ message += "\n" + "CO2锛�" + mFreshAirBackInfo.getInTemp();
+ }else {
+ message = getSwichStateString(mFreshAirBackInfo.getIsOn());
+ }
mTextView.setText(message);
showToast(message);
@@ -335,16 +355,16 @@
airSpeedState = mState; //鏇存柊褰撳墠椋庨�熺姸鎬�
switch (mState) {
case FreshAirParser.freshAirSpeedOff:
- mStrState = " 椋庨�燂細鍏�";
+ mStrState = "椋庨�燂細鍏�";
break;
case FreshAirParser.freshAirSpeedLow:
- mStrState = " 椋庨�燂細浣�";
+ mStrState = "椋庨�燂細浣�";
break;
case FreshAirParser.freshAirSpeedMid:
- mStrState = " 椋庨�燂細涓�";
+ mStrState = "椋庨�燂細涓�";
break;
case FreshAirParser.freshAirSpeedHigh:
- mStrState = " 椋庨�燂細楂�";
+ mStrState = "椋庨�燂細楂�";
break;
default:
@@ -365,16 +385,16 @@
airModeState = mState; //鏇存柊妯″紡鐘舵��
switch (mState) {
case FreshAirParser.freshAirModeManual:
- mStrState = " 妯″紡锛氭墜鍔�";
+ mStrState = "妯″紡锛氭墜鍔�";
break;
case FreshAirParser.freshAirModeAuto:
- mStrState = " 妯″紡锛氳嚜鍔�";
+ mStrState = "妯″紡锛氳嚜鍔�";
break;
case FreshAirParser.freshAirModeIntelligent:
- mStrState = " 妯″紡锛氭櫤鑳�";
+ mStrState = "妯″紡锛氭櫤鑳�";
break;
case FreshAirParser.freshAirModeTiming:
- mStrState = " 妯″紡锛氬畾鏃�";
+ mStrState = "妯″紡锛氬畾鏃�";
break;
default:
--
Gitblit v1.8.0