修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）

guoshen

2024-07-01 caead5ad019c24b9a7958f01fa663ea8159aee6c

 app/src/main/res/layout/layout_drawer.xml

@@ -5,7 +5,7 @@
    android:layout_width="211dp"
    android:layout_height="match_parent"
    android:layout_gravity="start"
    android:background="@color/color_card_pink"
    android:background="?attr/drawerBackgroundColor"
    android:paddingTop="25dp"
    >
    <LinearLayout
@@ -26,8 +26,8 @@
                android:id="@+id/dl_home_user_avatar"
                android:layout_width="50dp"
                android:layout_height="50dp"
                android:scaleType="centerCrop"
                app:roundPercent="1"
                android:background="@drawable/img_sakura"
                />
            <TextView
                android:id="@+id/dl_home_user_name"
@@ -39,13 +39,15 @@
                android:layout_marginStart="16dp"
                />
        </LinearLayout>
        <!--CardView卡片布局 用于显示阴影和圆角效果的UI 继承自FrameLayout帧布局 -->
        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="304dp"
            android:layout_height="wrap_content"
            app:cardBackgroundColor="@color/white"
            app:cardCornerRadius="10dp"
            app:cardElevation="0dp"
            >
            <!--cardElevation设置Z轴高度，表现出立体的阴影效果，从而增强视觉层级和空间感知-->
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -59,25 +61,33 @@
                    android:textColor="@color/black"
                    android:textSize="12sp"
                    android:layout_marginStart="14dp"
                    android:layout_marginBottom="8dp"
                    />
                <!--View 一条横线-->
                <View
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
                    android:background="#FFF3F3F3"
                    />
                <!--paddingHorizontal水平方向填充，相当于整体左右移，有正负
                marginVertical 边缘垂直，相当于整体上下移动
                -->
                <LinearLayout
                    android:id="@+id/dl_home_root_net"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"

                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_family_root_net"
                        android:layout_width="13dp"
                        android:layout_height="10dp"
                        android:background="?attr/icFunctionFamilyRootNet"
                        />
                    <!--marginStart边缘距离左边的距离-->
                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
@@ -99,12 +109,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_notes"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionNotes"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -127,12 +138,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_asset"
                        android:layout_width="13dp"
                        android:layout_height="14dp"
                        android:background="?attr/icFunctionAsset"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -155,12 +167,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_home_devices"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionHomeDevices"
                        />

                    <TextView
@@ -184,12 +197,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_honor"
                        android:layout_width="13dp"
                        android:layout_height="12dp"
                        android:background="?attr/icFunctionHonor"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -212,12 +226,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_little_doctor"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionLittleDoctor"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -240,12 +255,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_cleaning"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionCleaning"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -268,12 +284,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_mail_list"
                        android:layout_width="13dp"
                        android:layout_height="14dp"
                        android:background="?attr/icFunctionMailList"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -296,12 +313,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_pet"
                        android:layout_width="13dp"
                        android:layout_height="10dp"
                        android:background="?attr/icFunctionPamperPet"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -324,12 +342,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_income_expense"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionIncomeExpense"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -350,9 +369,139 @@


        </androidx.cardview.widget.CardView>

        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="240dp"
            android:layout_height="wrap_content"
            app:cardBackgroundColor="@color/white"
            app:cardCornerRadius="10dp"
            app:cardElevation="0dp"
            android:layout_marginTop="30dp"
            android:layout_marginBottom="10dp"
            >
            <!--cardElevation设置Z轴高度，表现出立体的阴影效果，从而增强视觉层级和空间感知-->
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:orientation="vertical"
                android:paddingVertical="8dp"
                >
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="会议板块"
                    android:textColor="@color/black"
                    android:textSize="12sp"
                    android:layout_marginStart="14dp"
                    android:layout_marginBottom="8dp"
                    />
                <!--View 一条横线-->
                <View
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
                    android:background="#FFF3F3F3"
                    />
                <!--paddingHorizontal水平方向填充，相当于整体左右移，有正负
                marginVertical 边缘垂直，相当于整体上下移动
                -->
                <LinearLayout
                    android:id="@+id/dl_family_meeting"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="13dp"
                        android:layout_height="10dp"
                        android:background="@drawable/ic_function_meeting"
                        />
                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:text="会议申请"
                        android:textColor="@color/black"
                        android:textSize="14sp"
                        android:layout_marginStart="15dp"
                        />
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_vector_gray"
                        />
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/dl_family_webcast"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="@drawable/ic_function_webcast"
                        />
                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:text="家庭直播"
                        android:textColor="@color/black"
                        android:textSize="14sp"
                        android:layout_marginStart="15dp"
                        />
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_vector_gray"
                        />
                </LinearLayout>

                <LinearLayout
                    android:id="@+id/dl_back"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="@drawable/ic_fuction_back"
                        />
                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:text="直播回放"
                        android:textColor="@color/black"
                        android:textSize="14sp"
                        android:layout_marginStart="15dp"
                        />
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_vector_gray"
                        />
                </LinearLayout>

            </LinearLayout>


        </androidx.cardview.widget.CardView>


        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:cardBackgroundColor="@color/white"
            app:cardCornerRadius="10dp"
            app:cardElevation="0dp"
@@ -363,6 +512,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:orientation="vertical"
                android:paddingVertical="8dp"
                >
                <TextView
                    android:layout_width="wrap_content"
@@ -370,7 +520,7 @@
                    android:text="个人板块"
                    android:textColor="@color/black"
                    android:textSize="12sp"
                    android:layout_marginVertical="8dp"
                    android:layout_marginBottom="8dp"
                    android:layout_marginStart="14dp"
                    />
                <View
@@ -384,12 +534,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_growth"
                        android:layout_width="13dp"
                        android:layout_height="16dp"
                        android:background="?attr/icFunctionGrowth"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -412,12 +563,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_marriage"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionMarriage"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -440,12 +592,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_property"
                        android:layout_width="13dp"
                        android:layout_height="16dp"
                        android:background="?attr/icFunctionProperty"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -468,12 +621,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_wish"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionWish"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -496,12 +650,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_tour"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionTour"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -524,13 +679,14 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >

                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_health" />
                        android:layout_width="13dp"
                        android:layout_height="12dp"
                        android:background="?attr/icFunctionHealth" />
                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
@@ -552,12 +708,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_certificate"
                        android:layout_width="13dp"
                        android:layout_height="14dp"
                        android:background="?attr/icFunctionCertificate"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -580,12 +737,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_privacy"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionPrivacy"
                        />
                    <TextView
                        android:layout_width="0dp"