1.完成设置-网络设置UI

app/src/main/java/com/waytous/anticollision/AntiCollisionApp.kt

@@ -14,7 +14,7 @@ class AntiCollisionApp: Application(){
     override fun onCreate() {
         super.onCreate()
         Utils.init(this)
-        LogUtils.getConfig().globalTag = "Waytous"
+        LogUtils.getConfig().globalTag = "male"
         SPStaticUtils.setDefaultSPUtils(SPUtils.getInstance("settings"))
     }
 

app/src/main/res/drawable-night/background_btn_add.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false" android:drawable="@mipmap/icon_add_night"/>
+    <item android:state_pressed="true" android:drawable="@mipmap/icon_add_pressed"/>
+</selector>
\ No newline at end of file

app/src/main/res/drawable-night/background_btn_minus.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false" android:drawable="@mipmap/icon_minus_night"/>
+    <item android:state_pressed="true" android:drawable="@mipmap/icon_minus_pressed"/>
+</selector>
\ No newline at end of file

app/src/main/res/drawable-night/background_user_settings_item1.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="621dp"
+    android:height="86.5dp"
+    android:viewportWidth="621"
+    android:viewportHeight="86.5">
+  <path
+      android:pathData="M13,1H11A10,10 0,0 0,1 11V75.5a10,10 0,0 0,10 10H610a10,10 0,0 0,10 -10V11A10,10 0,0 0,610 1H144"
+      android:strokeAlpha="0.1"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#d1d1d1"/>
+</vector>

app/src/main/res/drawable-night/background_user_settings_item2.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="299dp"
+    android:height="217.5dp"
+    android:viewportWidth="299"
+    android:viewportHeight="217.5">
+  <path
+      android:pathData="M13,1H11A10,10 0,0 0,1 11V206.5a10,10 0,0 0,10 10H288a10,10 0,0 0,10 -10V11A10,10 0,0 0,288 1H134"
+      android:strokeAlpha="0.1"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#d1d1d1"/>
+</vector>

app/src/main/res/drawable/background_btn_add.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false" android:drawable="@mipmap/icon_add_light"/>
+    <item android:state_pressed="true" android:drawable="@mipmap/icon_add_pressed"/>
+</selector>
\ No newline at end of file

app/src/main/res/drawable/background_btn_minus.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false" android:drawable="@mipmap/icon_minus_light"/>
+    <item android:state_pressed="true" android:drawable="@mipmap/icon_minus_pressed"/>
+</selector>
\ No newline at end of file

app/src/main/res/drawable/background_user_settings_item1.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="621dp"
+    android:height="86.5dp"
+    android:viewportWidth="621"
+    android:viewportHeight="86.5">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11,2a9,9 0,0 0,-9 9V75.5a9,9 0,0 0,9 9H610a9,9 0,0 0,9 -9V11a9,9 0,0 0,-9 -9H136.5V0H610a11,11 0,0 1,11 11V75.5a11,11 0,0 1,-11 11H11a11,11 0,0 1,-11 -11V11A11,11 0,0 1,11 0h2V2Z"
+      android:fillAlpha="0.1"/>
+</vector>

app/src/main/res/drawable/background_user_settings_item2.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="299dp"
+    android:height="217.5dp"
+    android:viewportWidth="299"
+    android:viewportHeight="217.5">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11,2a9,9 0,0 0,-9 9V206.5a9,9 0,0 0,9 9H288a9,9 0,0 0,9 -9V11a9,9 0,0 0,-9 -9H134V0H288a11,11 0,0 1,11 11V206.5a11,11 0,0 1,-11 11H11a11,11 0,0 1,-11 -11V11A11,11 0,0 1,11 0h2V2Z"
+      android:fillAlpha="0.1"/>
+</vector>

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

@@ -77,7 +77,6 @@
         android:id="@+id/userSettingsContentWrapper"
         android:layout_width="@dimen/dp_0"
         android:layout_height="@dimen/dp_0"
-        android:layout_marginStart="@dimen/dp_26"
         app:layout_constraintTop_toTopOf="@id/useSettingsRadioGroup"
         app:layout_constraintBottom_toBottomOf="@id/useSettingsRadioGroup"
         app:layout_constraintStart_toStartOf="@id/useSettingsRadioGroup"/>

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

@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/dp_578"
+    android:layout_marginStart="@dimen/dp_26"
     tools:context=".ui.settings.UserSettingsFragment">
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/vehicleInfoLayout1"
@@ -155,15 +156,13 @@
             app:layout_constraintTop_toTopOf="@id/userSettingsDeviceHigh"
             app:layout_constraintBottom_toBottomOf="@id/userSettingsDeviceHigh"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/vehicleInfoImage"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginStart="51dp"
-        app:srcCompat="@mipmap/illustration_vehicle_size"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/vehicleInfoLayout1"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:srcCompat="@mipmap/illustration_vehicle_size" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/values/dimens.xml

@@ -393,6 +393,7 @@
     <dimen name="dp_560">560dp</dimen>
     <dimen name="dp_578">578dp</dimen>
     <dimen name="dp_600">600dp</dimen>
+    <dimen name="dp_620">620dp</dimen>
     <dimen name="dp_636">636dp</dimen>
     <dimen name="dp_652">652dp</dimen>
     <dimen name="dp_640">640dp</dimen>
@@ -401,6 +402,7 @@
     <dimen name="dp_720">720dp</dimen>
     <dimen name="dp_896">896dp</dimen>
     <dimen name="dp_984">984dp</dimen>
+    <dimen name="dp_1072">1072dp</dimen>
 
     <!-- font size,you can add if there is no one -->
     <dimen name="sp_6">6sp</dimen>

app/src/main/res/values/strings.xml

@@ -101,7 +101,27 @@
     <string name="vehicle_width">车宽(m)</string>
     <string name="vehicle_high">车高(m)</string>
     <string name="network_settings">网络设置</string>
+    <string name="network_settings_back_service_host">后台服务IP</string>
+    <string name="network_settings_service_port">server端口号</string>
+    <string name="network_settings_communication_service_host">通讯服务IP</string>
+    <string name="network_settings_map_service_host">地图服务IP</string>
+    <string name="network_settings_port">端口号</string>
+    <string name="network_settings_front_service_host">前端服务IP</string>
+    <string name="network_settings_sim_apn">SIM卡APN</string>
     <string name="fixed_info">安装信息</string>
+    <string name="fixed_base_info_settings">基础信息设置</string>
+    <string name="fixed_imu_position">IMU安装位置</string>
+    <string name="fixed_device_angle">设备安装角度</string>
+    <string name="fixed_main_antenna_position">主天线安装位置</string>
+    <string name="fixed_secondary_antenna_position">副天线安装位置</string>
+    <string name="fixed_base_info_t1">T1(m)</string>
+    <string name="fixed_base_info_t0">T0(m)</string>
+    <string name="fixed_imu_position_right">右移(m)</string>
+    <string name="fixed_imu_position_back">后移(m)</string>
+    <string name="fixed_imu_position_top">上移(m)</string>
+    <string name="fixed_device_angle_x">X(deg)</string>
+    <string name="fixed_device_angle_y">Y(deg)</string>
+    <string name="fixed_device_angle_z">Z(deg)</string>
     <string name="vehicleInfo_calibration_title">设备尺寸图示：</string>