From a5427777665b6361f0a67306b3114c2f705cd9f6 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 29 二月 2024 09:37:17 +0800 Subject: [PATCH] 2024年02月29日09:36:43 --- app/src/main/res/layout/activity_cpower_station.xml | 9 + app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 27 ++- app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 13 + app/src/main/AndroidManifest.xml | 57 ++----- app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 224 ++++++++++++++++++++++++++++++++ app/src/main/assets/data/dcloud_control.xml | 2 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 6 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 5 app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 1 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 19 ++ app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java | 14 -- 11 files changed, 295 insertions(+), 82 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 802d952..03e912f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,8 +31,7 @@ <uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera.autofocus" /> - <uses-permission android:name="android.permission.RECORD_AUDIO" /> - <!-- 璁块棶闂厜鐏� --> + <uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- 璁块棶闂厜鐏� --> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.GET_TASKS" /> @@ -40,43 +39,32 @@ <uses-permission android:name="android.permission.FLASHLIGHT" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> - <uses-permission android:name="android.permission.BLUETOOTH" /> - - <!-- Optional. Required for location feature --> - <!-- 涓轰簡鎻愰珮sdk璇嗗埆鍞竴鐢ㄦ埛鐨勮兘鍔涳紝淇濊瘉娑堟伅鎺ㄩ�佺殑绮惧噯閫佽揪锛屽缓璁泦鎴愪互涓嬫潈闄愶紙鍙�夛級--> + <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- Optional. Required for location feature --> + <!-- 涓轰簡鎻愰珮sdk璇嗗埆鍞竴鐢ㄦ埛鐨勮兘鍔涳紝淇濊瘉娑堟伅鎺ㄩ�佺殑绮惧噯閫佽揪锛屽缓璁泦鎴愪互涓嬫潈闄愶紙鍙�夛級 --> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <uses-permission android:name="android.permission.GET_TASKS" /> - <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> - - <!-- 濡傛偍闇�瑕佹帴鍏ュ湴鐞嗗洿鏍忎笟鍔★紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級--> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 濡傛偍闇�瑕佹帴鍏ュ湴鐞嗗洿鏍忎笟鍔★紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 --> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> - - <!-- 濡傛偍闇�瑕佸搴旇澶囬�氱煡鐩稿叧鐨勮兘鍔涳紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級--> - <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /><!-- 鍗庝负瑙掓爣 --> - <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /><!-- VIVO瑙掓爣鏉冮檺 --> - <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /><!--honor 瑙掓爣--> - <uses-permission android:name="android.permission.VIBRATE" /><!--鎸姩鍣ㄦ潈闄愶紝JPUSH鏀寔閫氱煡寮�鍚尟鍔ㄥ姛鑳斤紝灏忕背鎺ㄩ�佸繀椤�--> - - <!-- 鎵╁睍澶囩敤鏉冮檺锛堝彲閫夛級--> + <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- 濡傛偍闇�瑕佸搴旇澶囬�氱煡鐩稿叧鐨勮兘鍔涳紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 --> + <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /> <!-- 鍗庝负瑙掓爣 --> + <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /> <!-- VIVO瑙掓爣鏉冮檺 --> + <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /> <!-- honor 瑙掓爣 --> + <uses-permission android:name="android.permission.VIBRATE" /> <!-- 鎸姩鍣ㄦ潈闄愶紝JPUSH鏀寔閫氱煡寮�鍚尟鍔ㄥ姛鑳斤紝灏忕背鎺ㄩ�佸繀椤� --> + <!-- 鎵╁睍澶囩敤鏉冮檺锛堝彲閫夛級 --> <permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" android:protectionLevel="signature" /> - <uses-permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" /> - - <!-- Required --> + <uses-permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" /> <!-- Required --> <permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> - <uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> - <!-- 閫傞厤Android13锛屽脊鍑洪�氱煡蹇呴』鏉冮檺--> + <uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> <!-- 閫傞厤Android13锛屽脊鍑洪�氱煡蹇呴』鏉冮檺 --> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <application @@ -88,6 +76,9 @@ android:roundIcon="@drawable/version_icon" android:supportsRtl="true" android:theme="@style/Theme.PhotovoltaicDebug"> + <activity + android:name=".ui.CPowerStationActivity" + android:exported="false" /> <activity android:name=".ui.message.MessageInfoActivity" android:exported="false" /> @@ -158,8 +149,7 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> <!-- 娉ㄥ唽鏈嶅姟 --> - <service android:name=".internet.HttpServer.MyNanoHttpService" /> - <!--鍔犲畠uniapp鎵嶈兘鍞よ捣鐩告満--> + <service android:name=".internet.HttpServer.MyNanoHttpService" /> <!-- 鍔犲畠uniapp鎵嶈兘鍞よ捣鐩告満 --> <provider android:name="io.dcloud.common.util.DCloud_FileProvider" android:authorities="com.hdl.photovoltaic.dc.fileprovider" @@ -168,10 +158,7 @@ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/dcloud_file_provider" /> - </provider> - - - <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘--> + </provider> <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘 --> <!-- 鍙厤缃產ndroid:process鍙傛暟灏哠ervice鏀惧湪鍏朵粬杩涚▼涓紱android:enabled灞炴�т笉鑳芥槸false --> <!-- 杩欎釜鏄嚜瀹氫箟Service锛岃缁ф壙鏋佸厜JCommonService锛屽彲浠ュ湪鏇村鎵嬫満骞冲彴涓婁娇寰楁帹閫侀�氶亾淇濇寔鐨勬洿绋冲畾 --> <service @@ -182,10 +169,7 @@ <intent-filter> <action android:name="cn.jiguang.user.service.action" /> </intent-filter> - </service> - - - <!-- Required since 5.2.0 --> + </service> <!-- Required since 5.2.0 --> <!-- 鏂扮殑 tag/alias 鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氫箟鐨凷ervice --> <!-- 5.2.0寮�濮嬫墍鏈変簨浠跺皢閫氳繃璇ョ被鍥炶皟 --> <!-- 璇ュ箍鎾渶瑕佺户鎵� JPush 鎻愪緵鐨� JPushMessageService 绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter --> @@ -195,11 +179,10 @@ android:exported="false"> <intent-filter> <action android:name="cn.jpush.android.intent.SERVICE_MESSAGE" /> + <category android:name="com.hdl.photovoltaic" /> </intent-filter> - </service> - - <!--uniMqtt蹇呰鐨�,寮�鍚痬qtt1883绔彛涓�涓湇鍔�--> + </service> <!-- uniMqtt蹇呰鐨�,寮�鍚痬qtt1883绔彛涓�涓湇鍔� --> <service android:name="org.eclipse.paho.android.service.MqttService" android:exported="false" /> diff --git a/app/src/main/assets/data/dcloud_control.xml b/app/src/main/assets/data/dcloud_control.xml index 7ccb586..ab101e5 100644 --- a/app/src/main/assets/data/dcloud_control.xml +++ b/app/src/main/assets/data/dcloud_control.xml @@ -1,4 +1,4 @@ -<hbuilder debug="true" syncDebug="true" version="1.9.9.80110"> +<hbuilder debug="false" syncDebug="false" version="1.9.9.80110"> <apps> <app appid="unimp" appver="1.0" /> </apps> diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index 6cd9850..5265042 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -122,7 +122,6 @@ return; } isInitThirdSDK = true; - // //5.鍒濆鍖朆ugly // CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true); //6.鍒濆鍖朌CUniMPSDK diff --git a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java index 07b5bc0..731fb64 100644 --- a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java +++ b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java @@ -1,31 +1,17 @@ package com.hdl.photovoltaic.jpush; import android.content.Context; -import android.content.Intent; -import android.os.Bundle; import android.text.TextUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; -import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.other.HdlJpushLogic; import com.hdl.photovoltaic.other.HdlLogLogic; -import com.hdl.photovoltaic.ui.MyPowerStationActivity; -import com.hdl.photovoltaic.ui.StartActivity; -import com.hdl.photovoltaic.ui.bean.BUserInfo; -import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; -import org.greenrobot.eventbus.EventBus; - -import java.lang.reflect.Type; -import java.util.HashMap; import java.util.Objects; import cn.jpush.android.api.CustomMessage; -import cn.jpush.android.api.JPushInterface; import cn.jpush.android.api.NotificationMessage; import cn.jpush.android.service.JPushMessageService; diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java index 29b9594..a181146 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java @@ -6,8 +6,10 @@ import com.google.gson.Gson; 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.sdk.link.core.bean.eventbus.BaseEventBus; @@ -49,10 +51,13 @@ //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�; this.addPushDataToMemoryList(jPushMessageInfoBean); if (isOpened) { - Intent intent = new Intent(context, MyPowerStationActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); - intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈� - context.startActivity(intent); + if (UserConfigManage.getInstance().isBAccount()) { + //瀹夎鍟嗚烦杞晫闈� + Intent intent = new Intent(context, MyPowerStationActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); + intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈� + context.startActivity(intent); + } } else { BaseEventBus bus = new BaseEventBus(); bus.setTopic(ConstantManage.message_function_push_post); diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java new file mode 100644 index 0000000..e1f2a01 --- /dev/null +++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java @@ -0,0 +1,224 @@ +package com.hdl.photovoltaic.ui; + + +import android.os.Bundle; +import android.os.SystemClock; +import android.text.TextUtils; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.hdl.linkpm.sdk.core.exception.HDLException; +import com.hdl.linkpm.sdk.home.type.HomeType; +import com.hdl.photovoltaic.HDLApp; +import com.hdl.photovoltaic.base.CustomBaseActivity; +import com.hdl.photovoltaic.bean.MqttInfo; +import com.hdl.photovoltaic.config.UserConfigManage; +import com.hdl.photovoltaic.databinding.ActivityCpowerStationBinding; +import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.other.HdlDeviceLogic; +import com.hdl.photovoltaic.other.HdlLogLogic; +import com.hdl.photovoltaic.other.HdlMqttLogic; +import com.hdl.photovoltaic.other.HdlResidenceLogic; +import com.hdl.photovoltaic.other.HdlThreadLogic; +import com.hdl.photovoltaic.other.HdlUniLogic; +import com.hdl.photovoltaic.ui.bean.OidBean; +import com.hdl.photovoltaic.uni.HDLUniMP; +import com.hdl.sdk.link.HDLLinkLocalSdk; +import com.hdl.sdk.link.common.event.EventListener; +import com.hdl.sdk.link.core.bean.LinkResponse; +import com.hdl.sdk.link.core.bean.ModbusResponse; +import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; + +import java.lang.reflect.Type; +import java.util.List; + +import cn.jpush.android.api.JPushInterface; + +/** + * C绔�-鐢电珯鐣岄潰 + */ +public class CPowerStationActivity extends CustomBaseActivity { + + private ActivityCpowerStationBinding viewBinding; + + private EventListener allTopicsListener; + + @Override + public Object getContentView() { + viewBinding = ActivityCpowerStationBinding.inflate(getLayoutInflater()); + return viewBinding.getRoot(); + } + + @Override + public void onBindView(Bundle savedInstanceState) { + String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + + "?homeId=" + "1722860312296235010" + + "&homeName=" + "7鍙锋ゼ涓夋ゼ" + + "&powerStationStatus=" + 1; + HdlUniLogic.getInstance().openUniMP(path, null); + //娉ㄥ唽鐩戝惉 + this.registerAllTopicsListener(); + //鍒濆鍖杕qtt瀹㈡埛绔� + this.initMqttClient(); + //涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔� + this.pushTokens(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack(); + //绉婚櫎鐩戝惉 + HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener); + //鏂紑mqtt杩炴帴 + if (MqttRecvClient.getInstance() != null) { + MqttRecvClient.getInstance().stop(); + } + } + + /** + * 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔� + */ + private void pushTokens() { + String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId(); + String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag); + if (is_registrationID.equals("true")) { + //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟� + return; + } + + HdlThreadLogic.runSubThread(new Runnable() { + @Override + public void run() { + String registrationID = JPushInterface.getRegistrationID(_mActivity); + int addCount = 0; + while (TextUtils.isEmpty(registrationID)) { + SystemClock.sleep(1000);//1s浼戠湢 + registrationID = JPushInterface.getRegistrationID(_mActivity); + addCount++; + if (addCount > 5) { + //5s瓒呮椂 + break; + } + } + if (!TextUtils.isEmpty(registrationID)) { + UserConfigManage.getInstance().setRegistrationID(registrationID); + UserConfigManage.getInstance().Save(); + String finalRegistrationID = registrationID; + HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() { + @Override + public void onSuccess(String pushId) { + + if (!TextUtils.isEmpty(pushId)) { + UserConfigManage.getInstance().setPushId(pushId); + UserConfigManage.getInstance().Save(); + } + HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�; + HdlLogLogic.print("C绔�--->娣诲姞鏋佸厜ID鍒颁簯绔�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true); + + } + + @Override + public void onFailure(HDLException e) { + HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�; + HdlLogLogic.print("C绔�--->娣诲姞鏋佸厜ID鍒颁簯绔け璐�--->registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true); + } + }); + + } + + + } + }); + } + + /** + * 鍒濆鍖杕qtt瀹㈡埛绔� + */ + public void initMqttClient() { + + HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() { + @Override + public void onSuccess(MqttInfo info) { + if (info != null) { + MqttRecvClient.init(_mActivity, info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord()); + } + } + + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("C绔�--->璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true); + } + }); + } + + /** + * 娉ㄥ唽鎵�鏈変富棰樻暟鎹殑鐩戝惉 + */ + private void registerAllTopicsListener() { + allTopicsListener = new EventListener() { + @Override + public void onMessage(Object msg) { + + if (msg == null) { + return; + } + if (msg instanceof ModbusResponse) { + ModbusResponse response = (ModbusResponse) msg; + if (response.getTopic() == null) { + return; + } + HdlLogLogic.print("C绔�--->鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false); +// if (response.getTopic().endsWith("custom/native/inverter/up")) { + HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); + uniCallBackBaseBean.setType(response.getTopic()); + uniCallBackBaseBean.setData(response.getData()); +// if (com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().getUni()) { +// try { +// String t = String.format("AndroidToPC/%s/%s", System.currentTimeMillis(), HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL); +// com.hdl.photovoltaic.ui.test.UniAppMqtt.getInstance().publish(t, JSONObject.toJSON(uniCallBackBaseBean).toString()); +// } catch (Exception ignored) { +// } +// } else { + HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean); +// } +// } + + } else if (msg instanceof LinkResponse) { + LinkResponse linkResponse = (LinkResponse) msg; + if (linkResponse.getTopic() == null) { + return; + } + if (linkResponse.getTopic().endsWith("/ota/device/progress/up")) { + HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); + 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); + } else if (linkResponse.getTopic().endsWith("/custom/device/list/upload")) { + //閫嗗彉鍣ㄦ湁鏂皁id閫氱煡涓婚 + if (linkResponse.getData() == null) { + HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡--->鏁版嵁涓虹┖", false); + return; + } + try { + Gson gson = new Gson(); + Type typeOfT = new TypeToken<List<OidBean>>() { + }.getType(); + String json = gson.toJson(linkResponse.getData()); + List<OidBean> oidList = gson.fromJson(json, typeOfT); + //澧為噺澧炲姞add + HdlDeviceLogic.getInstance().updateOidAdd(UserConfigManage.getInstance().getHomeId(), oidList, null); + } catch (Exception ignored) { + } + + + } + } + } + }; + HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener); + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java index b1e615a..f553353 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java @@ -29,13 +29,13 @@ import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.config.UserConfigManage; +import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding; import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.ui.account.ChangePassword; import com.hdl.photovoltaic.ui.account.RegisterAccountActivity; import com.hdl.photovoltaic.ui.adapter.LanguageAdapter; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.config.AppConfigManage; -import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding; import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlAccountLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; @@ -257,7 +257,14 @@ hideLoading(); HdlResidenceLogic.getInstance().setHouseIdList(obj); restoreButtonStyleToInitializeState(); - startActivity(MyPowerStationActivity.class); + if (UserConfigManage.getInstance().isBAccount()) { + //瀹夎鍟嗚烦杞晫闈� + startActivity(MyPowerStationActivity.class); + } else { + //C绔敤鎴疯烦杞晫闈� + startActivity(CPowerStationActivity.class); + } + finish(); } @@ -265,7 +272,13 @@ public void onFailure(HDLException e) { hideLoading(); restoreButtonStyleToInitializeState(); - startActivity(MyPowerStationActivity.class); + if (UserConfigManage.getInstance().isBAccount()) { + //瀹夎鍟嗚烦杞晫闈� + startActivity(MyPowerStationActivity.class); + } else { + //C绔敤鎴疯烦杞晫闈� + startActivity(CPowerStationActivity.class); + } finish(); } }); 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 679962f..843528c 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -2,14 +2,11 @@ import androidx.annotation.NonNull; import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.app.ActivityCompat; import android.Manifest; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.location.Location; -import android.location.LocationListener; import android.location.LocationManager; import android.os.Bundle; import android.os.Process; @@ -18,7 +15,6 @@ import android.text.TextUtils; import android.view.View; -import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.hdl.linkpm.sdk.core.exception.HDLException; @@ -67,7 +63,7 @@ /** - * 鎴戠殑鐢电珯鐣岄潰 + * B绔�-鐢电珯鐣岄潰 */ public class MyPowerStationActivity extends CustomBaseActivity { diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java index e4cd14c..8040f0b 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java @@ -1,28 +1,18 @@ package com.hdl.photovoltaic.ui; -import android.content.ComponentName; -import android.content.Context; import android.content.Intent; -import android.content.ServiceConnection; import android.os.Bundle; -import android.os.IBinder; import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.linkpm.sdk.user.HDLLinkPMUser; -import com.hdl.photovoltaic.HDLApp; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.UserConfigManage; -import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer; -import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService; import com.hdl.photovoltaic.listener.CloudCallBeak; -import com.hdl.photovoltaic.other.HdlOtaLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; -import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.ui.bean.HouseIdBean; -import com.hdl.photovoltaic.utils.AppManagerUtils; import java.util.List; @@ -47,8 +37,15 @@ public void onSuccess(List<HouseIdBean> obj) { // hideLoading(); HdlResidenceLogic.getInstance().setHouseIdList(obj); + Intent intent = new Intent(); - intent.setClass(StartActivity.this, MyPowerStationActivity.class); + if (UserConfigManage.getInstance().isBAccount()) { + //瀹夎鍟嗚烦杞晫闈� + intent.setClass(StartActivity.this, MyPowerStationActivity.class); + } else { + //C绔敤鎴疯烦杞晫闈� + intent.setClass(StartActivity.this, CPowerStationActivity.class); + } startActivity(intent); finish(); } @@ -57,7 +54,13 @@ public void onFailure(HDLException e) { // hideLoading(); Intent intent = new Intent(); - intent.setClass(StartActivity.this, MyPowerStationActivity.class); + if (UserConfigManage.getInstance().isBAccount()) { + //瀹夎鍟嗚烦杞晫闈� + intent.setClass(StartActivity.this, MyPowerStationActivity.class); + } else { + //C绔敤鎴疯烦杞晫闈� + intent.setClass(StartActivity.this, CPowerStationActivity.class); + } startActivity(intent); finish(); } diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java index 8873f18..65cbb2d 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java @@ -10,15 +10,10 @@ import com.hdl.linkpm.sdk.user.HDLLinkPMUser; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; -import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivitySetBinding; -import com.hdl.photovoltaic.ui.MyPowerStationActivity; import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; -import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; - -import org.greenrobot.eventbus.EventBus; /** * 鎴戠殑-璁剧疆-鐣岄潰 diff --git a/app/src/main/res/layout/activity_cpower_station.xml b/app/src/main/res/layout/activity_cpower_station.xml new file mode 100644 index 0000000..23d07d6 --- /dev/null +++ b/app/src/main/res/layout/activity_cpower_station.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".ui.CPowerStationActivity"> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file -- Gitblit v1.8.0