Browse Source

版本修改

wbspool 2 years ago
parent
commit
79f31792ad

+ 6 - 6
BusinessAuth/src/main/res/layout/activity_member_auth.xml

@@ -14,12 +14,12 @@
         android:scaleType="centerCrop"
         android:src="@drawable/guide_bg"/>
 
-    <View
-        android:layout_width="@dimen/convert_320px"
-        android:layout_height="@dimen/convert_130px"
-        android:background="@drawable/ic_guide_logo"
-        android:layout_marginStart="@dimen/convert_65px"
-        android:layout_gravity="center_vertical"/>
+<!--    <View-->
+<!--        android:layout_width="@dimen/convert_320px"-->
+<!--        android:layout_height="@dimen/convert_130px"-->
+<!--        android:background="@drawable/ic_guide_logo"-->
+<!--        android:layout_marginStart="@dimen/convert_65px"-->
+<!--        android:layout_gravity="center_vertical"/>-->
 
     <FrameLayout
         android:id="@+id/fl_container"

BIN
BusinessCommon/src/main/res/raw/video.mp4


+ 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/splash_logo</item>
+        <item name="android:windowBackground">@drawable/splash_logo_010</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>

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

@@ -125,9 +125,14 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 return@setOnClickListener
             }
             if (isFromSetting) {
-                isLanguageTip = true
-                cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips2)
-                cancelConfirmDialog.showDialog(supportFragmentManager, "tips2")
+                if(binding.languageRecycle.models?.size!! > 1){
+                    isLanguageTip = true
+                    cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips2)
+                    cancelConfirmDialog.showDialog(supportFragmentManager, "tips2")
+                }else{
+                    finish()
+                }
+
             } else {
                 updateLanguage()
                 navigateTo(Screens.Setting.POLICY)

+ 6 - 6
BusinessSetting/src/main/res/layout/activity_wifi_list.xml

@@ -11,12 +11,12 @@
         android:layout_height="match_parent"
         android:background="@drawable/guide_bg" />
 
-    <ImageView
-        android:layout_width="@dimen/convert_320px"
-        android:layout_height="@dimen/convert_130px"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/convert_65px"
-        android:background="@drawable/ic_guide_logo" />
+<!--    <ImageView-->
+<!--        android:layout_width="@dimen/convert_320px"-->
+<!--        android:layout_height="@dimen/convert_130px"-->
+<!--        android:layout_centerVertical="true"-->
+<!--        android:layout_marginStart="@dimen/convert_65px"-->
+<!--        android:background="@drawable/ic_guide_logo" />-->
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_title"

+ 2 - 2
app/build.gradle

@@ -7,8 +7,8 @@ plugins {
 
 
 ext{
-    versionCode=230301151
-    brandCode="034A"
+    versionCode=230310171
+    brandCode="010A"
     brandVersionCode=versionCode
     model="1037"
 }

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

@@ -49,7 +49,8 @@
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>