From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 22 八月 2024 13:43:47 +0800 Subject: [PATCH] 2024年08月22日13:43:45 --- app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 92 ++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java index 2c34460..37f37a8 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java @@ -8,8 +8,6 @@ import android.util.Log; -import androidx.annotation.Nullable; - import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.hdl.linkpm.sdk.core.exception.HDLException; @@ -21,8 +19,10 @@ import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityCpowerStationBinding; +import com.hdl.photovoltaic.enums.LowerTagType; import com.hdl.photovoltaic.enums.NetworkType; import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlMqttLogic; @@ -36,8 +36,6 @@ import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; import com.hdl.photovoltaic.utils.AppManagerUtils; -import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; -import com.hdl.photovoltaic.widget.ConfirmationTipDialog; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.common.event.EventListener; import com.hdl.sdk.link.core.bean.LinkResponse; @@ -45,13 +43,16 @@ import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.bean.gateway.GatewayBean; import com.hdl.sdk.link.core.config.HDLLinkConfig; -import com.hdl.sdk.link.core.connect.HDLUdpConnect; import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; +import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import cn.jpush.android.api.JPushInterface; @@ -87,25 +88,31 @@ } @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); -// setTheme(R.style.NoAnimationTheme); - } - - @Override protected void onResume() { super.onResume(); //鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱 // AppManagerUtils.getAppManager().finishActivity(StartActivity.class); - this.portConflictDialog(); +// this.portConflictDialog(); } + public void startAppAutomaticallyOpenUni() { - //浣庝簬瀹夊崜14鐗堟湰 - if (android.os.Build.VERSION.SDK_INT < 34) { - startAppAutomaticallyOpenUni(false); - } else { - startAppAutomaticallyOpenUni(true); - } + new Thread(new Runnable() { + @Override + public void run() { + SystemClock.sleep(10); + runOnUiThread(new Runnable() { + @Override + public void run() { + //浣庝簬瀹夊崜14鐗堟湰 + if (android.os.Build.VERSION.SDK_INT < 34) { + startAppAutomaticallyOpenUni(false); + } else { + startAppAutomaticallyOpenUni(true); + } + } + }); + } + }).start(); } @Subscribe(threadMode = ThreadMode.MAIN) @@ -117,7 +124,7 @@ if (TextUtils.isEmpty(event.getTopic())) { return; } - //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡 + //缃戝叧mqtt绉橀挜鏇存柊閫氱煡 if (event.getTopic().contains("/custom/mqtt/secret/change")) { String[] topics = event.getTopic().split("/"); //涓婚涓嶇鍚堣鍒欎笉澶勭悊 @@ -173,6 +180,9 @@ HdlThreadLogic.runSubThread(new Runnable() { @Override public void run() { + //闃叉app鍚姩鐨勬椂鍊欐病鏈夌綉缁�(app涔熺櫥褰曚笉浜�),瀵艰嚧鑾峰彇涓嶄簡mqtt杩滅▼杩炴帴淇℃伅; + initMqttClient(); + HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() { @Override public void onSuccess(List<GatewayBean> obj) { @@ -190,6 +200,24 @@ } else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL) && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK)) { //鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢) killProcessApp(); + } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(event.getType())) { + if (MqttRecvClient.getInstance() != null) { + MqttRecvClient.getInstance().removeAllTopic(); + } + String homeId = event.getData().toString(); + //杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡 + for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).size(); i++) { + String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId).get(i).getGatewayId(); + //瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙f瀽瀛楃涓�,鍙嬁getGatewayId()鍊�; + String topic = "/user/" + gatewayId + "/#"; + //杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰� + MqttRecvClient.getInstance().checkAndsubscribeAllTopics(topic);//璁㈤槄銆愰�嗗彉鍣ㄣ�戞秷鎭� + + } + String topicHome = "/user/" + homeId + "/#"; + MqttRecvClient.getInstance().checkAndsubscribeAllTopics(topicHome);//璁㈤槄銆愮數绔欍�戞秷鎭� + + } } @@ -199,7 +227,7 @@ */ private void startAppAutomaticallyOpenUni(boolean delay) { - if(delay) { + if (delay) { SystemClock.sleep(2000); } List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList(); @@ -329,6 +357,10 @@ * 鍒濆鍖杕qtt瀹㈡埛绔� */ public void initMqttClient() { + //妫�鏌ユ柇寮�鐘舵�� + if (!MqttRecvClient.getInstance().isConnected()) { + MqttRecvClient.getInstance().reConnect(); + } if (!MqttRecvClient.getInstance().isInit()) { HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() { @Override @@ -416,22 +448,4 @@ } - /** - * 绔彛鍐茬獊 - */ - private void portConflictDialog() { - if (!HDLUdpConnect.getInstance().isBindSuccess()) { - ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity); - dialog.show(); - dialog.setTitle(getString(R.string.home_account_registered_successfully)); - dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { - @Override - public void Confirm() { - finish(); - } - }); - } - } - - -} \ No newline at end of file +} -- Gitblit v1.8.0