From e69cc227309f3eb2025fa4ef043b075467d97de1 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 04 十二月 2024 13:53:47 +0800
Subject: [PATCH] 更改闪屏问题
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 9 +++-
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 50 +++++++++++++++++++++++--
app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java | 11 +----
app/src/main/assets/data/dcloud_control.xml | 2
app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java | 11 +----
app/src/main/res/layout/activity_b_splash.xml | 8 ++++
app/src/main/res/layout/activity_c_splash.xml | 0
7 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/app/src/main/assets/data/dcloud_control.xml b/app/src/main/assets/data/dcloud_control.xml
index 7ccb586..ab101e5 100644
--- a/app/src/main/assets/data/dcloud_control.xml
+++ b/app/src/main/assets/data/dcloud_control.xml
@@ -1,4 +1,4 @@
-<hbuilder debug="true" syncDebug="true" version="1.9.9.80110">
+<hbuilder debug="false" syncDebug="false" version="1.9.9.80110">
<apps>
<app appid="unimp" appver="1.0" />
</apps>
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 6fd51e8..15db7ab 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
@@ -4,6 +4,8 @@
import static com.hdl.photovoltaic.ui.home.aachart.CustomStyleChartComposer.configureColorfulColumnChart;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
import android.os.SystemClock;
import android.text.SpannableString;
import android.text.Spanned;
@@ -13,6 +15,7 @@
import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.view.View;
+import android.view.ViewGroup;
import androidx.annotation.NonNull;
@@ -57,6 +60,7 @@
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.lang.ref.WeakReference;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -403,7 +407,7 @@
/**
* 鍥捐〃鍔犺浇
*/
- private void setUpAAChartView() {
+ private void setUpAAChartView(boolean needDelay) {
aaChartView = viewBinding.autoSizeMyAAChart;
aaChartView.callBack = this;
if (TimeType.day.equals(timeType)) {
@@ -411,8 +415,46 @@
} else if (TimeType.month.equals(timeType) || TimeType.year.equals(timeType) || TimeType.all.equals(timeType)) {
aaChartModel = configureColorfulColumnChart(getString(R.string.generation), fieldNames, fieldValues);
}
- aaChartView.aa_drawChartWithChartModel(aaChartModel);
+ if(needDelay) {
+ viewBinding.autoSizeMyAAChart.setX(10000);//鐩存帴鎵撳紑鏈夐棯灞忥紝鍦ㄤ笉鏄剧ず鐨勫湴鏂瑰厛鏄剧ず锛屽啀绉诲姩鍒版甯哥殑浣嶇疆銆俆ODO 鍚庣画鎵惧埌鏍规簮闂鍚庡幓鎺夎繖涓敤娉�
+ aaChartView.aa_drawChartWithChartModel(aaChartModel);
+ mHandler.sendEmptyMessageDelayed(100,800);
+ }
+ else{
+ aaChartView.aa_drawChartWithChartModel(aaChartModel);
+ }
+ }
+
+ FHandler mHandler=new FHandler(this);
+
+ private static class FHandler extends Handler{
+ //瀹氫箟寮卞紩鐢ㄥ疄渚�
+ private WeakReference<HomePageFragment> reference;
+
+ //鍦ㄦ瀯閫犳柟娉曚腑浼犲叆闇�瑕佹寔鏈夌殑fragment瀹炰緥
+ public FHandler(HomePageFragment fragment) {
+ reference = new WeakReference<HomePageFragment>(fragment); }
+
+ //閫氳繃澶嶅啓handlerMessage()浠庤�屽喅瀹氬浣曡繘琛屾洿鏂癠I鎿嶄綔
+ @Override
+ public void handleMessage(Message msg) {
+ //鐪佺暐浠ｇ爜
+
+ switch (msg.what){
+ case 100:
+ if(reference.get()!=null) {
+ reference.get().viewBinding.autoSizeMyAAChart.setX(0);//绉诲姩鍒版纭殑浣嶇疆
+ }
+ break;
+ }
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ mHandler.removeCallbacksAndMessages(null);
}
private void initView() {
@@ -447,7 +489,7 @@
viewBinding.v2.setVisibility(View.VISIBLE);
viewBinding.v3.setVisibility(View.VISIBLE);
viewBinding.homePageStationSelectTimeLl.setVisibility(View.VISIBLE);
- setUpAAChartView();//鍥捐〃鍔犺浇
+ setUpAAChartView(true);//鍥捐〃鍔犺浇
}
@@ -589,7 +631,7 @@
}
fieldNames = keys;
fieldValues = values;
- setUpAAChartView();
+ setUpAAChartView(false);
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
similarity index 67%
copy from app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
copy to app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
index d1bc170..d56da5f 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
@@ -1,22 +1,15 @@
package com.hdl.photovoltaic.uni;
import android.content.Context;
-import android.graphics.Color;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.TextView;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.ui.CPowerStationActivity;
import io.dcloud.feature.sdk.Interface.IDCUniMPAppSplashView;
-public class MySplashView implements IDCUniMPAppSplashView {
+public class BSplashView implements IDCUniMPAppSplashView {
View splashView;
@Override
@@ -24,7 +17,7 @@
// 鍦ˋctivity涓紝鍙互鐩存帴浣跨敤this鑾峰彇LayoutInflater
LayoutInflater inflater = LayoutInflater.from(context);
// 閫氳繃inflate鏂规硶灏嗗竷灞�鏂囦欢杞崲涓篤iew瀵硅薄
- splashView = inflater.inflate(R.layout.activity_splash, null);
+ splashView = inflater.inflate(R.layout.activity_b_splash, null);
return splashView;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java b/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
similarity index 67%
rename from app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
rename to app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
index d1bc170..d13f2c0 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/MySplashView.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/CSplashView.java
@@ -1,22 +1,15 @@
package com.hdl.photovoltaic.uni;
import android.content.Context;
-import android.graphics.Color;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.TextView;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.ui.CPowerStationActivity;
import io.dcloud.feature.sdk.Interface.IDCUniMPAppSplashView;
-public class MySplashView implements IDCUniMPAppSplashView {
+public class CSplashView implements IDCUniMPAppSplashView {
View splashView;
@Override
@@ -24,7 +17,7 @@
// 鍦ˋctivity涓紝鍙互鐩存帴浣跨敤this鑾峰彇LayoutInflater
LayoutInflater inflater = LayoutInflater.from(context);
// 閫氳繃inflate鏂规硶灏嗗竷灞�鏂囦欢杞崲涓篤iew瀵硅薄
- splashView = inflater.inflate(R.layout.activity_splash, null);
+ splashView = inflater.inflate(R.layout.activity_c_splash, null);
return splashView;
}
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 0da104a..192bf55 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -3,7 +3,6 @@
import android.app.Application;
import android.content.Context;
import android.os.Environment;
-import android.os.SystemClock;
import android.text.TextUtils;
@@ -12,6 +11,7 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
@@ -277,7 +277,12 @@
UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
uniMPOpenConfiguration.path = path;
uniMPOpenConfiguration.extraData = jsonObject;
- uniMPOpenConfiguration.splashClass = MySplashView.class;
+ if(UserConfigManage.getInstance().isBAccount()){
+ uniMPOpenConfiguration.splashClass = BSplashView.class;
+ }
+ else {
+ uniMPOpenConfiguration.splashClass = CSplashView.class;
+ }
uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
}
// //android14鏈変簺璁惧鏈夐棶棰橈紝闇�瑕佺瓑寰�
diff --git a/app/src/main/res/layout/activity_b_splash.xml b/app/src/main/res/layout/activity_b_splash.xml
new file mode 100644
index 0000000..34b760b
--- /dev/null
+++ b/app/src/main/res/layout/activity_b_splash.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:alpha="1.0"
+ android:background="#161616">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_c_splash.xml
similarity index 100%
rename from app/src/main/res/layout/activity_splash.xml
rename to app/src/main/res/layout/activity_c_splash.xml
--
Gitblit v1.8.0