From 78dbac2e8e7ad58d9e5d6a025de0d6fc58f69146 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 21 十二月 2023 21:17:15 +0800 Subject: [PATCH] 2023年12月21日21:17:08 --- app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 115 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 70 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java index 48627f5..0bc1f2a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -11,21 +11,20 @@ import android.os.IBinder; import android.os.Process; import android.text.TextUtils; -import android.util.Log; import android.view.View; import com.google.gson.Gson; import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.linkpm.sdk.home.type.HomeType; -import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.bean.MqttInfo; +import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding; import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; -import com.hdl.photovoltaic.other.HdlFileLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlMqttLogic; import com.hdl.photovoltaic.other.HdlOtaLogic; @@ -33,9 +32,7 @@ import com.hdl.photovoltaic.other.HdlUniLogic; import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo; import com.hdl.photovoltaic.uni.HDLUniMP; -import com.hdl.photovoltaic.utils.AesUtils; import com.hdl.photovoltaic.utils.AppManagerUtils; -import com.hdl.photovoltaic.utils.Md5Utils; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.common.event.EventListener; @@ -46,18 +43,11 @@ import com.hdl.sdk.link.core.config.HDLLinkConfig; 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.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; - - -import okhttp3.ResponseBody; /** @@ -81,6 +71,7 @@ @Override public void onBindView(Bundle savedInstanceState) { + setNotificationBarBackgroundColor(CustomColor.blue); //鍒濆鍖� initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 @@ -90,6 +81,17 @@ //鍒濆鍖杕qtt瀹㈡埛绔� initMqttClient(); +// HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() { +// @Override +// public void onServiceConnected(ComponentName name, IBinder service) { +// +// } +// +// @Override +// public void onServiceDisconnected(ComponentName name) { +// +// } +// }); } @@ -99,6 +101,7 @@ public void onClick(View v) { currentFragmentIndex = 1; bottomViewChangeOfStyle(); + postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.powerstation); } }); viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() { @@ -106,6 +109,7 @@ public void onClick(View v) { currentFragmentIndex = 2; bottomViewChangeOfStyle(); + postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.message); } }); viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() { @@ -113,6 +117,7 @@ public void onClick(View v) { currentFragmentIndex = 3; bottomViewChangeOfStyle(); + postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.me); } }); @@ -129,7 +134,7 @@ } private void initView() { - viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station); + viewBinding.myPowerStationBottomIl1.titleTv.setText("棣栭〉");// viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message); viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me); this.bottomViewChangeOfStyle(); @@ -170,6 +175,17 @@ } } + /** + * 鍙戝竷鐐瑰嚮浜嬩欢 + * + * @param tabSwitch - + */ + private void postEventBus(HdlCommonLogic.HomepageTitleTabSwitch tabSwitch) { + BaseEventBus baseEventBus = new BaseEventBus(); + baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch); + baseEventBus.setType(tabSwitch + ""); + EventBus.getDefault().post(baseEventBus); + } public void requestPermissions() { String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}); @@ -248,6 +264,7 @@ uniCallBackBaseBean.setType(linkResponse.getTopic()); uniCallBackBaseBean.setData(linkResponse.getData()); HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean); + HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true); } } } @@ -276,48 +293,56 @@ @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMessage(BaseEventBus event) { - //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡 + if (event == null) { return; } if (TextUtils.isEmpty(event.getTopic())) { return; } - String[] topics = event.getTopic().split("/"); - //涓婚涓嶇鍚堣鍒欎笉澶勭悊 - if (topics.length < 3) { - return; - } - int index = -1; - List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(); - for (int i = 0; i < list.size(); i++) { - GatewayBean gatewayBean = list.get(i); - if (gatewayBean.getGatewayId().equals(topics[2])) { - index = i; - break; + //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡 + if (event.getTopic().contains("/custom/mqtt/secret/change")) { + String[] topics = event.getTopic().split("/"); + //涓婚涓嶇鍚堣鍒欎笉澶勭悊 + if (topics.length < 3) { + return; } - } - if (index > -1) { - GatewayBean gatewayBean = list.get(index); - HdlDeviceLogic.getInstance().getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), gatewayBean.getSpk(), gatewayBean.getDevice_mac(), new CloudCallBeak<DeviceRemoteInfo>() { - @Override - public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) { - if (deviceRemoteInfo != null) { - //鏇存柊mqtt閫氳鐨勬柊绉橀挜 - gatewayBean.setAesKey(deviceRemoteInfo.getSecret()); - //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟; - HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴� + int index = -1; + List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(); + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + if (gatewayBean.getGatewayId().equals(topics[2])) { + index = i; + break; + } + } + if (index > -1) { + GatewayBean gatewayBean = list.get(index); + HdlDeviceLogic.getInstance().getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), gatewayBean.getSpk(), gatewayBean.getDevice_mac(), new CloudCallBeak<DeviceRemoteInfo>() { + @Override + public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) { + if (deviceRemoteInfo != null) { + //鏇存柊mqtt閫氳鐨勬柊绉橀挜 + gatewayBean.setAesKey(deviceRemoteInfo.getSecret()); + //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟; + HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴� + } } - } - @Override - public void onFailure(HDLException e) { + @Override + public void onFailure(HDLException e) { - } - }); + } + }); + } + } else if (event.getTopic().contains(HdlOtaLogic.localDownloadProgress)) { + //涓嬭浇浜戠椹卞姩鎴栬�呭浐浠舵枃浠跺埌鏈湴,鑷繁璁$畻杩涘害鏉′笂鎶ュ埌uni閭h竟 + HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); + uniCallBackBaseBean.setType(event.getType()); + uniCallBackBaseBean.setData(event.getData()); + HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean); + HdlLogLogic.print(event.getTopic() + new Gson().toJson(event.getData()), true); } - - } -- Gitblit v1.8.0