Browse Source

提交人:jtm
提交内容:autosize适配

江天明 2 years ago
parent
commit
14aa049385
25 changed files with 229 additions and 141 deletions
  1. BIN
      BusinessCommon/src/main/res/drawable-xxxhdpi/guide_bg.webp
  2. BIN
      BusinessCommon/src/main/res/drawable-xxxhdpi/ic_guide_logo.webp
  3. BIN
      BusinessCommon/src/main/res/drawable-xxxhdpi/ic_resume.webp
  4. BIN
      BusinessCommon/src/main/res/drawable-xxxhdpi/ic_skin.webp
  5. BIN
      BusinessCommon/src/main/res/drawable-xxxhdpi/splash_logo.png
  6. 8 0
      BusinessCommon/src/main/res/drawable/shape_10pxffffff_stoke.xml
  7. 8 0
      BusinessCommon/src/main/res/drawable/shape_44pxfff6e9_stoke.xml
  8. 8 0
      BusinessCommon/src/main/res/drawable/shape_44pxffffff_stoke.xml
  9. 1 1
      BusinessCommon/src/main/res/drawable/thumb_circle.xml
  10. 2 0
      BusinessCommon/src/main/res/values-en/strings.xml
  11. 2 0
      BusinessCommon/src/main/res/values-fr/strings.xml
  12. 2 0
      BusinessCommon/src/main/res/values-ja/strings.xml
  13. 2 0
      BusinessCommon/src/main/res/values-zh-rCN/strings.xml
  14. 5 0
      BusinessCommon/src/main/res/values/colors.xml
  15. 2 0
      BusinessCommon/src/main/res/values/strings.xml
  16. 1 1
      BusinessCommon/src/main/res/values/themes.xml
  17. 2 0
      BusinessMain/src/main/AndroidManifest.xml
  18. 28 10
      BusinessSetting/src/main/AndroidManifest.xml
  19. 6 8
      BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt
  20. 46 30
      BusinessSetting/src/main/res/layout/activity_language.xml
  21. 39 38
      BusinessSetting/src/main/res/layout/activity_power_animation.xml
  22. 37 23
      BusinessSetting/src/main/res/layout/activity_privace_policy.xml
  23. 20 30
      BusinessSetting/src/main/res/layout/item_language_view.xml
  24. 8 0
      app/src/main/AndroidManifest.xml
  25. 2 0
      libThirdPart/build.gradle

BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/guide_bg.webp


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_guide_logo.webp


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_resume.webp


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_skin.webp


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/splash_logo.png


+ 8 - 0
BusinessCommon/src/main/res/drawable/shape_10pxffffff_stoke.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/convert_10px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/color_E4E4E4" />
+    <solid android:color="@color/color_fff"/>
+</shape>

+ 8 - 0
BusinessCommon/src/main/res/drawable/shape_44pxfff6e9_stoke.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/convert_60px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/color_EE8F08" />
+    <solid android:color="@color/color_FFF6E9"/>
+</shape>

+ 8 - 0
BusinessCommon/src/main/res/drawable/shape_44pxffffff_stoke.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/convert_60px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/color_A3A3A2" />
+    <solid android:color="@color/color_fff"/>
+</shape>

+ 1 - 1
BusinessCommon/src/main/res/drawable/thumb_circle.xml

@@ -3,6 +3,6 @@
 
     <corners android:radius="@dimen/convert_1080px" />
     <solid android:color="@color/color_E5E5E5" />
-    <size android:width="@dimen/convert_60px" android:height="@dimen/convert_60px"/>
+    <size android:width="@dimen/convert_24px" android:height="@dimen/convert_24px"/>
 
 </shape>

+ 2 - 0
BusinessCommon/src/main/res/values-en/strings.xml

@@ -132,4 +132,6 @@
     <string name="screen_saver_title">是否进入息屏状态?</string>
     <string name="please_fill_in">Please fill in</string>
     <string name="Password_is_not_the_same">Password is not the same</string>
+    <string name="enter">ENTER</string>
+    <string name="repeat">REPEAT</string>
 </resources>

+ 2 - 0
BusinessCommon/src/main/res/values-fr/strings.xml

@@ -132,4 +132,6 @@
     <string name="screen_saver_title">是否进入息屏状态?</string>
     <string name="please_fill_in">Please fill in</string>
     <string name="Password_is_not_the_same">Password is not the same</string>
