From be28aa49c938e1628f60d82c8a3ab4108e1bb6e7 Mon Sep 17 00:00:00 2001
From: itgaojian163 <itgaojian@163.com>
Date: Thu, 11 May 2023 21:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                  |  1 +
 baselib/build.gradle                          |  2 +-
 .../core/widget/base/BaseActivity.java        | 51 ++++++++-----------
 baselib/src/main/res/values/dimens.xml        | 22 ++++----
 .../src/main/res/layout/cv_week_bar.xml       | 12 ++---
 .../main/res/layout/activity_building_add.xml | 10 ++--
 .../res/layout/activity_building_detail.xml   |  2 +-
 .../res/layout/activity_building_edit.xml     | 10 ++--
 .../res/layout/activity_car_manage_add.xml    |  2 +-
 .../res/layout/activity_car_manage_edit.xml   |  2 +-
 .../res/layout/activity_car_person_edit.xml   |  4 +-
 .../res/layout/activity_census_aids_add.xml   |  2 +-
 .../res/layout/activity_census_drug_add.xml   |  4 +-
 .../main/res/layout/activity_census_enter.xml |  2 +-
 .../res/layout/activity_census_young_add.xml  |  4 +-
 .../res/layout/activity_community_add.xml     |  2 +-
 .../res/layout/activity_community_detail.xml  |  2 +-
 .../res/layout/activity_community_edit.xml    |  2 +-
 .../res/layout/activity_component_add.xml     |  2 +-
 .../res/layout/activity_express_poi_add.xml   |  2 +-
 .../main/res/layout/activity_hirer_edit.xml   |  2 +-
 .../main/res/layout/activity_house_detail.xml |  2 +-
 .../main/res/layout/activity_house_edit.xml   |  2 +-
 .../main/res/layout/activity_key_area_add.xml |  2 +-
 .../res/layout/activity_key_area_detail.xml   |  2 +-
 .../res/layout/activity_key_area_edit.xml     |  2 +-
 .../res/layout/activity_key_place_add.xml     |  2 +-
 .../main/res/layout/activity_key_road_add.xml |  2 +-
 .../res/layout/activity_key_road_detail.xml   |  2 +-
 .../res/layout/activity_key_road_edit.xml     |  2 +-
 .../main/res/layout/activity_penal_add.xml    |  2 +-
 .../main/res/layout/activity_penal_detail.xml |  2 +-
 .../main/res/layout/activity_penal_edit.xml   |  2 +-
 .../res/layout/activity_school_case_add.xml   |  2 +-
 .../res/layout/activity_social_org_add.xml    |  6 +--
 .../main/res/layout/activity_task_detail.xml  |  8 +--
 .../main/res/layout/activity_work_locus.xml   |  2 +-
 .../res/layout/activity_young_case_add.xml    |  2 +-
 .../main/res/layout/fragment_person_lib.xml   | 26 +++++-----
 .../main/res/layout/fragment_main_grid.xml    | 25 +++++----
 .../src/main/res/values/dimens.xml            |  4 +-
 41 files changed, 119 insertions(+), 122 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 686f84f..7abf1a3 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="ENABLE_SECOND_REFORMAT" value="true" />
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
     </JavaCodeStyleSettings>
