wbspool пре 1 година
родитељ
комит
bceb957ff9

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

@@ -84,7 +84,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="update_the_recipes">Update the recipes</string>
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
-    <string name="tp">FIRMWARE</string>
+    <string name="tp">FW</string>
     <string name="serial_number">SN</string>
     <string name="standby_time">MODEL</string>
     <string name="update">Update</string>

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

@@ -80,7 +80,7 @@
     <string name="update_the_recipes">Update the recipes</string>
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
-    <string name="tp">FIRMWARE</string>
+    <string name="tp">FW</string>
     <string name="serial_number">SN</string>
     <string name="standby_time">MODEL</string>
     <string name="update">Update</string>

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

@@ -80,7 +80,7 @@
     <string name="update_the_recipes">Update the recipes</string>
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
-    <string name="tp">FIRMWARE</string>
+    <string name="tp">FW</string>
     <string name="serial_number">SN</string>
     <string name="standby_time">MODEL</string>
     <string name="update">Update</string>

+ 2 - 2
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/splash_logo</item>
+        <item name="android:windowBackground">@color/bg_color</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
@@ -26,7 +26,7 @@
 
     <style name="SplashNightTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
-        <item name="android:windowBackground">@drawable/splash_logo_010</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>

+ 1 - 1
app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="010D"
+    brandCode="000A"
     model="1039"
 }
 

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -42,7 +42,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.FoodCooking"
+        android:theme="@style/SplashTheme"
         android:largeHeap="true"
         tools:targetApi="31">
         <activity

+ 2 - 2
app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

@@ -70,8 +70,8 @@ class FoodCookingApp : BaseApp() {
         WindowManager.getInstance().init(this, OptionFactory())
         val isNight = !isNightTheme()
         //切换主题,theme=0 night= false 是0000的主题,而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
-        ThemeSkinService.getInstance().switchThemeSkin(1)
-        setNightTheme(true)
+        ThemeSkinService.getInstance().switchThemeSkin(0)
+        setNightTheme(false)
         SerialPortUtils.init()
         CofarSDK.register(this)
         CofarSDK.stopNative()