maxinyu/SecurityDefenseDevice
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化布局样式，修改text的展示错误显示

Browse Source
This commit is contained in:
maxinyu
2026-07-21 17:46:48 +08:00
parent 7114e36165
commit f154f30e2d
15 changed files with 120 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/layout-land/linked_user_activity.xml
View File

@@ -73,7 +73,7 @@
</LinearLayout>
</LinearLayout>
<!-- 列表区域 -->
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
<com.ckkj.defense_device.view.PullRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -84,8 +84,10 @@
android:layout_height="match_parent"
android:paddingHorizontal="16dp"
android:paddingTop="8dp"
android:paddingBottom="16dp"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
android:paddingBottom="16dp"
android:clipToPadding="false"
android:overScrollMode="never"/>
</com.ckkj.defense_device.view.PullRefreshLayout>
<!-- 底部按钮 -->
<LinearLayout

11
app/src/main/res/layout/dialog_family_switch.xml
View File

@@ -6,11 +6,11 @@
android:orientation="vertical">
<LinearLayout
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="30dp"
android:orientation="horizontal">
<TextView
@@ -21,6 +21,7 @@
android:text="@string/cancel"
android:textColor="@color/gray"
android:textSize="14dp"
android:textStyle="bold"
android:clickable="true"
android:focusable="true" />
@@ -37,6 +38,7 @@
android:text="@string/confirm"
android:textColor="@color/green"
android:textSize="14dp"
android:textStyle="bold"
android:clickable="true"
android:focusable="true" />
</LinearLayout>
@@ -45,6 +47,7 @@
android:id="@+id/rvMessageList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxHeight="150dp"
android:clipToPadding="false"
android:paddingStart="14dp"
android:paddingTop="12dp"

14
app/src/main/res/layout/home_menu_fragment.xml
View File

@@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@mipmap/home_back"
tools:context=".home.HomeMenuFragment">
@@ -37,15 +38,13 @@
<TextView
android:id="@+id/tvCurrentFamily"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/my_family_home"
android:textColor="@color/black"
android:textSize="20dp"
android:maxLines="1"
android:ellipsize="end"
android:textStyle="bold" />
android:textSize="20sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/ivFamilyArrow"
@@ -55,11 +54,6 @@
android:src="@mipmap/triangle" />
</LinearLayout>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"

5
app/src/main/res/layout/item_switch_family.xml
View File

@@ -3,16 +3,17 @@
android:id="@+id/itemFamily1"
android:layout_width="match_parent"
android:gravity="center"
android:layout_height="30dp">
android:layout_height="wrap_content">
<TextView
android:paddingVertical="10dp"
android:id="@+id/tvFamilyName"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/my_family"
android:textColor="@color/black"
android:textSize="16dp" />
android:textSize="14dp" />
</LinearLayout>

9
app/src/main/res/layout/linked_user_activity.xml
View File

@@ -85,7 +85,7 @@
android:layout_weight="1">
<!-- 列表 -->
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
<com.ckkj.defense_device.view.PullRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -93,8 +93,11 @@
<com.yanzhenjie.recyclerview.SwipeRecyclerView
android:id="@+id/rvLinkedUser"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="16dp"/>
</com.ckkj.defense_device.view.PullRefreshLayout>
<!-- 空页面 -->
<LinearLayout

18
app/src/main/res/layout/message_activity.xml
View File

@@ -39,13 +39,23 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMessageList"
<com.ckkj.defense_device.view.PullRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
tools:listitem="@layout/item_message_notice" />
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMessageList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="16dp"
tools:listitem="@layout/item_message_notice" />
</com.ckkj.defense_device.view.PullRefreshLayout>
<LinearLayout
android:id="@+id/emptyLayout"

2
app/src/main/res/layout/settings_menus_activity.xml
View File

@@ -99,7 +99,7 @@
android:id="@+id/tv_cache_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11Kb"
android:text=""
android:textColor="#999999"
android:textSize="13sp" />