| app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/build.gradle
@@ -183,6 +183,8 @@ //若不集成厂商通道，可直接跳过以下依赖 // 极光厂商插件版本与接入 JPush 版本保持一致，下同 // 接入华为厂商 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -5,27 +5,12 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.enums.MessageStateType; import com.hdl.photovoltaic.jpush.JPushMessageInfoBean; import com.hdl.photovoltaic.ui.CPowerStationActivity; import com.hdl.photovoltaic.ui.MyPowerStationActivity; import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.photovoltaic.ui.me.AccountAndSecurityActivity; import com.hdl.photovoltaic.ui.me.AsRegardsActivity; import com.hdl.photovoltaic.ui.me.BindMailActivity; import com.hdl.photovoltaic.ui.me.BindPhoneActivity; import com.hdl.photovoltaic.ui.me.MeChangePasswordActivity; import com.hdl.photovoltaic.ui.me.PersonalDataActivity; import com.hdl.photovoltaic.ui.me.SetActivity; import com.hdl.photovoltaic.ui.me.TemperatureUnitActivity; import com.hdl.photovoltaic.ui.me.WebActivity; import com.hdl.photovoltaic.ui.me.languageSelectionActivity; import com.hdl.photovoltaic.ui.newC.MessageCenterList; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.AppManagerUtils; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import org.greenrobot.eventbus.EventBus; app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -93,6 +93,7 @@ // AppManagerUtils.getAppManager().finishActivity(StartActivity.class); // this.portConflictDialog(); } public void startAppAutomaticallyOpenUni() { new Thread(new Runnable() { @Override @@ -122,7 +123,7 @@ if (TextUtils.isEmpty(event.getTopic())) { return; } //网关更新mqtt秘钥更新通知 //网关mqtt秘钥更新通知 if (event.getTopic().contains("/custom/mqtt/secret/change")) { String[] topics = event.getTopic().split("/"); //主题不符合规则不处理 @@ -178,6 +179,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) { @@ -204,7 +208,7 @@ */ private void startAppAutomaticallyOpenUni(boolean delay) { if(delay) { if (delay) { SystemClock.sleep(2000); } List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList(); @@ -339,7 +343,7 @@ @Override public void onSuccess(MqttInfo info) { if (info != null) { MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null); MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null); MqttRecvClient.getInstance().connect(); } } app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -101,11 +101,12 @@ } @Override protected void onResume() { super.onResume(); //启动页与mainActivity样式一样，这样启动页和mainActivity看上去是一个界面，目的是为了mainActivity遮住下一页； AppManagerUtils.getAppManager().finishActivity(StartActivity.class); // AppManagerUtils.getAppManager().finishActivity(StartActivity.class); portConflictDialog(); // Intent intent = new Intent(_mActivity, MyPowerStationActivity.class); // intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); @@ -406,7 +407,7 @@ @Override public void onSuccess(MqttInfo info) { if (info != null) { MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null); MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null); MqttRecvClient.getInstance().connect(); } } @@ -482,6 +483,8 @@ 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) {
