Browse Source

提交人:jtm
提交内容:漏提交

江天明 1 year ago
parent
commit
5959dbe47c

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

@@ -54,8 +54,8 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             binding.tvSkip.setBackgroundResource(com.develop.common.R.drawable.bg_skip_text)
         }
         if (isBrand036I()) {
-            binding.ivLogo.setVisible()
-          //  binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
+            //binding.ivLogo.setVisible()
+             binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
         }
         initFragmentList()
         viewModel.enterFromHome = enterFromHome

+ 4 - 0
BusinessSetting/src/main/java/com/develop/setting/ui/WifiListActivity.kt

@@ -18,6 +18,8 @@ import com.blankj.utilcode.util.ViewUtils
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
+import com.develop.base.ext.setGone
+import com.develop.base.ext.setVisible
 import com.develop.base.manager.WifiData
 import com.develop.base.manager.WifiHelp
 import com.develop.base.util.GlobalToast
@@ -79,8 +81,10 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
 
         if (isBrand036I()){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
+            binding.ivLogo.setVisible()
         }
         if (isFromMainSetting) {
+            binding.ivLogo.setGone()
             binding.tvSkin.visibility = View.GONE
             val params = binding.tvNext.layoutParams as RelativeLayout.LayoutParams
             params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM)

+ 8 - 0
BusinessSetting/src/main/res/layout/activity_wifi_list.xml

@@ -13,6 +13,14 @@
         android:background="@drawable/guide_bg" />
 
 
+    <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
         android:id="@+id/tv_title"