From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 104 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 21 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 e02daf2..a83b80e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -1,11 +1,14 @@
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;
@@ -13,6 +16,7 @@
import android.view.View;
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.R;
@@ -32,10 +36,13 @@
import com.hdl.photovoltaic.other.HdlOtaLogic;
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;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
@@ -49,6 +56,7 @@
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.lang.reflect.Type;
import java.util.List;
@@ -86,19 +94,41 @@
this.initMqttClient();
//鐩戝惉缃戠粶鐘舵�佸彉鍖�
this.networkMonitoring();
+ //鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
+ this.clickJpushNotificationMessage();
+ //閫氱煡闄愭潈
+ this.notificationSet();
-// HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
-// @Override
-// public void onServiceConnected(ComponentName name, IBinder service) {
-//
-// }
-//
-// @Override
-// public void onServiceDisconnected(ComponentName name) {
-//
-// }
-// });
+ }
+
+ /**
+ * 寮�鍚�氱煡鏉冮檺
+ */
+ private void notificationSet() {
+ boolean isBoolean = PermissionUtils.isNotificationEnabled(_mActivity);
+ if (!isBoolean) {
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.setTitle("鎻愮ず");
+ confirmationCancelDialog.setContent("閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�.");
+ confirmationCancelDialog.setConfirmation("鍓嶅線璁剧疆");
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+ PermissionUtils.openNotificationSettings(_mActivity);
+
+ }
+ });
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ }
+ });
+
+ }
}
/**
@@ -126,7 +156,6 @@
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
postEventBus(HomepageTitleTabSwitch.message);
-
}
});
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -140,6 +169,7 @@
}
+
@Override
protected void onDestroy() {
@@ -203,7 +233,7 @@
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
baseEventBus.setType(tabSwitch.toString());
- EventBus.getDefault().post(baseEventBus);
+ EventBus.getDefault().postSticky(baseEventBus);
}
public void requestPermissions() {
@@ -265,7 +295,7 @@
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁--->" + new Gson().toJson(response), false);
+ HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false);
// if (response.getTopic().endsWith("custom/native/inverter/up")) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
@@ -284,11 +314,33 @@
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);
+ }
+
+ ;
+ HDLLinkLocalSdk.getInstance().
+
+ registerAllTopicsListener(allTopicsListener);
}
/**
@@ -327,7 +379,7 @@
return;
}
int index = -1;
- List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId());
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
if (gatewayBean.getGatewayId().equals(topics[2])) {
@@ -377,7 +429,6 @@
@Override
public void onSuccess(List<GatewayBean> obj) {
// AppManagerUtils.getAppManager().hideLoading();
-
}
@Override
@@ -387,6 +438,20 @@
});
}
});
+ }
+ }
+ }
+
+ /**
+ * 鐐瑰嚮鏋佸厜閫氱煡鏍忔秷鎭繘鏉�
+ */
+ private void clickJpushNotificationMessage() {
+ Intent intent = getIntent();
+ if (intent != null) {
+ String key = intent.getStringExtra("skip");
+ if (key != null) {
+ //瑙﹀彂娑堟伅鐐瑰嚮浜嬩欢
+ viewBinding.myMessageBottomIl2.clickTv.performClick();
}
}
}
@@ -421,9 +486,6 @@
}
super.onBackPressed();
}
-
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0