+    <string name="enter">ENTER</string>
+    <string name="repeat">REPEAT</string>
 </resources>

+ 2 - 0
BusinessCommon/src/main/res/values-ja/strings.xml

@@ -132,4 +132,6 @@
     <string name="screen_saver_title">是否进入息屏状态?</string>
     <string name="please_fill_in">Please fill in</string>
     <string name="Password_is_not_the_same">Password is not the same</string>
+    <string name="enter">ENTER</string>
+    <string name="repeat">REPEAT</string>
 </resources>

+ 2 - 0
BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -132,4 +132,6 @@
     <string name="screen_saver_title">是否进入息屏状态?</string>
     <string name="please_fill_in">Please fill in</string>
     <string name="Password_is_not_the_same">Password is not the same</string>
+    <string name="enter">ENTER</string>
+    <string name="repeat">REPEAT</string>
 </resources>

+ 5 - 0
BusinessCommon/src/main/res/values/colors.xml

@@ -29,4 +29,9 @@
     <color name="color_92cf40">#92cf40</color>
     <color name="color_EE0000">#EE0000</color>
     <color name="color_000000">#000</color>
+    <color name="color_1A1A1A">#1A1A1A</color>
+    <color name="color_EE8F08">#EE8F08</color>
+    <color name="color_FFF6E9">#FFF6E9</color>
+    <color name="color_A3A3A2">#A3A3A2</color>
+    <color name="color_E4E4E4">#E4E4E4</color>
 </resources>

+ 2 - 0
BusinessCommon/src/main/res/values/strings.xml

@@ -207,4 +207,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="screen_saver_title">是否进入息屏状态?</string>
     <string name="please_fill_in">Please fill in</string>
     <string name="Password_is_not_the_same">Password is not the same</string>
+    <string name="enter">ENTER</string>
+    <string name="repeat">REPEAT</string>
 </resources>

+ 1 - 1
BusinessCommon/src/main/res/values/themes.xml

@@ -18,7 +18,7 @@
 
     <style name="SplashTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
-        <item name="android:windowBackground">@drawable/ic_screen1</item>
+        <item name="android:windowBackground">@drawable/splash_logo</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>

+ 2 - 0
BusinessMain/src/main/AndroidManifest.xml

@@ -5,8 +5,10 @@
     <application>
         <activity
             android:launchMode="singleTask"
+            android:screenOrientation="landscape"
             android:name=".ui.ModeEntranceActivity" />
         <activity
+            android:screenOrientation="landscape"
             android:launchMode="singleTask"
             android:name=".ui.HomeActivity" />
     </application>

+ 28 - 10
BusinessSetting/src/main/AndroidManifest.xml

@@ -9,25 +9,43 @@
         tools:ignore="ProtectedPermissions" />
 
     <application>
-        <activity android:name=".ui.PowerAnimationActivity" />
-        <activity android:name=".ui.LanguageActivity" />
+        <activity
+            android:name=".ui.PowerAnimationActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.LanguageActivity"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".ui.ScreensaverActivity"
-            android:launchMode="singleTop" />
-        <activity android:name=".ui.WifiListActivity" />
+            android:launchMode="singleTop"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.WifiListActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".ui.SettingMainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="landscape">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.PrivacyPolicyActivity" />
-        <activity android:name=".ui.RestoreActivity" />
-        <activity android:name=".ui.SoundActivity" />
-        <activity android:name=".ui.BrightnessActivity" />
+        <activity
+            android:name=".ui.PrivacyPolicyActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.RestoreActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.SoundActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.BrightnessActivity"
+            android:screenOrientation="landscape" />
         <activity
             android:name=".ui.AboutActivity"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape" />
     </application>
 </manifest>

