From 071a8328823a2861f93ce556a4da3e4119cab1a3 Mon Sep 17 00:00:00 2001 From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com> Date: 星期四, 19 九月 2024 16:24:28 +0800 Subject: [PATCH] 完成金茂定制功能 --- app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java | 71 ++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java index 3e2a09d..acc6c9d 100644 --- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java +++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java @@ -8,6 +8,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; + import com.hdl.sdk.ttl.HDLAppliances.Config.HDLApConfig; import com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition.Parser.AirCtrlParser; import com.hdl.sdk.ttl.HDLAppliances.HDLCurtain.Parser.CurtainCtrlParser; @@ -27,10 +28,13 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; + import java.util.List; public class CtrlActivity extends BaseActivity { - /**Topbar*/ + /** + * Topbar + */ private RelativeLayout topBarBack; private TextView topBarTitle; private Button lightBtn, curtainBtn, curtainBtn2, curtainBtn3, curtainBtn4, curtainBtn5, @@ -48,11 +52,9 @@ private int airSpeedState; - - - /** * 瑕佹敞鍐屼娇鐢‥ventBus锛岃繖閲屽繀椤昏璁剧疆杩斿洖true + * * @return true */ @Override @@ -146,7 +148,7 @@ if (appliancesInfo.getCurState() != null) { - int curLightState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurState()); + int curLightState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurState()); lightText.setText("褰撳墠鐏厜浜害锛�" + curLightState); lightBtn.setText("褰撳墠鐏厜浜害锛�" + curLightState); @@ -165,6 +167,7 @@ case HDLApConfig.TYPE_CURTAIN_GLYSTRO: case HDLApConfig.TYPE_CURTAIN_ROLLER: case HDLApConfig.TYPE_CURTAIN_MODULE: + case HDLApConfig.TYPE_CURTAIN_SHANGRILA: lightBtn.setVisibility(View.GONE); logicBtn.setVisibility(View.GONE); airDisplay.setVisibility(View.GONE); @@ -183,7 +186,7 @@ if (appliancesInfo.getCurState() != null) { String stringCurtainState = ""; - int curCurtainState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurState()); + int curCurtainState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurState()); HDLLog.Log("curCurtainState = " + curCurtainState); switch (curCurtainState) { case CurtainCtrlParser.TYPE_STATE_PAUSE: @@ -227,6 +230,7 @@ case HDLApConfig.TYPE_AC_HVAC: case HDLApConfig.TYPE_AC_PANEL: case HDLApConfig.TYPE_AC_TECHSYS: + case HDLApConfig.TYPE_AC_KNXTECHSYS: lightBtn.setVisibility(View.GONE); curtainBtn.setVisibility(View.GONE); curtainBtn2.setVisibility(View.GONE); @@ -417,6 +421,7 @@ case HDLApConfig.TYPE_SENSOR_FLOODING: case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET: case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON: + case HDLApConfig.TYPE_SENSOR_PM_10: lightBtn.setVisibility(View.GONE); curtainBtn.setVisibility(View.GONE); curtainBtn2.setVisibility(View.GONE); @@ -482,36 +487,18 @@ } break; case HDLApConfig.TYPE_CURTAIN_GLYSTRO: - //鍒ゆ柇鏄摢涓洖璺殑璁惧 - if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) { - appliancesInfo.setCurState(deviceStateBean.getCurState()); - } - break; case HDLApConfig.TYPE_CURTAIN_ROLLER: - //鍒ゆ柇鏄摢涓洖璺殑璁惧 - if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) { - appliancesInfo.setCurState(deviceStateBean.getCurState()); - } - break; case HDLApConfig.TYPE_CURTAIN_MODULE: + case HDLApConfig.TYPE_CURTAIN_SHANGRILA: //鍒ゆ柇鏄摢涓洖璺殑璁惧 if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) { appliancesInfo.setCurState(deviceStateBean.getCurState()); } break; case HDLApConfig.TYPE_AC_HVAC: - //鍒ゆ柇鏄摢涓洖璺殑璁惧 - if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) { - appliancesInfo.setArrCurState(deviceStateBean.getArrCurState()); - } - break; case HDLApConfig.TYPE_AC_PANEL: - //鍒ゆ柇鏄摢涓洖璺殑璁惧 - if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) { - appliancesInfo.setArrCurState(deviceStateBean.getArrCurState()); - } - break; case HDLApConfig.TYPE_AC_TECHSYS: + case HDLApConfig.TYPE_AC_KNXTECHSYS: //鍒ゆ柇鏄摢涓洖璺殑璁惧 if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) { appliancesInfo.setArrCurState(deviceStateBean.getArrCurState()); @@ -539,7 +526,7 @@ @Override public void onClick(View view) { //绐楀笜妯″潡绗簩涓弬鏁� 涓篊urtainCtrlParser.curtainOn锛孋urtainCtrlParser.curtainOff锛孋urtainCtrlParser.curtainPause鍏朵腑涓�涓� - HDLCommand.curtainCtrl(appliancesInfo, curtainState); + HDLCommand.curtainCtrl(appliancesInfo, curtainState, 0); if (curtainState == CurtainCtrlParser.curtainOn) { curtainState = CurtainCtrlParser.curtainOff; } else { @@ -552,28 +539,28 @@ curtainBtn2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOn); + HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOn, 0); } }); curtainBtn3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOff); + HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOff, 0); } }); curtainBtn4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainPause); + HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainPause, 0); } }); curtainBtn5.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - HDLCommand.curtainCtrl(appliancesInfo, 50); + HDLCommand.curtainCtrl(appliancesInfo, 50, 0); } }); @@ -713,6 +700,7 @@ /** * 鐏厜鎺у埗鍥炶皟Event + * * @param event */ @Subscribe(threadMode = ThreadMode.MAIN) @@ -737,13 +725,14 @@ 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); } } /** * 绐楀笜妯″潡鎺у埗鍥炶皟Event + * * @param event */ @Subscribe(threadMode = ThreadMode.MAIN) @@ -801,6 +790,7 @@ /** * 绌鸿皟妯″潡鎺у埗鍥炶皟Event + * * @param event */ @Subscribe(threadMode = ThreadMode.MAIN) @@ -947,6 +937,7 @@ /** * 閫昏緫妯″潡鎺у埗鍥炶皟Event + * * @param event */ @Subscribe(threadMode = ThreadMode.MAIN) @@ -966,6 +957,7 @@ /** * 鑾峰彇鍗曚竴璁惧鐘舵�佸洖璋僂vent + * * @param event */ @Subscribe(threadMode = ThreadMode.MAIN) @@ -990,6 +982,7 @@ case HDLApConfig.TYPE_CURTAIN_GLYSTRO: case HDLApConfig.TYPE_CURTAIN_ROLLER: case HDLApConfig.TYPE_CURTAIN_MODULE: + case HDLApConfig.TYPE_CURTAIN_SHANGRILA: if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) { if (!event.isSuccess()) { showToast("鑾峰彇绐楀笜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); @@ -1021,6 +1014,7 @@ case HDLApConfig.TYPE_AC_HVAC: case HDLApConfig.TYPE_AC_PANEL: case HDLApConfig.TYPE_AC_TECHSYS: + case HDLApConfig.TYPE_AC_KNXTECHSYS: if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) { if (!event.isSuccess()) { showToast("鑾峰彇绌鸿皟鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); @@ -1462,12 +1456,21 @@ showToast("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite); HDLLog.Log("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite); break; + case HDLApConfig.TYPE_SENSOR_PM_10: + //浼犳劅鍣� pm10 + if (appliancesInfo.getChannelNum() != event.getAppliancesInfo().getChannelNum() || !event.isSuccess()) { + showToast("鑾峰彇浼犳劅鍣�---pm10鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�"); + return; + } + float pm10Value = (float) event.getAppliancesInfo().getCurState(); + String pm10ValueUnit = ((SensorStateBackInfo) event).getUnite(); + showToast("浼犳劅鍣�---pm10锛�" + pm10Value + pm10ValueUnit); + HDLLog.Log("浼犳劅鍣�---pm10锛�" + pm10Value + pm10ValueUnit); + break; } } } - - } -- Gitblit v1.8.0