diff --git a/baselib/build.gradle b/baselib/build.gradle
index ba71eaa..dde1426 100755
--- a/baselib/build.gradle
+++ b/baselib/build.gradle
@@ -90,7 +90,7 @@ dependencies {
     api "io.github.razerdp:BasePopup:$rootProject.popup_version"
     //选择器
     api 'io.github.lucksiege:pictureselector:v2.7.3-rc08'
-    api 'me.rosuh:AndroidFilePicker:0.7.0-x'
+    api 'me.rosuh:AndroidFilePicker:0.8.3'
 
     //toast
     api 'com.github.getActivity:ToastUtils:9.5'
diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java
index 3c51acb..1cbea01 100755
--- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java
+++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java
@@ -10,6 +10,8 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -159,8 +161,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         if (!TextUtils.isEmpty(deviceInfo)) {
             int navigationBarIsMin = 0;
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                navigationBarIsMin = Settings.System.getInt(ctx.getContentResolver(),
-                    deviceInfo, 0);
+                navigationBarIsMin = Settings.System.getInt(ctx.getContentResolver(), deviceInfo, 0);
             } else {
                 if (Build.BRAND.equalsIgnoreCase("VIVO") || Build.BRAND.equalsIgnoreCase("OPPO")) {
                     navigationBarIsMin = Settings.Secure.getInt(ctx.getContentResolver(), deviceInfo, 0);
@@ -363,8 +364,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public void setEditTextInhibitInputSpeChat(EditText editText) {
         InputFilter inputFilter = new InputFilter() {
-            Pattern emoji = Pattern.compile("[\ud83c\udc00-\ud83c\udfff]|[\ud83d\udc00-\ud83d\udfff]|[\u2600-\u27ff]",
-                Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE);
+            Pattern emoji = Pattern.compile("[\ud83c\udc00-\ud83c\udfff]|[\ud83d\udc00-\ud83d\udfff]|[\u2600-\u27ff]", Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE);
 
             @Override
             public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
@@ -501,9 +501,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 
     private void openActivity(String path) {
-        ARouter.getInstance()
-            .build(path)
-            .navigation();
+        ARouter.getInstance().build(path).navigation();
     }
 
     private String getRunningTopActivity() {
@@ -593,14 +591,19 @@ public abstract class BaseActivity extends AppCompatActivity {
      *
      * @return
      */
-//    @Override
-//    public Resources getResources() {
-//        Resources res = super.getResources();
-//        Configuration config = new Configuration();
-//        config.setToDefaults();
-//        res.updateConfiguration(config, res.getDisplayMetrics());
-//        return res;
-//    }
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        if (res != null) {
+            Configuration config = res.getConfiguration();
+            if (config != null && config.fontScale != 1.0f) {
+                config.fontScale = 1.0f;
+                res.updateConfiguration(config, res.getDisplayMetrics());
+            }
+        }
+        return res;
+    }
+
     @Override
     public void onBackPressed() {
         finish();
@@ -620,10 +623,7 @@ public abstract class BaseActivity extends AppCompatActivity {
      * @param imageUrls 图片地址Arraylist
      */
     protected void startImageActivity(ArrayList imageUrls) {
-        ARouter.getInstance()
-            .build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW)
-            .withStringArrayList("imgUrls", imageUrls)
-            .navigation();
+        ARouter.getInstance().build(PathConfig.PATH_MODULE_CMUTILS_PHOTO_SHOW).withStringArrayList("imgUrls", imageUrls).navigation();
     }
 
     /**
@@ -638,21 +638,14 @@ public abstract class BaseActivity extends AppCompatActivity {
      * @param requestCode 请求码
      */
     protected void startCameraActivity(boolean isMovie, int requestCode) {
-        ARouter.getInstance()
-            .build(PathConfig.PATH_MODULEMEDIA_CAMERA)
-            .withBoolean("isMovie", isMovie)
-            .navigation(this, requestCode);
+        ARouter.getInstance().build(PathConfig.PATH_MODULEMEDIA_CAMERA).withBoolean("isMovie", isMovie).navigation(this, requestCode);
     }
 
     protected void checkIsLogin(String path) {
         if (TextUtils.isEmpty(UserLgUtils.getToken())) {
-            ARouter.getInstance()
-                .build(PathConfig.PATH_MODULE_MAIN_LOGIN)
-                .navigation(mActivity, 2333);
+            ARouter.getInstance().build(PathConfig.PATH_MODULE_MAIN_LOGIN).navigation(mActivity, 2333);
         } else {
-            ARouter.getInstance()
-                .build(path)
-                .navigation();
+            ARouter.getInstance().build(path).navigation();
         }
     }
 
diff --git a/baselib/src/main/res/values/dimens.xml b/baselib/src/main/res/values/dimens.xml
index 24ca822..262f347 100755
--- a/baselib/src/main/res/values/dimens.xml
+++ b/baselib/src/main/res/values/dimens.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <dimen name="text_18">18sp</dimen>
-    <dimen name="text_20">20sp</dimen>
-    <dimen name="text_25">25sp</dimen>
-    <dimen name="text_23">23sp</dimen>
-    <dimen name="text_21">21sp</dimen>
-    <dimen name="text_22">22sp</dimen>
-    <dimen name="text_14">14sp</dimen>
-    <dimen name="text_15">15sp</dimen>
-    <dimen name="text_16">16sp</dimen>
+    <dimen name="text_18">18dp</dimen>
+    <dimen name="text_20">20dp</dimen>
+    <dimen name="text_25">25dp</dimen>
+    <dimen name="text_23">23dp</dimen>
+    <dimen name="text_21">21dp</dimen>
+    <dimen name="text_22">22dp</dimen>
+    <dimen name="text_14">14dp</dimen>
+    <dimen name="text_15">15dp</dimen>
+    <dimen name="text_16">16dp</dimen>
     <dimen name="material_bottom_navigation_active_item_max_width">168dp</dimen>
-    <dimen name="material_bottom_navigation_active_text_size">14sp</dimen>
+    <dimen name="material_bottom_navigation_active_text_size">14dp</dimen>
     <dimen name="material_bottom_navigation_elevation">8dp</dimen>
     <dimen name="material_bottom_navigation_height">56dp</dimen>
     <dimen name="material_bottom_navigation_item_max_width">96dp</dimen>
     <dimen name="material_bottom_navigation_item_min_width">56dp</dimen>
     <dimen name="material_bottom_navigation_margin">8dp</dimen>
     <dimen name="material_bottom_navigation_shadow_height">1dp</dimen>
-    <dimen name="material_bottom_navigation_text_size">12sp</dimen>
+    <dimen name="material_bottom_navigation_text_size">12dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/calendarview/src/main/res/layout/cv_week_bar.xml b/calendarview/src/main/res/layout/cv_week_bar.xml
index 6f54060..38b7752 100755
--- a/calendarview/src/main/res/layout/cv_week_bar.xml
+++ b/calendarview/src/main/res/layout/cv_week_bar.xml
@@ -18,7 +18,7 @@
         android:gravity="center"
         android:text="@string/sun"
         android:textColor="#333333"
-        android:textSize="12sp" />
+        android:textSize="12dp" />
 
     <TextView
         android:layout_width="0dp"
@@ -27,7 +27,7 @@
         android:gravity="center"
         android:text="@string/mon"
         android:textColor="#333333"
-        android:textSize="12sp" />
+        android:textSize="12dp" />
 
     <TextView
         android:layout_width="0dp"
@@ -36,7 +36,7 @@
         android:gravity="center"
         android:text="@string/tue"
         android:textColor="#333333"
-        android:textSize="12sp" />
+        android:textSize="12dp" />
 
     <TextView
         android:layout_width="0dp"
@@ -44,7 +44,7 @@
         android:layout_weight="1"
         android:gravity="center"
         android:text="@string/wed"
-        android:textSize="12sp" />
+        android:textSize="12dp" />
 
     <TextView
         android:layout_width="0dp"
@@ -53,7 +53,7 @@
         android:gravity="center"
         android:text="@string/thu"
         android:textColor="#333333"
-        android:textSize="12sp" />
+        android:textSize="12dp" />
 
     <TextView
         android:layout_width="0dp"
@@ -62,7 +62,7 @@
         android:gravity="center"
         android:text="@string/fri"
         android:textColor="#333333"
-        android:textSize="12sp" />
+        android:textSize="12dp" />
 
     <TextView
         android:layout_width="0dp"
diff --git a/gridmodule/src/main/res/layout/activity_building_add.xml b/gridmodule/src/main/res/layout/activity_building_add.xml
index fc86f4a..89743e4 100644
--- a/gridmodule/src/main/res/layout/activity_building_add.xml
+++ b/gridmodule/src/main/res/layout/activity_building_add.xml
@@ -145,7 +145,7 @@
                                 android:checked="true"
                                 android:padding="5dp"
                                 android:text="相同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
 
                             <RadioButton
                                 android:id="@+id/rb_uneq"
@@ -154,7 +154,7 @@
                                 android:button="@drawable/sel_radio_cir"
                                 android:padding="5dp"
                                 android:text="不同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
                         </RadioGroup>
                     </LinearLayout>
                 </LinearLayout>
@@ -190,7 +190,7 @@
                                 android:checked="true"
                                 android:padding="5dp"
                                 android:text="相同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
 
                             <RadioButton
                                 android:id="@+id/rb_uneq_door"
@@ -199,7 +199,7 @@
                                 android:button="@drawable/sel_radio_cir"
                                 android:padding="5dp"
                                 android:text="不同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
                         </RadioGroup>
                     </LinearLayout>
                 </LinearLayout>
@@ -286,5 +286,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_building_detail.xml b/gridmodule/src/main/res/layout/activity_building_detail.xml
index f86b504..aff6725 100644
--- a/gridmodule/src/main/res/layout/activity_building_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_building_detail.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="18dp"
             android:textStyle="bold"
             tools:text="小区名称" />
 
diff --git a/gridmodule/src/main/res/layout/activity_building_edit.xml b/gridmodule/src/main/res/layout/activity_building_edit.xml
index cf39048..e721602 100644
--- a/gridmodule/src/main/res/layout/activity_building_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_building_edit.xml
@@ -146,7 +146,7 @@
                                 android:clickable="false"
                                 android:padding="5dp"
                                 android:text="相同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
 
                             <RadioButton
                                 android:id="@+id/rb_uneq"
@@ -156,7 +156,7 @@
                                 android:clickable="false"
                                 android:padding="5dp"
                                 android:text="不同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
                         </RadioGroup>
                     </LinearLayout>
                 </LinearLayout>
@@ -193,7 +193,7 @@
                                 android:clickable="false"
                                 android:padding="5dp"
                                 android:text="相同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
 
                             <RadioButton
                                 android:id="@+id/rb_uneq_door"
@@ -203,7 +203,7 @@
                                 android:clickable="false"
                                 android:padding="5dp"
                                 android:text="不同"
-                                android:textSize="13sp" />
+                                android:textSize="13dp" />
                         </RadioGroup>
                     </LinearLayout>
                 </LinearLayout>
@@ -290,5 +290,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_car_manage_add.xml b/gridmodule/src/main/res/layout/activity_car_manage_add.xml
index b311f14..f548eca 100644
--- a/gridmodule/src/main/res/layout/activity_car_manage_add.xml
+++ b/gridmodule/src/main/res/layout/activity_car_manage_add.xml
@@ -151,5 +151,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_car_manage_edit.xml b/gridmodule/src/main/res/layout/activity_car_manage_edit.xml
index b311f14..f548eca 100644
--- a/gridmodule/src/main/res/layout/activity_car_manage_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_car_manage_edit.xml
@@ -151,5 +151,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_car_person_edit.xml b/gridmodule/src/main/res/layout/activity_car_person_edit.xml
index 60763d1..ef50ac6 100644
--- a/gridmodule/src/main/res/layout/activity_car_person_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_car_person_edit.xml
@@ -22,7 +22,7 @@
             android:padding="8dp"
             android:text="人员信息编辑"
             android:textColor="@color/black"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
 
         <LinearLayout
@@ -222,7 +222,7 @@
             android:background="@drawable/sel_btn_submit"
             android:text="保存"
             android:textColor="@color/white"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
 
     </LinearLayout>
diff --git a/gridmodule/src/main/res/layout/activity_census_aids_add.xml b/gridmodule/src/main/res/layout/activity_census_aids_add.xml
index 9c68491..25d4a53 100644
--- a/gridmodule/src/main/res/layout/activity_census_aids_add.xml
+++ b/gridmodule/src/main/res/layout/activity_census_aids_add.xml
@@ -245,5 +245,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_census_drug_add.xml b/gridmodule/src/main/res/layout/activity_census_drug_add.xml
index a3ed264..3d25af2 100644
--- a/gridmodule/src/main/res/layout/activity_census_drug_add.xml
+++ b/gridmodule/src/main/res/layout/activity_census_drug_add.xml
@@ -66,7 +66,7 @@
                         <TextView
                             style="@style/item_title"
                             android:text="初次发现日期"
-                            android:textSize="12sp" />
+                            android:textSize="12dp" />
 
 
                         <TextView
@@ -279,5 +279,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_census_enter.xml b/gridmodule/src/main/res/layout/activity_census_enter.xml
index 8738d53..5af9f60 100644
--- a/gridmodule/src/main/res/layout/activity_census_enter.xml
+++ b/gridmodule/src/main/res/layout/activity_census_enter.xml
@@ -344,5 +344,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_census_young_add.xml b/gridmodule/src/main/res/layout/activity_census_young_add.xml
index dced5ff..1b36d2a 100644
--- a/gridmodule/src/main/res/layout/activity_census_young_add.xml
+++ b/gridmodule/src/main/res/layout/activity_census_young_add.xml
@@ -220,7 +220,7 @@
                             style="@style/item_title"
                             android:layout_gravity="center_vertical"
                             android:text="帮扶人姓名"
-                            android:textSize="12sp" />
+                            android:textSize="12dp" />
 
 
                         <EditText
@@ -300,5 +300,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_community_add.xml b/gridmodule/src/main/res/layout/activity_community_add.xml
index 79b1624..88ae0bd 100644
--- a/gridmodule/src/main/res/layout/activity_community_add.xml
+++ b/gridmodule/src/main/res/layout/activity_community_add.xml
@@ -253,5 +253,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_community_detail.xml b/gridmodule/src/main/res/layout/activity_community_detail.xml
index 1466c16..02e95cd 100644
--- a/gridmodule/src/main/res/layout/activity_community_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_community_detail.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="18dp"
             android:textStyle="bold"
             tools:text="小区名称" />
 
diff --git a/gridmodule/src/main/res/layout/activity_community_edit.xml b/gridmodule/src/main/res/layout/activity_community_edit.xml
index 79b1624..88ae0bd 100644
--- a/gridmodule/src/main/res/layout/activity_community_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_community_edit.xml
@@ -253,5 +253,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_component_add.xml b/gridmodule/src/main/res/layout/activity_component_add.xml
index 6134abb..d7e2ef2 100644
--- a/gridmodule/src/main/res/layout/activity_component_add.xml
+++ b/gridmodule/src/main/res/layout/activity_component_add.xml
@@ -273,5 +273,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_express_poi_add.xml b/gridmodule/src/main/res/layout/activity_express_poi_add.xml
index f3f5935..e590a31 100644
--- a/gridmodule/src/main/res/layout/activity_express_poi_add.xml
+++ b/gridmodule/src/main/res/layout/activity_express_poi_add.xml
@@ -466,5 +466,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_hirer_edit.xml b/gridmodule/src/main/res/layout/activity_hirer_edit.xml
index 1875f85..c841d18 100644
--- a/gridmodule/src/main/res/layout/activity_hirer_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_hirer_edit.xml
@@ -148,5 +148,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_house_detail.xml b/gridmodule/src/main/res/layout/activity_house_detail.xml
index b4006ad..402b1ce 100644
--- a/gridmodule/src/main/res/layout/activity_house_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_house_detail.xml
@@ -23,7 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="18dp"
             android:textStyle="bold"
             tools:text="小区名称" />
 
diff --git a/gridmodule/src/main/res/layout/activity_house_edit.xml b/gridmodule/src/main/res/layout/activity_house_edit.xml
index 720fa3e..a5307e2 100644
--- a/gridmodule/src/main/res/layout/activity_house_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_house_edit.xml
@@ -138,5 +138,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_area_add.xml b/gridmodule/src/main/res/layout/activity_key_area_add.xml
index 8f3fcdf..481f4e1 100644
--- a/gridmodule/src/main/res/layout/activity_key_area_add.xml
+++ b/gridmodule/src/main/res/layout/activity_key_area_add.xml
@@ -333,5 +333,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_area_detail.xml b/gridmodule/src/main/res/layout/activity_key_area_detail.xml
index 414d094..928a9da 100644
--- a/gridmodule/src/main/res/layout/activity_key_area_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_key_area_detail.xml
@@ -305,5 +305,5 @@
         android:padding="10dp"
         android:text="删&#160;&#160;&#160;&#160;除"
         android:textColor="@color/text_20"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_area_edit.xml b/gridmodule/src/main/res/layout/activity_key_area_edit.xml
index 3ad066d..577aa61 100644
--- a/gridmodule/src/main/res/layout/activity_key_area_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_key_area_edit.xml
@@ -333,5 +333,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_place_add.xml b/gridmodule/src/main/res/layout/activity_key_place_add.xml
index 025d1a1..b5289dd 100644
--- a/gridmodule/src/main/res/layout/activity_key_place_add.xml
+++ b/gridmodule/src/main/res/layout/activity_key_place_add.xml
@@ -239,5 +239,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_road_add.xml b/gridmodule/src/main/res/layout/activity_key_road_add.xml
index 9c8aac5..96cf9fd 100644
--- a/gridmodule/src/main/res/layout/activity_key_road_add.xml
+++ b/gridmodule/src/main/res/layout/activity_key_road_add.xml
@@ -345,5 +345,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_road_detail.xml b/gridmodule/src/main/res/layout/activity_key_road_detail.xml
index 9acd3b0..484e772 100644
--- a/gridmodule/src/main/res/layout/activity_key_road_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_key_road_detail.xml
@@ -313,5 +313,5 @@
         android:padding="10dp"
         android:text="删&#160;&#160;&#160;&#160;除"
         android:textColor="@color/text_20"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_key_road_edit.xml b/gridmodule/src/main/res/layout/activity_key_road_edit.xml
index 9c8aac5..96cf9fd 100644
--- a/gridmodule/src/main/res/layout/activity_key_road_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_key_road_edit.xml
@@ -345,5 +345,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_penal_add.xml b/gridmodule/src/main/res/layout/activity_penal_add.xml
index f6806f6..a93fc32 100644
--- a/gridmodule/src/main/res/layout/activity_penal_add.xml
+++ b/gridmodule/src/main/res/layout/activity_penal_add.xml
@@ -189,5 +189,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_penal_detail.xml b/gridmodule/src/main/res/layout/activity_penal_detail.xml
index 09e339c..2b89e03 100644
--- a/gridmodule/src/main/res/layout/activity_penal_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_penal_detail.xml
@@ -216,5 +216,5 @@
         android:padding="10dp"
         android:text="删&#160;&#160;&#160;&#160;除"
         android:textColor="@color/text_20"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_penal_edit.xml b/gridmodule/src/main/res/layout/activity_penal_edit.xml
index f6806f6..a93fc32 100644
--- a/gridmodule/src/main/res/layout/activity_penal_edit.xml
+++ b/gridmodule/src/main/res/layout/activity_penal_edit.xml
@@ -189,5 +189,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_school_case_add.xml b/gridmodule/src/main/res/layout/activity_school_case_add.xml
index ea76ad5..e5b45b9 100644
--- a/gridmodule/src/main/res/layout/activity_school_case_add.xml
+++ b/gridmodule/src/main/res/layout/activity_school_case_add.xml
@@ -397,7 +397,7 @@
                     android:background="@drawable/sel_btn_submit"
                     android:text="保存"
                     android:textColor="@color/white"
-                    android:textSize="18sp" />
+                    android:textSize="18dp" />
             </androidx.cardview.widget.CardView>
 
         </LinearLayout>
diff --git a/gridmodule/src/main/res/layout/activity_social_org_add.xml b/gridmodule/src/main/res/layout/activity_social_org_add.xml
index 6a0d6e3..255fed0 100644
--- a/gridmodule/src/main/res/layout/activity_social_org_add.xml
+++ b/gridmodule/src/main/res/layout/activity_social_org_add.xml
@@ -821,7 +821,7 @@
                                 android:gravity="center"
                                 android:hint="身份证正面"
                                 android:textColor="@color/black"
-                                android:textSize="12sp" />
+                                android:textSize="12dp" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -860,7 +860,7 @@
                                 android:gravity="center"
                                 android:hint="身份证反面"
                                 android:textColor="@color/black"
-                                android:textSize="12sp" />
+                                android:textSize="12dp" />
                         </LinearLayout>
                     </LinearLayout>
                 </LinearLayout>
@@ -993,5 +993,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/activity_task_detail.xml b/gridmodule/src/main/res/layout/activity_task_detail.xml
index b8011e8..1693513 100644
--- a/gridmodule/src/main/res/layout/activity_task_detail.xml
+++ b/gridmodule/src/main/res/layout/activity_task_detail.xml
@@ -163,7 +163,7 @@
                                 android:id="@+id/tv_start_time"
                                 style="@style/item_content"
                                 android:layout_gravity="center_vertical"
-                                android:textSize="12sp"
+                                android:textSize="12dp"
                                 tools:text="2021-12-21 22:22:22" />
                         </LinearLayout>
 
@@ -179,7 +179,7 @@
                                 android:id="@+id/tv_end_time"
                                 style="@style/item_content"
                                 android:layout_gravity="center_vertical"
-                                android:textSize="12sp"
+                                android:textSize="12dp"
                                 tools:text="2021-12-21 22:22:22" />
                         </LinearLayout>
 
@@ -211,7 +211,7 @@
                                     android:id="@+id/tv_rate"
                                     style="@style/item_content"
                                     android:layout_gravity="center_vertical"
-                                    android:textSize="12sp"
+                                    android:textSize="12dp"
                                     tools:text="仅一次" />
                             </LinearLayout>
 
@@ -235,7 +235,7 @@
                                     android:id="@+id/tv_check_state"
                                     style="@style/item_content"
                                     android:layout_gravity="center_vertical"
-                                    android:textSize="12sp"
+                                    android:textSize="12dp"
                                     tools:text="已回退" />
                             </LinearLayout>
                         </LinearLayout>
diff --git a/gridmodule/src/main/res/layout/activity_work_locus.xml b/gridmodule/src/main/res/layout/activity_work_locus.xml
index 33dd0ae..564ed9e 100644
--- a/gridmodule/src/main/res/layout/activity_work_locus.xml
+++ b/gridmodule/src/main/res/layout/activity_work_locus.xml
@@ -190,7 +190,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/black"
-                        android:textSize="16sp"
+                        android:textSize="16dp"
                         tools:text="当前登录人" />
 
                     <TextView
diff --git a/gridmodule/src/main/res/layout/activity_young_case_add.xml b/gridmodule/src/main/res/layout/activity_young_case_add.xml
index 5859a85..3643a85 100644
--- a/gridmodule/src/main/res/layout/activity_young_case_add.xml
+++ b/gridmodule/src/main/res/layout/activity_young_case_add.xml
@@ -185,5 +185,5 @@
         android:padding="10dp"
         android:text="保&#160;&#160;&#160;&#160;存"
         android:textColor="@color/white"
-        android:textSize="17sp" />
+        android:textSize="17dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/gridmodule/src/main/res/layout/fragment_person_lib.xml b/gridmodule/src/main/res/layout/fragment_person_lib.xml
index 680ac05..a9c2874 100644
--- a/gridmodule/src/main/res/layout/fragment_person_lib.xml
+++ b/gridmodule/src/main/res/layout/fragment_person_lib.xml
@@ -22,7 +22,7 @@
             android:padding="10dp"
             android:text="人口基础信息库"
             android:textColor="@color/black"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
         <View
             android:layout_width="match_parent"
@@ -38,7 +38,7 @@
             android:padding="10dp"
             android:text="正常人群"
             android:textColor="@color/black"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
         <View
             android:layout_width="match_parent"
@@ -65,7 +65,7 @@
                 android:padding="10dp"
                 android:text="户籍信息"
                 android:textColor="@color/black"
-                android:textSize="18sp"
+                android:textSize="18dp"
                 android:visibility="gone" />
 
 
@@ -82,7 +82,7 @@
                 android:padding="10dp"
                 android:text="流动人口"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
 
 
             <TextView
@@ -98,7 +98,7 @@
                 android:padding="10dp"
                 android:text="留守人员"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
         </LinearLayout>
 
 
@@ -110,7 +110,7 @@
             android:padding="10dp"
             android:text="特殊人群"
             android:textColor="@color/black"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
 
         <LinearLayout
@@ -132,7 +132,7 @@
                 android:padding="10dp"
                 android:text="刑满释放人员"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
 
 
             <TextView
@@ -148,7 +148,7 @@
                 android:padding="10dp"
                 android:text="社区矫正人员"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
 
 
             <TextView
@@ -164,7 +164,7 @@
                 android:padding="10dp"
                 android:text="肇事肇祸等严重精神障碍患者"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
 
 
             <TextView
@@ -180,7 +180,7 @@
                 android:padding="10dp"
                 android:text="吸毒人员"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
 
 
             <TextView
@@ -196,7 +196,7 @@
                 android:padding="10dp"
                 android:text="艾滋病危险人员"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="18dp" />
 
         </LinearLayout>
 
@@ -212,7 +212,7 @@
             android:padding="10dp"
             android:text="重点青少年"
             android:textColor="@color/black"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
         <View
             android:layout_width="match_parent"
@@ -232,7 +232,7 @@
             android:padding="10dp"
             android:text="境外人员"
             android:textColor="@color/black"
-            android:textSize="18sp" />
+            android:textSize="18dp" />
 
     </LinearLayout>
 
diff --git a/mainmodule/src/main/res/layout/fragment_main_grid.xml b/mainmodule/src/main/res/layout/fragment_main_grid.xml
index 5ca8c3f..595c8c5 100644
--- a/mainmodule/src/main/res/layout/fragment_main_grid.xml
+++ b/mainmodule/src/main/res/layout/fragment_main_grid.xml
@@ -55,7 +55,7 @@
                             android:ellipsize="end"
                             android:maxLines="1"
                             android:textColor="#ffffffff"
-                            android:textSize="16sp"
+                            android:textSize="16dp"
                             android:textStyle="bold"
                             tools:text="您好！桃子酱" />
                     </LinearLayout>
@@ -76,7 +76,7 @@
                             android:maxLines="1"
                             android:text="我的上报   29"
                             android:textColor="@color/white"
-                            android:textSize="13sp" />
+                            android:textSize="13dp" />
 
                         <View
                             android:layout_width="1dp"
@@ -93,7 +93,7 @@
                             android:maxLines="1"
                             android:text="已办事件   29"
                             android:textColor="@color/white"
-                            android:textSize="13sp" />
+                            android:textSize="13dp" />
                     </LinearLayout>
                 </LinearLayout>
             </RelativeLayout>
@@ -138,7 +138,7 @@
                             android:maxLines="1"
                             android:text="考勤打卡"
                             android:textColor="@color/text_gray01"
-                            android:textSize="16sp" />
+                            android:textSize="16dp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -150,7 +150,7 @@
                             android:maxLines="1"
                             android:text="点击进入打卡页面"
                             android:textColor="@color/text_gray01"
-                            android:textSize="8sp" />
+                            android:textSize="8dp" />
                     </RelativeLayout>
 
                     <RelativeLayout
@@ -180,7 +180,7 @@
                             android:maxLines="1"
                             android:text="通讯录"
                             android:textColor="@color/text_gray01"
-                            android:textSize="16sp" />
+                            android:textSize="16dp" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -192,7 +192,7 @@
                             android:maxLines="1"
                             android:text="点击进入企业通讯录"
                             android:textColor="@color/text_gray01"
-                            android:textSize="8sp" />
+                            android:textSize="8dp" />
                     </RelativeLayout>
 
                 </LinearLayout>
@@ -224,7 +224,7 @@
                             android:layout_centerVertical="true"
                             android:text="统计分析"
                             android:textColor="@color/text_444"
-                            android:textSize="13sp"
+                            android:textSize="13dp"
                             android:textStyle="bold" />
 
                         <ImageView
@@ -252,7 +252,7 @@
                     android:layout_marginTop="10dp"
                     android:text="其他"
                     android:textColor="@color/text_444"
-                    android:textSize="13sp"
+                    android:textSize="13dp"
                     android:textStyle="bold" />
 
                 <LinearLayout
@@ -278,7 +278,7 @@
                             android:layout_marginTop="10dp"
                             android:text="集展示、统计及预防等为一体"
                             android:textColor="@color/white"
-                            android:textSize="10sp" />
+                            android:textSize="10dp" />
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -302,6 +302,7 @@
                                     android:layout_centerVertical="true"
                                     android:ellipsize="end"
                                     android:maxLines="1"
+                                    android:textSize="@dimen/text_14"
                                     android:text="命案基本信息" />
 
                                 <ImageView
@@ -333,6 +334,7 @@
                                     android:layout_centerVertical="true"
                                     android:ellipsize="end"
                                     android:maxLines="1"
+                                    android:textSize="@dimen/text_14"
                                     android:text="命案犯罪嫌疑人" />
 
                                 <ImageView
@@ -363,6 +365,7 @@
                                     android:layout_centerVertical="true"
                                     android:ellipsize="end"
                                     android:maxLines="1"
+                                    android:textSize="@dimen/text_14"
                                     android:text="命案受害人" />
 
                                 <ImageView
@@ -398,7 +401,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="两新组织"
                                 android:textColor="@color/text_black_57"
-                                android:textSize="13sp"
+                                android:textSize="13dp"
                                 android:textStyle="bold" />
 
                             <LinearLayout
diff --git a/moduleijkplayer/src/main/res/values/dimens.xml b/moduleijkplayer/src/main/res/values/dimens.xml
index 0c30e6a..0378676 100644
--- a/moduleijkplayer/src/main/res/values/dimens.xml
+++ b/moduleijkplayer/src/main/res/values/dimens.xml
@@ -2,11 +2,11 @@
 <resources>
     <dimen name="dkplayer_controller_height">46dp</dimen>
     <dimen name="dkplayer_controller_icon_padding">12dp</dimen>
-    <dimen name="dkplayer_controller_text_size">16sp</dimen>
+    <dimen name="dkplayer_controller_text_size">16dp</dimen>
     <dimen name="dkplayer_default_spacing">10dp</dimen>
     <dimen name="dkplayer_controller_seekbar_size_n">14dp</dimen>
     <dimen name="dkplayer_controller_seekbar_size_s">14dp</dimen>
     <dimen name="dkplayer_controller_seekbar_max_size">1dp</dimen>
     <dimen name="dkplayer_play_btn_size">50dp</dimen>
-    <dimen name="dkplayer_controller_time_text_size">14sp</dimen>
+    <dimen name="dkplayer_controller_time_text_size">14dp</dimen>
 </resources>
\ No newline at end of file