From 5640bb39c2e3014cebeacf9a098cddced54b2c1d Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 09 十二月 2024 10:29:17 +0800 Subject: [PATCH] 2024年12月09日10:29:14 --- app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 12 ++++++------ app/src/main/res/layout/fragment_me.xml | 2 +- app/src/main/res/layout/activity_cpower_station.xml | 4 ++-- app/src/main/res/layout/fragment_house_list.xml | 2 +- app/src/main/res/layout/fragment_home_page.xml | 2 +- app/src/main/res/values/themes.xml | 4 ++-- app/src/main/res/layout/fragment_message.xml | 2 +- app/src/main/res/layout/activity_my_power_station.xml | 2 +- app/src/main/res/layout/activity_b_splash.xml | 3 +-- app/src/main/res/layout/activity_message_center_list.xml | 21 ++++++--------------- 10 files changed, 22 insertions(+), 32 deletions(-) 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 192bf55..3c887dc 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,12 @@ 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().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 index 34b760b..5d62e7f 100644 --- a/app/src/main/res/layout/activity_b_splash.xml +++ b/app/src/main/res/layout/activity_b_splash.xml @@ -2,7 +2,6 @@ <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"> + android:background="@color/text_FF161616"> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cpower_station.xml b/app/src/main/res/layout/activity_cpower_station.xml index d193c36..81c96fb 100644 --- a/app/src/main/res/layout/activity_cpower_station.xml +++ b/app/src/main/res/layout/activity_cpower_station.xml @@ -4,10 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bj" + android:background="@color/text_FF161616" tools:context=".ui.CPowerStationActivity"> -<!-- <TextView--> + <!-- <TextView--> <!-- android:layout_width="match_parent"--> <!-- android:layout_height="wrap_content"--> <!-- android:layout_marginStart="@dimen/dp_5"--> diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml index 5e0b063..7e3ed82 100644 --- a/app/src/main/res/layout/activity_message_center_list.xml +++ b/app/src/main/res/layout/activity_message_center_list.xml @@ -43,7 +43,7 @@ <TextView android:id="@+id/all_device_title_tv" android:layout_width="wrap_content" - android:layout_height="@dimen/dp_20" + android:layout_height="wrap_content" android:text="@string/alarm_all_device" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" @@ -56,10 +56,7 @@ android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" android:layout_marginStart="@dimen/dp_5" - android:background="@drawable/down" - app:layout_constraintBottom_toBottomOf="@+id/all_device_title_tv" - app:layout_constraintStart_toEndOf="@+id/all_device_title_tv" - app:layout_constraintTop_toTopOf="@+id/all_device_title_tv" /> + android:background="@drawable/down" /> </LinearLayout> @@ -78,7 +75,7 @@ <TextView android:id="@+id/all_grade_title_tv" android:layout_width="wrap_content" - android:layout_height="@dimen/dp_20" + android:layout_height="wrap_content" android:text="@string/alarm_all_grade" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" @@ -92,10 +89,7 @@ android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" android:layout_marginStart="@dimen/dp_5" - android:background="@drawable/down" - app:layout_constraintBottom_toBottomOf="@+id/all_grade_title_tv" - app:layout_constraintStart_toEndOf="@+id/all_grade_title_tv" - app:layout_constraintTop_toTopOf="@+id/all_grade_title_tv" /> + android:background="@drawable/down" /> </LinearLayout> @@ -114,7 +108,7 @@ <TextView android:id="@+id/all_time_title_tv" android:layout_width="wrap_content" - android:layout_height="@dimen/dp_20" + android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_5" android:text="@string/alarm_all_time" android:textColor="@color/text_E6FFFFFF" @@ -127,10 +121,7 @@ android:id="@+id/all_time_title_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_10" - android:background="@drawable/down" - app:layout_constraintBottom_toBottomOf="@+id/all_time_title_tv" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/all_time_title_tv" /> + android:background="@drawable/down" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml index 4b09d14..faffe8f 100644 --- a/app/src/main/res/layout/activity_my_power_station.xml +++ b/app/src/main/res/layout/activity_my_power_station.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bj" + android:background="@color/text_FF161616" tools:context="com.hdl.photovoltaic.ui.BPowerStationActivity"> <!--锛堥椤�-鐢电珯-娑堟伅-鎴戠殑锛�-Fragment--> diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml index 71a6dc3..23a5805 100644 --- a/app/src/main/res/layout/fragment_home_page.xml +++ b/app/src/main/res/layout/fragment_home_page.xml @@ -63,7 +63,7 @@ <LinearLayout android:id="@+id/home_page_station_ll" android:layout_width="0dp" - android:layout_height="@dimen/dp_66" + android:layout_height="@dimen/dp_56" android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/bj_ff333738" diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml index bad6bb8..950a65a 100644 --- a/app/src/main/res/layout/fragment_house_list.xml +++ b/app/src/main/res/layout/fragment_house_list.xml @@ -5,7 +5,7 @@ android:id="@+id/house_list_parent" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bj"> + android:background="@color/text_FF161616"> <!--澶撮儴鏍囩--> <RelativeLayout android:id="@+id/title_cl" diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index a507662..94dd15a 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -4,7 +4,7 @@ android:id="@+id/me_parent" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bj"> + android:background="@color/text_FF161616"> <androidx.core.widget.NestedScrollView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml index 2328091..ddf6472 100644 --- a/app/src/main/res/layout/fragment_message.xml +++ b/app/src/main/res/layout/fragment_message.xml @@ -4,7 +4,7 @@ android:id="@+id/message_parent" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bj"> + android:background="@color/text_FF161616"> <!--澶撮儴鏍囩--> <RelativeLayout android:id="@+id/message_rl" diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ac112d2..385fe95 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -37,7 +37,7 @@ <style name="Custom_Dialog"> <!--鑳屾櫙棰滆壊鍙婂拰閫忔槑绋嬪害--> - <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowBackground">#000000</item> <!--鏄惁鍘婚櫎鏍囬 鎸嘾ialog寮规鏍囬--> <item name="android:windowNoTitle">true</item> <!--鏄惁鍘婚櫎杈规 --> @@ -45,7 +45,7 @@ <!--鏄惁妯$硦--> <item name="android:backgroundDimEnabled">true</item> <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴� 0.6--> - <item name="android:backgroundDimAmount">0</item> + <item name="android:backgroundDimAmount">0.8</item> <!--鏄惁娴幇鍦╝ctivity涔嬩笂--> <item name="android:windowIsFloating">false</item> <!--鏄剧ず閫氱煡鏍�--> -- Gitblit v1.8.0