wjc
2024-12-09 5640bb39c2e3014cebeacf9a098cddced54b2c1d
2024年12月09日10:29:14
10个文件已修改
50 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_b_splash.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_cpower_station.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_message_center_list.xml 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_my_power_station.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_home_page.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_house_list.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_me.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_message.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/themes.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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()){
//                if(UserConfigManage.getInstance().isBAccount()){
                    uniMPOpenConfiguration.splashClass = BSplashView.class;
                }
                else {
                    uniMPOpenConfiguration.splashClass = CSplashView.class;
                }
//                }
//                else {
//                    uniMPOpenConfiguration.splashClass = CSplashView.class;
//                }
                uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
            }
//            //android14有些设备有问题,需要等待
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>
app/src/main/res/layout/activity_cpower_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=".ui.CPowerStationActivity">
<!--    <TextView-->
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>
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-->
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"
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"
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"
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"
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>
        <!--是否去除标题 指dialog弹框标题-->
        <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>
        <!--是否浮现在activity之上-->
        <item name="android:windowIsFloating">false</item>
        <!--显示通知栏-->