Merge branch 'master' of http://39.97.65.143:81/android/android_flowbox

app/src/main/java/com/mints/flowbox/ui/fragment/HomeFragment.kt

@@ -152,9 +152,9 @@ class HomeFragment : BaseFragment(), WifiStateManager.WifiStateCallback,
         if (!TextUtils.isEmpty(userManager?.userID)) {
             if (!AntiAuditManager.instance.isBlack()) {
                 homePresenter.getHotActivity()
+                homePresenter.getDownloadBottoms()
             }
             homePresenter.getBubbleMsg()
-            homePresenter.getDownloadBottoms()
             (requireActivity() as MainActivity).refreshHall()
         } else {
             (requireActivity() as MainActivity).userLogin(Constant.FRAGMENT_CLICK_ONE)

app/src/main/java/com/mints/flowbox/ui/fragment/MyFragment.kt

@@ -46,6 +46,8 @@ import com.mints.flowbox.utils.ToolUtil
 import com.mints.library.utils.CommonUtils
 import com.mints.library.utils.GlideUtils
 import kotlinx.android.synthetic.main.fragment_main_my.*
+import kotlinx.android.synthetic.main.fragment_main_my.swipeRefreshLayout
+import kotlinx.android.synthetic.main.fragment_wifi.*
 import kotlinx.android.synthetic.main.header_layout.*
 import kotlinx.android.synthetic.main.item_fragment_main_my_title.*
 import kotlinx.android.synthetic.main.view_title.*
@@ -752,6 +754,12 @@ class MyFragment : BaseFragment(),
             )
         )
 
+        if (!AntiAuditManager.instance.isBlack()) {
+            root_aboutus.visibility=View.VISIBLE
+        }else{
+            root_aboutus.visibility=View.GONE
+        }
+
         tv_left_subtitle.setOnClickListener(this)
         item_title_id.setOnClickListener(this)
         iv_right_icon.setOnClickListener(this)

app/src/main/java/com/mints/flowbox/ui/fragment/WifiFragment.kt

@@ -114,6 +114,14 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
                 (requireActivity() as MainActivity).userLogin(Constant.FRAGMENT_CLICK_THREE)
             }
 
+            if (!AntiAuditManager.instance.isBlack()) {
+                ivImg.visibility=View.VISIBLE
+                ivImgHint.visibility=View.VISIBLE
+            }else{
+                ivImg.visibility=View.GONE
+                ivImgHint.visibility=View.GONE
+            }
+
             // gromore激励视频预加载
             PreCsjGroMoreVideoAdManager.getInstance().preLoadAd(requireActivity())
         }
@@ -523,9 +531,7 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
                 readyGo(SpeedFastActivity::class.java)
             }
             R.id.ivImg -> { // 点我赚钱
-                if (!AntiAuditManager.instance.isBlack()) {
-                    (requireActivity() as MainActivity).clickTab4Layout()
-                }
+                (requireActivity() as MainActivity).clickTab4Layout()
             }
             else -> {
             }

app/src/main/res/layout/fragment_main_my.xml

@@ -68,7 +68,9 @@
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <include layout="@layout/item_fragment_main_my_customer_service" />
+                <include
+                    android:id="@+id/root_aboutus"
+                    layout="@layout/item_fragment_main_my_customer_service" />
 
             </LinearLayout>