From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'

---
 app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java |   31 ++++++++-----------------------
 1 files changed, 8 insertions(+), 23 deletions(-)

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..a05f8a8 100755
--- a/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/BSplashView.java
@@ -31,30 +31,14 @@
         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");
-        intent.setAction("UniappService.ACTION");
-        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);
+//        Intent intent = new Intent();
+//        intent.setPackage("com.hdl.photovoltaic");
+//        intent.setAction("UniappService.ACTION");
+//        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);
 
         return splashView;
     }
@@ -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);

--
Gitblit v1.8.0