From a0e8f81afc4fe2a21a5c504d53e569ea50d463d6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 15 三月 2024 11:51:23 +0800
Subject: [PATCH] 2024年03月15日11:51:17
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 5 +++++
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 9 ++++++---
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 5 +++--
4 files changed, 15 insertions(+), 6 deletions(-)
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 0311e96..7384f10 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -54,7 +54,7 @@
if (isOpened) {
//瀹夎鍟嗚烦杞晫闈�
Intent intent = new Intent(context, MyPowerStationActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
context.startActivity(intent);
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 f16c3cf..98eeaef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -118,7 +118,7 @@
String type = getKeyValue("type", data);//灏忕被
String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
String mode_type = "澶х被->" + topic + "--->" + "灏忕被->" + type;//鐢ㄦ潵鎵撳嵃鐨�
- HdlLogLogic.print( logTag + ":" +"uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
+ HdlLogLogic.print(logTag + ":" + "uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
//鐢ㄦ埛妯″潡
switch (type) {
@@ -126,6 +126,7 @@
case HDLUniMP.UNI_EVENT_REPLY_USER_INFO: {
this.uniGetUserInfo(mode_type, data, callback);
}
+ break;
//鐢ㄦ埛澶村儚锛堟棫骞冲彴閫昏緫鏄ご鍍忓崟鐙幏鍙栦笅杞藉湴鍧�锛�
case HDLUniMP.UNI_EVENT_REPLY_USER_IMAGE: {
uniGetImageKey(mode_type, data, callback);
@@ -1135,7 +1136,7 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ uniCallbackData(type, cUserInfo, callback);
}
});
}
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 441618b..2e624aa 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
@@ -160,6 +160,11 @@
viewBinding.fragmentMeIconParentCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //todo B绔笉鏀寔鏇存敼鏄电О
+ HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
+ return;
+ }
Intent intent = new Intent();
intent.setClass(_mActivity, PersonalDataActivity.class);
if (mC_UserInfo == null) {
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 bb7c02f..50aed67 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
@@ -172,15 +172,18 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("uploadUserHeadImage error:" + e.getMsg());
+
+ HdlThreadLogic.toast(_mActivity, e);
+// HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
// hideLoading();
}
});
}
@Override
- public void onFailure(HDLException error) {
- HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
+ public void onFailure(HDLException e) {
+// HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
+ HdlThreadLogic.toast(_mActivity, e);
}
});
}
--
Gitblit v1.8.0