From d859bb3fd4e10c93fbf5796957cf1a0a4a4fc281 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 04 一月 2024 15:19:30 +0800 Subject: [PATCH] 2024年01月04日15:19:24 --- app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 61 +++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 6 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 a83b80e..d1f5e46 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -1,17 +1,15 @@ package com.hdl.photovoltaic.ui; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.app.ActivityCompat; import android.Manifest; import android.content.Intent; import android.content.IntentFilter; -import android.content.UriPermission; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Process; +import android.os.SystemClock; import android.text.TextUtils; import android.view.View; @@ -29,14 +27,13 @@ import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; 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; import com.hdl.photovoltaic.other.HdlOtaLogic; +import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.other.HdlUniLogic; -import com.hdl.photovoltaic.ui.bean.BUserInfo; import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo; import com.hdl.photovoltaic.ui.bean.OidBean; import com.hdl.photovoltaic.uni.HDLUniMP; @@ -58,6 +55,8 @@ import java.lang.reflect.Type; import java.util.List; + +import cn.jpush.android.api.JPushInterface; /** @@ -94,12 +93,62 @@ this.initMqttClient(); //鐩戝惉缃戠粶鐘舵�佸彉鍖� this.networkMonitoring(); + //涓婁紶鏋佸厜娉ㄥ唽ID + this.pushTokens(); //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉� this.clickJpushNotificationMessage(); //閫氱煡闄愭潈 this.notificationSet(); + } + + + /** + * 涓婁紶鏋佸厜娉ㄥ唽ID + */ + private void pushTokens() { + 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(); + } + HdlLogLogic.print("娣诲姞鎺ㄩ�佹瀬鍏塈D--->registrationID===" + finalRegistrationID, true); + + } + + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("娣诲姞鎺ㄩ�佹瀬鍏塈D澶辫触--->registrationID===" + finalRegistrationID, true); + } + }); + + } + + + } + }); } /** @@ -183,7 +232,7 @@ } private void initView() { - viewBinding.myPowerStationBottomIl1.titleTv.setText("棣栭〉");// + viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_shome_page);// viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message); viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me); this.bottomViewChangeOfStyle(); -- Gitblit v1.8.0