+ 6 - 8
BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -72,21 +72,19 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 onBind {
                     val ivIcon = findView<ImageView>(R.id.ic_icon)
                     val tvTitle = findView<AppCompatTextView>(R.id.tv_title)
-                    val cardView = findView<CardView>(R.id.cardView)
+                    val cardView = findView<RelativeLayout>(R.id.content_layout)
                     if (selectedPosition == absoluteAdapterPosition) {
-                        tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_F4A12E))
-                        cardView.setCardBackgroundColor(context.resources.getColor(com.develop.common.R.color.color_33F4A12E))
-                        cardView.cardElevation = 0.1f
+                        tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_EE8F08))
+                        cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxfff6e9_stoke)
                     } else {
-                        tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_6B6B6B))
-                        cardView.setCardBackgroundColor(context.resources.getColor(com.develop.common.R.color.color_fff))
-                        cardView.cardElevation = dp6
+                        tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_1A1A1A))
+                        cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxffffff_stoke)
                     }
                     val model = getModel<LanguageModel>()
                     ivIcon.load(model.icon)
                     tvTitle.updateText(model.languageName)
                 }
-                R.id.cardView.onClick {
+                R.id.content_layout.onClick {
                     updateSelectionPos(absoluteAdapterPosition)
                 }
             }

+ 46 - 30
BusinessSetting/src/main/res/layout/activity_language.xml

@@ -12,38 +12,54 @@
 
     <ImageView
         android:id="@+id/iv_banner"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_522px"
-        android:background="@drawable/ic_language_banner" />
+        android:layout_width="@dimen/convert_480px"
+        android:layout_height="match_parent"
+        android:background="@drawable/guide_bg" />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_language"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/iv_banner"
-        android:layout_marginStart="@dimen/convert_75px"
-        android:layout_marginTop="@dimen/convert_77px"
-        android:text="@string/select_language" />
+    <ImageView
+        android:layout_width="@dimen/convert_350px"
+        android:layout_height="@dimen/convert_350px"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/convert_65px"
+        android:background="@drawable/ic_guide_logo" />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_next"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/convert_75px"
-        android:layout_marginEnd="@dimen/convert_75px"
-        android:layout_marginBottom="@dimen/convert_93px"
-        android:background="@drawable/shape_60pxf4a12e_corners"
-        android:gravity="center"
-        android:text="@string/next"
-        android:textColor="@color/color_fff"
-        android:textSize="@dimen/convert_54px" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/language_recycle"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_language"
-        android:layout_marginTop="@dimen/convert_74px" />
+        android:layout_height="match_parent"
+        android:layout_toEndOf="@id/iv_banner">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_language"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/convert_70px"
+            android:layout_marginTop="@dimen/convert_60px"
+            android:text="@string/select_language"
+            android:textColor="@color/color_1A1A1A"
+            android:textSize="@dimen/convert_36px" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_next"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_98px"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/convert_70px"
+            android:layout_marginEnd="@dimen/convert_70px"
+            android:layout_marginBottom="@dimen/convert_50px"
+            android:background="@drawable/shape_60pxf4a12e_corners"
+            android:gravity="center"
+            android:text="@string/next"
+            android:textColor="@color/color_fff"
+            android:textSize="@dimen/convert_36px" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/language_recycle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_language"
+            android:layout_marginStart="@dimen/convert_70px"
+            android:layout_marginTop="@dimen/convert_48px"
+            android:layout_marginEnd="@dimen/convert_70px" />
 
+    </RelativeLayout>
 </RelativeLayout>

+ 39 - 38
BusinessSetting/src/main/res/layout/activity_power_animation.xml

@@ -9,17 +9,17 @@
         android:layout_height="match_parent" />
 
     <View
-        android:visibility="gone"
         android:id="@+id/mask_view"
-        android:background="@color/color_33000000"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:background="@color/color_33000000"
+        android:visibility="gone" />
 
 
     <ImageView
         android:id="@+id/iv_play"
-        android:layout_width="@dimen/convert_270px"
-        android:layout_height="@dimen/convert_270px"
+        android:layout_width="@dimen/convert_126px"
+        android:layout_height="@dimen/convert_126px"
         android:layout_centerInParent="true"
         android:background="@drawable/ic_play"
         android:visibility="gone" />
@@ -28,86 +28,87 @@
         android:id="@+id/seekbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:progressDrawable="@drawable/shape_30pxccffffff_corners"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/convert_75px"
-        android:thumb="@drawable/thumb_circle"
-        android:layout_marginEnd="@dimen/convert_75px"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:layout_marginBottom="@dimen/convert_74px"
         android:background="@null"
-        android:thumbOffset="0dp"
         android:duplicateParentState="true"
