zhangshi_app_android.git

			@@ -1,7 +1,7 @@
			<?xml version="1.0" encoding="utf-8"?>


			<layout
			<layout xmlns:tools="http://schemas.android.com/tools"
			xmlns:app="http://schemas.android.com/apk/res-auto"
			xmlns:android="http://schemas.android.com/apk/res/android"
			>
			@@ -15,7 +15,7 @@
			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/color_normal_background"
			android:background="?attr/pageBackgroundColor"
			android:orientation="vertical"
			>
			<com.android.app_base.widget.ExtendTitleBar
			@@ -35,25 +35,26 @@
			android:orientation="horizontal">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/ic_search" />
			android:id="@+id/iv_operate_select"
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="@drawable/ic_operate_select_white" />

			<ImageView
			android:id="@+id/iv_operate"
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:layout_marginStart="@dimen/dp_16"
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:layout_marginStart="16dp"
			android:background="@drawable/ic_operate" />

			</LinearLayout>
			</com.android.app_base.widget.ExtendTitleBar>


			<FrameLayout
			android:id="@+id/layout_banner"
			android:layout_width="match_parent"
			android:layout_height="200dp"
			android:layout_height="0dp"
			app:layout_constraintDimensionRatio="16:9"
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@id/titleBar"
			@@ -62,7 +63,7 @@
			android:id="@+id/layout_frame"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:background="@color/color_card_pink"
			android:background="?attr/pageBackgroundColor"
			>
			<ImageView
			android:id="@+id/iv_banner"
			@@ -70,34 +71,10 @@
			android:layout_height="match_parent"
			/>
			</FrameLayout>
			<RelativeLayout
			android:id="@+id/layout_data_null"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:orientation="vertical"
			>
			<ImageView
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:src="@drawable/img_data_null"
			android:scaleType="center"
			/>

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:text="空空如也~"
			android:textColor="#73000000"
			android:layout_gravity="center"
			android:layout_centerHorizontal="true"
			android:layout_alignParentBottom="true"
			android:layout_marginBottom="10dp"
			/>
			</RelativeLayout>

			</FrameLayout>

			<LinearLayout
			<FrameLayout
			android:id="@+id/container"
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:orientation="vertical"
			@@ -137,19 +114,19 @@
			app:layout_constraintGuide_percent="0.25"
			/>


			<TextView
			android:id="@+id/tv_core_module"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginStart="@dimen/dp_20"
			android:layout_marginTop="@dimen/dp_20"
			android:layout_marginStart="20dp"
			android:layout_marginTop="20dp"
			android:text="核心模块"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_18"
			android:textStyle="bold"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toTopOf="parent" />

			<LinearLayout
			android:id="@+id/layout_home_root_net"
			android:layout_width="wrap_content"
			@@ -162,9 +139,10 @@
			app:layout_constraintTop_toBottomOf="@id/tv_core_module">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_family_root_net" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionFamilyRootNet"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -187,7 +165,7 @@
			<ImageView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:background="@drawable/function_notes" />
			android:background="?attr/icFunctionNotes" />

			<TextView
			android:layout_width="wrap_content"
			@@ -208,9 +186,9 @@
			app:layout_constraintTop_toTopOf="@id/layout_home_root_net">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_asset" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionAsset" />

			<TextView
			android:layout_width="wrap_content"
			@@ -231,9 +209,9 @@
			app:layout_constraintTop_toTopOf="@id/layout_home_root_net">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_honor" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionHonor" />

			<TextView
			android:layout_width="wrap_content"
			@@ -257,9 +235,9 @@
			>

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_little_doctor"
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionLittleDoctor"
			/>
			<TextView
			android:layout_width="wrap_content"
			@@ -282,9 +260,9 @@
			>

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_cleaning"
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionCleaning"
			/>
			<TextView
			android:layout_width="wrap_content"
			@@ -306,9 +284,10 @@
			app:layout_constraintTop_toTopOf="@id/layout_little_doctor">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_mail_list" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionMailList"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -329,9 +308,10 @@
			app:layout_constraintTop_toTopOf="@id/layout_little_doctor">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_pamper_pet" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionPamperPet"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -354,9 +334,10 @@
			app:layout_constraintTop_toBottomOf="@+id/layout_little_doctor">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_income_expense" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionIncomeExpense"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -380,7 +361,8 @@
			<ImageView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:background="@drawable/function_home_devices" />
			android:background="?attr/icFunctionHomeDevices"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -391,17 +373,173 @@
			android:textSize="@dimen/sp_14" />
			</LinearLayout>


			<TextView
			android:id="@+id/tv_personal_module"
			android:id="@+id/tv_family_module"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dp_20"
			android:text="个人模块"
			android:layout_marginTop="20dp"
			android:text="家庭会议"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_18"
			android:textStyle="bold"
			app:layout_constraintStart_toStartOf="@+id/tv_core_module"
			app:layout_constraintTop_toBottomOf="@+id/layout_income_and_expenses" />

			<LinearLayout
			android:id="@+id/layout_family_meeting"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="15dp"
			android:gravity="center"
			android:orientation="vertical"
			app:layout_constraintEnd_toStartOf="@+id/gl_v_0.25"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@id/tv_family_module">

			<ImageView
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionLittleDoctor"
			/>

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dp_4"
			android:text="会议申请"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_14" />
			</LinearLayout>

			<LinearLayout
			android:id="@+id/layout_meeting_approve"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="center"
			android:orientation="vertical"
			app:layout_constraintEnd_toStartOf="@+id/gl_v_0.5"
			app:layout_constraintStart_toStartOf="@+id/gl_v_0.25"
			app:layout_constraintTop_toTopOf="@id/layout_family_meeting">

			<ImageView
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionLittleDoctor"
			/>

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dp_4"
			android:text="会议审批"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_14" />
			</LinearLayout>


			<LinearLayout
			android:id="@+id/layout_meeting_sta"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="center"
			android:orientation="vertical"
			app:layout_constraintEnd_toEndOf="@+id/layout_contacts"
			app:layout_constraintStart_toStartOf="@+id/layout_contacts"
			app:layout_constraintTop_toTopOf="@id/layout_family_meeting">

			<ImageView
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionLittleDoctor"
			/>

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dp_4"
			android:text="会议统计"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_14" />
			</LinearLayout>


			<LinearLayout
			android:id="@+id/layout_webcast"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:gravity="center"
			android:orientation="vertical"
			app:layout_constraintEnd_toEndOf="@+id/layout_pet"
			app:layout_constraintStart_toStartOf="@+id/layout_pet"
			app:layout_constraintTop_toTopOf="@id/layout_family_meeting">

			<ImageView
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionLittleDoctor"
			/>

			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dp_4"
			android:text="直播申请"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_14" />
			</LinearLayout>



			<LinearLayout
			android:id="@+id/layout_webback"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:orientation="vertical"

			app:layout_constraintStart_toStartOf="@id/layout_family_meeting"
			app:layout_constraintEnd_toEndOf="@id/layout_family_meeting"
			app:layout_constraintTop_toBottomOf="@id/layout_family_meeting"
			android:layout_marginTop="@dimen/dp_20"
			android:gravity="center"
			>

			<ImageView
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionLittleDoctor"
			/>
			<TextView
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/dp_4"
			android:textSize="@dimen/sp_14"
			android:text="直播回放"
			android:textColor="@color/black"
			/>
			</LinearLayout>










			<TextView
			android:id="@+id/tv_personal_module"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="90dp"
			android:text="个人模块"
			android:textColor="@color/black"
			android:textSize="@dimen/sp_18"
			android:textStyle="bold"
			app:layout_constraintStart_toStartOf="@+id/tv_family_module"
			app:layout_constraintTop_toBottomOf="@+id/layout_family_meeting" />


			<LinearLayout
			android:id="@+id/layout_growing_up"
			@@ -415,9 +553,10 @@
			app:layout_constraintTop_toBottomOf="@id/tv_personal_module">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_growth" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionGrowth"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -438,9 +577,10 @@
			app:layout_constraintTop_toTopOf="@id/layout_growing_up">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_marriage" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionMarriage"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -462,9 +602,10 @@
			app:layout_constraintTop_toTopOf="@+id/layout_growing_up">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_property"/>
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionProperty"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -485,9 +626,10 @@
			app:layout_constraintTop_toTopOf="@+id/layout_growing_up">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_wish"/>
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionWish"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -510,9 +652,10 @@
			app:layout_constraintTop_toBottomOf="@+id/layout_growing_up">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_tour" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionTour"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -534,9 +677,10 @@
			app:layout_constraintTop_toTopOf="@+id/layout_tourism">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_health" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionHealth"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -558,9 +702,10 @@
			app:layout_constraintTop_toTopOf="@+id/layout_tourism">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_honor" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionCertificate"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -582,9 +727,10 @@
			app:layout_constraintTop_toTopOf="@+id/layout_tourism">

			<ImageView
			android:layout_width="@dimen/dp_24"
			android:layout_height="@dimen/dp_24"
			android:background="@drawable/function_privacy" />
			android:layout_width="24dp"
			android:layout_height="24dp"
			android:background="?attr/icFunctionPrivacy"
			/>

			<TextView
			android:layout_width="wrap_content"
			@@ -597,11 +743,18 @@

			</androidx.constraintlayout.widget.ConstraintLayout>
			</androidx.core.widget.NestedScrollView>
			<com.google.android.material.floatingactionbutton.FloatingActionButton
			android:id="@+id/fab_add"
			android:layout_width="56dp"
			android:layout_height="56dp"
			android:layout_gravity="end\|bottom"
			android:layout_marginEnd="25dp"
			android:layout_marginBottom="44dp"
			android:src="@drawable/ic_add"
			app:fabCustomSize="56dp"
			/>

			</LinearLayout>



			</FrameLayout>

			</androidx.constraintlayout.widget.ConstraintLayout>
			</layout>