From 27d994f4375f604ba7f49a5ba600882884d73126 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 29 十二月 2023 16:07:28 +0800
Subject: [PATCH] 2023年12月29日16:07:20
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 27 ++++++++-----
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 4 -
app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java | 7 ++-
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 12 -----
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 5 ++
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 14 +-----
6 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index f12bffc..47ba0b4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -18,6 +18,7 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.bean.ModBusBean;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -1266,8 +1267,12 @@
data = new JSONObject();
}
if (isTokenAndRefreshToken) {
+ //灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,闇�瑕佽繖浜涙暟鎹�
data.put("token", UserConfigManage.getInstance().getToken());
data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+ data.put("serverAddress", AppConfigManage.getUserRegionUrl());
+ data.put("appKey", AppConfigManage.getAppKey());
+ data.put("appSecret", AppConfigManage.getAppSecret());
}
uniCallBackBaseBean.setData(data);
return getJSONObject(uniCallBackBaseBean);
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 ce90d7d..9835f24 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,6 +6,7 @@
import android.Manifest;
import android.content.IntentFilter;
+import android.content.UriPermission;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Process;
@@ -90,17 +91,6 @@
//鐩戝惉缃戠粶鐘舵�佸彉鍖�
this.networkMonitoring();
-// HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
-// @Override
-// public void onServiceConnected(ComponentName name, IBinder service) {
-//
-// }
-//
-// @Override
-// public void onServiceDisconnected(ComponentName name) {
-//
-// }
-// });
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index 7971280..ea93f87 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -62,11 +62,12 @@
*/
private void initData() {
// showLoading();
- if (UserConfigManage.getInstance().isBAccount()) {
- this.getBUserInfo();
- } else {
- this.getCMemberInfo();
- }
+// if (UserConfigManage.getInstance().isBAccount()) {
+// this.getBUserInfo();
+// } else {
+// this.getCMemberInfo();
+// }
+ //鍥犱负uni閭ｈ竟闇�瑕侊紝鍚姩鐨勬椂鍊欏氨璇诲彇鍟�
this.getResidenceTemperatureUnit();
}
@@ -259,8 +260,12 @@
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) {
- //
- HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭垜鐨勩��");
+ //璇诲彇澶村儚
+ if (UserConfigManage.getInstance().isBAccount()) {
+ this.getBUserInfo();
+ } else {
+ this.getCMemberInfo();
+ }
}
}
}
@@ -279,10 +284,10 @@
JSONObject jsonObject = new Gson().fromJson(json, JSONObject.class);
if (jsonObject.containsKey("tempType")) {
String unit = jsonObject.getString("tempType");
- if(unit.contains("C")){
- unit="鈩�";
- }else{
- unit= "鈩�";
+ if (unit.contains("C")) {
+ unit = "鈩�";
+ } else {
+ unit = "鈩�";
}
UserConfigManage.getInstance().setTemperature_unit(unit);
UserConfigManage.getInstance().Save();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
index 4eb59a9..4a99cb1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
@@ -35,7 +35,6 @@
import java.io.File;
-
/**
* 涓汉璧勬枡鐨勭晫闈�
*/
@@ -115,7 +114,7 @@
}
changedUserAvatar();
}
- });
+ }, true);
}
});
@@ -292,7 +291,6 @@
intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
setResult(10, intent);
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 8f7ee04..a24b145 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -88,12 +88,8 @@
// Intent intent = new Intent();
// intent.setClass(_mActivity, FastScanActivity.class);
// startActivity(intent);
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION
- + "&token=" + UserConfigManage.getInstance().getToken()
- + "&refreshToken=" + UserConfigManage.getInstance().getRefreshToken()
- + "®ionUrl=" + AppConfigManage.getUserRegionUrl();
// // 鎵撳紑灏忕▼搴忛〉闈�
- HdlUniLogic.getInstance().openUniMP(path, null);
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
}
@Override
@@ -121,8 +117,7 @@
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS
+ "?homeId=" + houseIdBean.getHomeId()
+ "&homeName=" + houseIdBean.getHomeName()
- + "&powerStationStatus=" + houseIdBean.getPowerStationStatus()
- + "&serverAddress=" + AppConfigManage.getUserRegionUrl();
+ + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
}
@@ -275,10 +270,7 @@
mPermissionsResultCallback = permissionsResultCallback;
- String[] s = new String[]{
- Manifest.permission.ACCESS_FINE_LOCATION,
- Manifest.permission.CAMERA,
- };
+ String[] s = new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA,};
String[] ary = PermissionUtils.checkPermission(_mActivity, s);
if (ary.length > 0) {
requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
index 8237d46..ff6a2d8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
@@ -116,8 +116,9 @@
* @param activity -
* @param permission -
* @param permissionStateCallback -
+ * @param is_skip 鎷掔粷鏉冮檺鍚庢槸鍚﹀紩瀵煎埌璁剧疆閭ｉ噷鎵撳紑(true=寮曞)
*/
- public static void requestPermissionsResultCallback(Activity activity, String permission, PermissionState permissionStateCallback) {
+ public static void requestPermissionsResultCallback(Activity activity, String permission, PermissionState permissionStateCallback, boolean is_skip) {
// String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
int status = PermissionUtils.getPermissionState(activity, permission);
switch (status) {
@@ -141,7 +142,9 @@
@Override
public void onDenied(List<String> permissions, boolean never) {
- SharedPreUtils.putBoolean(permission, true);
+ if (is_skip) {
+ SharedPreUtils.putBoolean(permission, true);
+ }
}
});
break;
--
Gitblit v1.8.0