From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 39 -------------------
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 12 +-----
local.properties | 2
app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java | 1
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 6 ---
app/src/main/assets/data/dcloud_error.html | 3 -
6 files changed, 5 insertions(+), 58 deletions(-)
diff --git a/app/src/main/assets/data/dcloud_error.html b/app/src/main/assets/data/dcloud_error.html
index 0f29c7c..519b4d2 100644
--- a/app/src/main/assets/data/dcloud_error.html
+++ b/app/src/main/assets/data/dcloud_error.html
@@ -8,8 +8,6 @@
<title>Error</title>
<script type="text/javascript">
// H5 plus浜嬩欢澶勭悊
-<script type="text/javascript">
- // H5 plus浜嬩欢澶勭悊
window.onload = function(){
console.log("杩涘叆onload鏂规硶")
//鐣岄潰寮傚父鍚庯紝绛�1绉掑悗灏濊瘯閲嶆柊鍔犺浇
@@ -18,7 +16,6 @@
plus.runtime.restart()
},1000);
};
- </script>
</script>
<style>
*{
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 9a12c55..0fdda0d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -652,12 +652,6 @@
HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
}
- public void openUniMPDelay(String path, JSONObject jsonObject) {
- JSONObject json = this.createdJSONObject(jsonObject, true);
- HDLUniMPSDKManager.getInstance().openUniMPDelay(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
- HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
- }
-
/**
* 鍘熺敓銆愪富鍔ㄣ�戝悜灏忕▼搴忓彂閫侀�氱煡浜嬩欢
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index d6baefb..2cb2967 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -211,11 +211,7 @@
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
if (HouseIdList.size() == 0) {
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
- if (delay) {
- HdlUniLogic.getInstance().openUniMPDelay(path, null);
- } else {
- HdlUniLogic.getInstance().openUniMP(path, null);
- }
+ HdlUniLogic.getInstance().openUniMP(path, null);
} else {
int select_home = 0;
for (int i = 0; i < HouseIdList.size(); i++) {
@@ -227,11 +223,7 @@
HouseIdBean houseIdBean = HouseIdList.get(select_home);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
- if (delay) {
- HdlUniLogic.getInstance().openUniMPDelay(path, null);
- } else {
- HdlUniLogic.getInstance().openUniMP(path, null);
- }
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index b638066..d36418e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -258,16 +258,7 @@
return true;
}
- /**
- * 鎵撳紑灏忕▼搴�
- *
- * @param uniAppId 灏忕▼搴廔D
- * @param path 鎸囧畾璺緞
- * 渚嬶細pages/component/scroll-view/scroll-view?a=1&b=2&c=3
- * @param jsonObject 闄勫姞鏁版嵁
- * @param callBack 鐩戝惉灏忕▼搴廜therUniMPEvent浜嬩欢
- */
- public void openUniMPDelay(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
+ public void openUniMP(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
if (TextUtils.isEmpty(uniAppId)) {
HdlThreadLogic.toast(mContext, "uni Id null");
HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
@@ -291,34 +282,6 @@
//绗竴娆＄敤瑕佷紤鐪�
SystemClock.sleep(1000);
}
- }
- mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
- mUniMPCaches.put(uniMP.getAppid(), uniMP);
- } catch (Exception e) {
- e.printStackTrace();
- HdlThreadLogic.toast(HDLApp.getInstance(), R.string.uni_open_error);
-// initDCUniMPSDK(HDLApp.getInstance());
- HdlLogLogic.print("鎵撳紑澶辫触===" + e.getMessage());
- }
- }
-
- public void openUniMP(String uniAppId, String path, JSONObject jsonObject, IOnOtherUniMPEventCallBack callBack) {
- if (TextUtils.isEmpty(uniAppId)) {
- HdlThreadLogic.toast(mContext, "uni Id null");
- HdlLogLogic.print("灏忕▼搴廔D 涓嶈兘涓虹┖");
- return;
- }
- try {
- setOnOtherUniMPEventCallBack(callBack);
- uniMP = null;
- if (TextUtils.isEmpty(path)) {
- uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId);
- } else {
- UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
- uniMPOpenConfiguration.path = path;
- uniMPOpenConfiguration.extraData = jsonObject;
- uniMPOpenConfiguration.splashClass=MySplashView.class;
- uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
}
mCurrentAppId = uniAppId;//璁板綍褰撳墠灏忕▼搴�
mUniMPCaches.put(uniMP.getAppid(), uniMP);
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
index 69c6a9d..d1bc170 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.graphics.Color;
+import android.os.SystemClock;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
diff --git a/local.properties b/local.properties
index 7e45c0e..5cb4a98 100644
--- a/local.properties
+++ b/local.properties
@@ -5,4 +5,4 @@
# For customization when using a Version Control System, please read the
# header note.
#Fri Feb 23 16:45:51 CST 2024
-sdk.dir=/Users/user/Library/Android/sdk
+sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx
--
Gitblit v1.8.0