-        android:maxHeight="@dimen/convert_26px"
-        android:layout_marginBottom="@dimen/convert_74px" />
+        android:maxHeight="@dimen/convert_12px"
+        android:progressDrawable="@drawable/shape_30pxccffffff_corners"
+        android:thumb="@drawable/thumb_circle"
+        android:thumbOffset="0dp" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_skin"
-        android:layout_width="@dimen/convert_120px"
-        android:layout_height="@dimen/convert_120px"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_40px"
         android:layout_marginEnd="@dimen/convert_72px"
-        android:background="@drawable/white_circle"
         android:gravity="center"
         android:text="@string/skip"
-        android:textColor="@color/color_F4A12E"
-        android:textSize="@dimen/convert_38px" />
+        android:textColor="@color/color_fff"
+        android:textSize="@dimen/convert_40px" />
 
 
     <LinearLayout
-        android:visibility="gone"
         android:id="@+id/function_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <RelativeLayout
             android:id="@+id/skin_layout"
-            android:layout_width="@dimen/convert_450px"
-            android:layout_height="@dimen/convert_120px"
-            android:background="@drawable/shadow_60pxffa627_stoke">
+            android:layout_width="@dimen/convert_350px"
+            android:layout_height="@dimen/convert_98px"
+            android:background="@drawable/shadow_60pxffffff_stoke">
 
             <ImageView
                 android:id="@+id/iv_skin"
-                android:layout_width="@dimen/convert_120px"
-                android:layout_height="@dimen/convert_120px"
-                android:layout_marginStart="@dimen/convert_50px"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="@dimen/convert_55px"
                 android:background="@drawable/ic_skin" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_24px"
+                android:layout_marginStart="@dimen/convert_28px"
                 android:layout_toEndOf="@id/iv_skin"
-                android:text="@string/skip"
+                android:text="@string/enter"
                 android:textColor="@color/color_FFA627"
-                android:textSize="@dimen/convert_54px" />
+                android:textSize="@dimen/convert_36px" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_marginTop="@dimen/convert_95px"
             android:id="@+id/resume_layout"
-            android:layout_width="@dimen/convert_450px"
-            android:layout_height="@dimen/convert_120px"
+            android:layout_width="@dimen/convert_350px"
+            android:layout_height="@dimen/convert_98px"
+            android:layout_marginTop="@dimen/convert_40px"
             android:background="@drawable/shadow_60pxffffff_stoke">
 
             <ImageView
                 android:id="@+id/iv_resume"
-                android:layout_width="@dimen/convert_120px"
-                android:layout_height="@dimen/convert_120px"
-                android:layout_marginStart="@dimen/convert_50px"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="@dimen/convert_55px"
                 android:background="@drawable/ic_resume" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/convert_24px"
+                android:layout_marginStart="@dimen/convert_28px"
                 android:layout_toEndOf="@id/iv_resume"
-                android:text="@string/resume"
+                android:text="@string/repeat"
                 android:textColor="@color/color_fff"
-                android:textSize="@dimen/convert_54px" />
+                android:textSize="@dimen/convert_36px" />
         </RelativeLayout>
     </LinearLayout>
 

+ 37 - 23
BusinessSetting/src/main/res/layout/activity_privace_policy.xml

@@ -1,35 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <com.develop.common.widget.TopTitleView
         android:id="@+id/top_bar"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/iv_banner" />
+
+    <ImageView
+        android:id="@+id/iv_banner"
+        android:layout_width="@dimen/convert_480px"
+        android:layout_height="match_parent"
+        android:background="@drawable/guide_bg" />
+
+    <ImageView
+        android:layout_width="@dimen/convert_350px"
+        android:layout_height="@dimen/convert_350px"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/convert_65px"
+        android:background="@drawable/ic_guide_logo" />
 
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_agree"
-        android:textSize="@dimen/convert_54px"
-        android:textColor="@color/color_fff"
-        android:gravity="center"
-        android:background="@drawable/shape_60pxe5e5e5_corners"
-        android:layout_marginBottom="@dimen/convert_95px"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/convert_75px"
-        android:layout_marginEnd="@dimen/convert_75px"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px"/>
+        android:layout_height="@dimen/convert_98px"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:layout_marginBottom="@dimen/convert_50px"
+        android:layout_toEndOf="@id/iv_banner"
+        android:background="@drawable/shape_60pxe5e5e5_corners"
+        android:gravity="center"
+        android:textColor="@color/color_fff"
+        android:textSize="@dimen/convert_36px" />
 
     <LinearLayout
         android:id="@+id/agree_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@id/tv_agree"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/convert_77px"
