Browse Source

提交人:jtm
提交内容:bug fixed

江天明 1 year ago
parent
commit
bde00180d7
2 changed files with 21 additions and 4 deletions
  1. 18 1
      app/build.gradle
  2. 3 3
      app/src/main/java/com/develop/foodcooking/FoodCookingApp.kt

+ 18 - 1
app/build.gradle

@@ -52,6 +52,22 @@ android {
         }
         multiDexEnabled true
     }
+    flavorDimensions "platform"
+    productFlavors {
+        brand010D {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+
+        }
+
+        brand030A {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+        }
+
+    }
 
     signingConfigs {
         debug {
@@ -78,7 +94,8 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            signingConfig signingConfigs.release
+            productFlavors.brand010D.signingConfig signingConfigs.release
+            productFlavors.brand030A.signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

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

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