提交人：jtm

提交内容：bug fixed

BusinessAuth/src/main/java/com/develop/auth/ui/MemberAuthActivity.kt

@@ -14,6 +14,7 @@ import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
+import com.develop.base.ext.setVisible
 import com.develop.base.util.MMkvUtils
 import com.develop.common.router.Screens
 import com.develop.common.tag.LOGIN_TAG
@@ -47,12 +48,13 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ARouter.getInstance().inject(this)
-        if (isNightTheme()){
+        if (isNightTheme()) {
             binding.tvSkip.setBackgroundResource(0)
         } else {
             binding.tvSkip.setBackgroundResource(com.develop.common.R.drawable.bg_skip_text)
         }
-        if (isBrand036I()){
+        if (isBrand036I()) {
+            binding.ivLogo.setVisible()
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
         }
         initFragmentList()

BusinessAuth/src/main/res/layout/activity_member_auth.xml

@@ -15,12 +15,14 @@
         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:visibility="gone"
+        android:id="@+id/iv_logo"
+        android:layout_width="@dimen/convert_320px"
+        android:layout_height="@dimen/convert_130px"
+        android:background="@drawable/ic_logo_036i"
+        android:layout_marginStart="@dimen/convert_65px"
+        android:layout_gravity="center_vertical"/>
 
     <FrameLayout
         android:id="@+id/fl_container"

BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -15,6 +15,7 @@ import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
 import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.base.util.MMkvUtils
@@ -52,6 +53,10 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        if (isBrand036I()) {
+            binding.ivLogo.setVisible()
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
+        }
         isFromSetting = intent.extras?.getBoolean(LANGUAGE_FROM_SETTING) ?: false
         if (isFromSetting) {
             binding.apply {

BusinessSetting/src/main/java/com/develop/setting/ui/PrivacyPolicyActivity.kt

@@ -10,6 +10,7 @@ import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
+import com.develop.base.ext.setVisible
 import com.develop.base.mvvm.BaseBindingActivity
 import com.develop.base.scop.runOnMainThread
 import com.develop.common.event.FinishAtyEvent
@@ -39,7 +40,8 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.agreeLayout.visibility = View.GONE
         }
 
-        if (isBrand036I()){
+        if (isBrand036I()) {
+            binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
         }
         countForPolicyTime()

BusinessSetting/src/main/res/layout/activity_language.xml

@@ -31,13 +31,14 @@
         android:layout_height="match_parent"
         android:background="@drawable/guide_bg" />
 
-<!--    <ImageView-->
-<!--        android:id="@+id/iv_logo"-->
-<!--        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:visibility="gone"
+        android:id="@+id/iv_logo"
+        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_logo_036i" />
 
     <RelativeLayout
         android:layout_width="match_parent"

BusinessSetting/src/main/res/layout/activity_privace_policy.xml

@@ -31,12 +31,14 @@
         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:visibility="gone"
+        android:id="@+id/iv_logo"
+        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_logo_036i" />
 
 
     <androidx.appcompat.widget.AppCompatTextView