Merge remote-tracking branch 'origin/master' into baotou_medical_school

# Conflicts:
#	app/build.gradle

app/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.西农电子信息牌"
+        android:theme="@style/Theme.电子信息牌"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".main.things.ThingsListActivity"

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

@@ -290,7 +290,7 @@
                                 android:id="@+id/xnBaseUrlBT"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="西农地址" />
+                                android:text="线上地址" />
                         </LinearLayout>
 
                         <TextView
@@ -375,7 +375,7 @@
                                 android:id="@+id/xnMqttBT"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="西农地址" />
+                                android:text="线上地址" />
 
                         </LinearLayout>
 

app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.西农电子信息牌" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.电子信息牌" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">西农电子信息牌</string>
+    <string name="app_name">电子信息牌</string>
     <string name="multiple_empty_retry">暂无数据，点击重试</string>
     <string name="multiple_error_retry">哎呀，系统出错了，点击重试</string>
     <string name="multiple_not_network_retry">当前无网络，点击重试</string>

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

@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Base.Theme.西农电子信息牌" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.电子信息牌" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
 
-    <style name="Theme.西农电子信息牌" parent="Base.Theme.西农电子信息牌" />
+    <style name="Theme.电子信息牌" parent="Base.Theme.电子信息牌" />
 </resources>

settings.gradle

@@ -28,5 +28,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "西农电子信息牌"
+rootProject.name = "电子信息牌"
 include ':app'