+        android:layout_marginBottom="@dimen/convert_40px"
+        android:layout_toEndOf="@id/iv_banner"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -48,16 +62,16 @@
     </LinearLayout>
 
 
-    <androidx.cardview.widget.CardView
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/top_bar"
-        android:layout_marginStart="@dimen/convert_45px"
-        android:layout_marginTop="@dimen/convert_20px"
-        android:layout_marginEnd="@dimen/convert_45px"
         android:layout_above="@id/agree_layout"
-        android:layout_marginBottom="@dimen/convert_60px"
-        app:cardCornerRadius="@dimen/convert_30px">
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_marginTop="@dimen/convert_110px"
+        android:layout_marginEnd="@dimen/convert_40px"
+        android:layout_marginBottom="@dimen/convert_40px"
+        android:layout_toEndOf="@id/iv_banner"
+        android:background="@drawable/shape_10pxffffff_stoke">
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -72,11 +86,11 @@
                 android:layout_marginEnd="@dimen/convert_44px"
                 android:lineSpacingExtra="@dimen/convert_20px"
                 android:text="@string/privacy_policy_content"
-                android:textColor="@color/color_6B6B6B"
-                android:textSize="@dimen/convert_39px" />
+                android:textColor="@color/color_1A1A1A"
+                android:textSize="@dimen/convert_28px" />
 
         </androidx.core.widget.NestedScrollView>
-    </androidx.cardview.widget.CardView>
+    </RelativeLayout>
 
 
 </RelativeLayout>

+ 20 - 30
BusinessSetting/src/main/res/layout/item_language_view.xml

@@ -1,34 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_layout"
     android:layout_width="match_parent"
-    android:id="@+id/cardView"
-    android:layout_height="@dimen/convert_120px"
-    android:layout_marginStart="@dimen/convert_75px"
-    android:layout_marginEnd="@dimen/convert_75px"
-    android:layout_marginBottom="@dimen/convert_30px"
-    app:cardCornerRadius="@dimen/convert_60px">
+    android:layout_marginBottom="@dimen/convert_24px"
+    android:layout_height="@dimen/convert_88px">
 
-    <RelativeLayout
-        android:id="@+id/content_layout"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_120px">
+    <ImageView
+        android:id="@+id/ic_icon"
+        android:layout_width="@dimen/convert_40px"
+        android:layout_height="@dimen/convert_40px"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/convert_54px" />
 
-        <ImageView
-            android:id="@+id/ic_icon"
-            android:layout_width="@dimen/convert_60px"
-            android:layout_height="@dimen/convert_60px"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/convert_45px" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/convert_44px"
-            android:layout_toEndOf="@id/ic_icon"
-            android:textColor="@color/color_6B6B6B"
-            android:textSize="@dimen/convert_45px" />
-    </RelativeLayout>
-</androidx.cardview.widget.CardView>
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/convert_40px"
+        android:layout_toEndOf="@id/ic_icon"
+        android:textColor="@color/color_1A1A1A"
+        android:textSize="@dimen/convert_30px" />
+</RelativeLayout>

+ 8 - 0
app/src/main/AndroidManifest.xml

@@ -42,6 +42,7 @@
         android:theme="@style/Theme.FoodCooking"
         tools:targetApi="31">
         <activity
+            android:screenOrientation="landscape"
             android:name=".MainActivity"
             android:exported="true"
             android:theme="@style/SplashTheme">
@@ -51,6 +52,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <meta-data
+            android:name="design_width_in_dp"
+            android:value="640" />
+        <meta-data
+            android:name="design_height_in_dp"
+            android:value="400" />
     </application>
 
 </manifest>

+ 2 - 0
libThirdPart/build.gradle

@@ -69,5 +69,7 @@ dependencies {
     api 'com.github.princekin-f:EasyFloat:2.0.4'
     api 'de.hdodenhof:circleimageview:3.1.0'
     api 'com.google.zxing:core:3.3.3'
+    //屏幕适配
+    api "me.jessyan:autosize:1.2.1"
 
 }