From ae57b0e8ca15e818e66b4edd4696804d81796327 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 03 一月 2025 09:53:44 +0800
Subject: [PATCH] 2025年01月03日09:53:42
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 11 +--
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 29 +++++++--
app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java | 48 +++++++++++++++
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 8 +-
app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java | 23 +------
app/build.gradle | 2
app/src/main/res/layout/item_title_test.xml | 4
9 files changed, 87 insertions(+), 42 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index c427dd7..faa4d8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,7 +155,7 @@
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.9'
// implementation 'com.hdl.android:debugsdk:1.0.71'
- implementation project(path:':sdk')
+ implementation project(path: ':sdk')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
index 15fb829..cd1a8ea 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -304,16 +304,16 @@
* @return 鍊�
*/
public int getUniBottomSafeDistanceBackgroundColor() {
- return uniBottomSafeDistanceBackgroundColor;
+ return this.uniBottomSafeDistanceBackgroundColor;
}
/**
* uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
*
- * @param uniBottomSafeDistanceBackgroundColor 锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
+ * @param uniBottomSafeDistanceBackgroundColorValue 锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
*/
- public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColor) {
- this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColor;
+ public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColorValue) {
+ this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColorValue;
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index 1d6879a..949d8ef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -5,6 +5,7 @@
import android.os.Bundle;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index 5d4cfe4..45bfa48 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -6,6 +6,7 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.SystemClock;
+import android.util.Log;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
@@ -278,11 +279,11 @@
@Override
public void onClick(int position, HouseIdBean houseIdBean) {
//鐐瑰嚮浣忓畢璇︽儏
- HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(0);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
+ HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
}
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index d5a42ac..be05aa2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -47,6 +47,7 @@
private ActivityTestMainBinding viewBinding;
private TestTitleAdapter testTitleAdapter;
+ private List<HouseIdBean> mHouseIdBeanList = new ArrayList<>();
private List<OidBean> mOidList;
private GatewayBean mGatewayBean;
@@ -70,7 +71,12 @@
viewBinding.listItemRl.setAdapter(testTitleAdapter);
initView();
initEvent();
+ readData();
+ }
+
+ private void readData() {
+ loadNextPageHouseList(true);
}
/**
@@ -429,25 +435,30 @@
}
/**
- * 鍒锋柊UI锛堣澶囷級
+ * 鍒锋柊UI锛堢數绔欙級
*
* @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
*/
- private void loadNextPageDeviceList(boolean isRefreshing) {
+ private void loadNextPageHouseList(boolean isRefreshing) {
- showLoading();
+ if (isRefreshing) {
+ showLoading(getString(R.string.device_loading));
+ }
//鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
- HdlDeviceLogic.getInstance().getPowerStationDeviceList("", 1, 200, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() {
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", "", "", "", "", 1, 200, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
@Override
- public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) {
+ public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
if (isRefreshing) {
hideLoading();
}
+ mHouseIdBeanList.clear();
+ //鏇存柊缂撳瓨
+ mHouseIdBeanList.addAll(houseBeanClass.getList());
}
- }, _mActivity, ShowErrorMode.YES);
+ }, _mActivity, ShowErrorMode.NO);
}
@@ -459,8 +470,9 @@
if (isRefreshing) {
hideLoading();
}
+
}
- }, _mActivity, ShowErrorMode.YES);
+ }, _mActivity, ShowErrorMode.NO);
}
});
}
@@ -523,7 +535,8 @@
* 閫夋嫨鐢电珯璋冭瘯
*/
public void selectHome() {
- List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList();
+// List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList();
+ List<HouseIdBean> list = this.mHouseIdBeanList;
DialogHomeList dialogHomeList = new DialogHomeList(_mActivity, list);
dialogHomeList.show();
dialogHomeList.DeviceOnclickListener(new HomeAdapter.OnclickListener() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
index b14c39f..87fc38d 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
@@ -31,25 +31,9 @@
LayoutInflater inflater = LayoutInflater.from(context);
// 閫氳繃inflate鏂规硶灏嗗竷灞�鏂囦欢杞崲涓篤iew瀵硅薄
splashView = inflater.inflate(R.layout.activity_b_splash, null);
- try {
- //璁剧疆瀵艰埅鏉¤儗鏅鑹�
- if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 0) {
- Activity activity = (Activity) context;
- activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));
- } else if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 1) {
- Activity activity = (Activity) context;
- activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));
-
- } else if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 2) {
- Activity activity = (Activity) context;
- activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));
- }
- } catch (Exception ignored) {
- }
-
-
-
-
+ //璁剧疆瀵艰埅鏉¤儗鏅鑹�
+ Activity activity = (Activity) context;
+ activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));
//鍙兘閫氳繃杩欑鏂瑰紡璋冪敤
Intent intent = new Intent();
intent.setPackage("com.hdl.photovoltaic");
@@ -62,6 +46,7 @@
static ServiceConnection stringservice = new ServiceConnection() {
private WeakReference<Context> contextWeakReference;
+
@Override
public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
IUniappAidlInterface iUniappAidlInterface = IUniappAidlInterface.Stub.asInterface(iBinder);
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
index d13f2c0..cc4fa22 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
@@ -1,11 +1,23 @@
package com.hdl.photovoltaic.uni;
+import android.app.Activity;
+import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.IUniappAidlInterface;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.utils.ProcessManagerUtils;
+
+import java.lang.ref.WeakReference;
import io.dcloud.feature.sdk.Interface.IDCUniMPAppSplashView;
@@ -17,10 +29,44 @@
// 鍦ˋctivity涓紝鍙互鐩存帴浣跨敤this鑾峰彇LayoutInflater
LayoutInflater inflater = LayoutInflater.from(context);
// 閫氳繃inflate鏂规硶灏嗗竷灞�鏂囦欢杞崲涓篤iew瀵硅薄
- splashView = inflater.inflate(R.layout.activity_c_splash, null);
+ splashView = inflater.inflate(R.layout.activity_b_splash, null);
+ //璁剧疆瀵艰埅鏉¤儗鏅鑹�
+ Activity activity = (Activity) context;
+ activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));
+ //鍙兘閫氳繃杩欑鏂瑰紡璋冪敤
+ Intent intent = new Intent();
+ intent.setPackage("com.hdl.photovoltaic");
+ intent.setAction("UniappService.ACTION");
+ context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);
+
return splashView;
}
+
+ static ServiceConnection stringservice = new ServiceConnection() {
+ private WeakReference<Context> contextWeakReference;
+
+ @Override
+ public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
+ IUniappAidlInterface iUniappAidlInterface = IUniappAidlInterface.Stub.asInterface(iBinder);
+ try {
+ iUniappAidlInterface.sendMsg("寤虹珛杩炴帴");
+ } catch (Exception e) {
+ }
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName componentName) {
+ Log.i("BSplashView", "杩炴帴宸叉柇寮�");
+ Context context = contextWeakReference.get();
+ ProcessManagerUtils.killAllProcess(contextWeakReference.get());
+ }
+
+ public void setContextWeakReference(WeakReference<Context> contextWeakReference) {
+ this.contextWeakReference = contextWeakReference;
+ }
+ };
+
@Override
public void onCloseSplash(ViewGroup rootView) {
if (rootView != 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 85a9a91..459be73 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -277,12 +277,11 @@
UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
uniMPOpenConfiguration.path = path;
uniMPOpenConfiguration.extraData = jsonObject;
-// if(UserConfigManage.getInstance().isBAccount()){
- uniMPOpenConfiguration.splashClass = BSplashView.class;
-// }
-// else {
-// uniMPOpenConfiguration.splashClass = CSplashView.class;
-// }
+ if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 0) {
+ uniMPOpenConfiguration.splashClass = CSplashView.class;
+ } else {
+ uniMPOpenConfiguration.splashClass = BSplashView.class;
+ }
uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
}
// //android14鏈変簺璁惧鏈夐棶棰橈紝闇�瑕佺瓑寰�
diff --git a/app/src/main/res/layout/item_title_test.xml b/app/src/main/res/layout/item_title_test.xml
index 263cf45..ff8a1ee 100644
--- a/app/src/main/res/layout/item_title_test.xml
+++ b/app/src/main/res/layout/item_title_test.xml
@@ -2,11 +2,11 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="71dp">
+ android:layout_height="52dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="71dp"
+ android:layout_height="52dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
--
Gitblit v1.8.0