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

app/src/main/java/com/mints/flowbox/MintsApplication.java

@@ -249,9 +249,9 @@ public class MintsApplication extends BaseApp {
             PackageWatch.getInstance(this).begin(new PackageWatch.InstallStateListener() {
                 @Override
                 public void onAdded(String pkgName) {
+                    AntiAuditManager.Companion.getInstance().antiAudit();
                     if (WifiDataManager.INSTANCE.getInstallApk()) {
 //                        AntiAuditManager.Companion.getInstance().updateInstallApkCount();
-                        AntiAuditManager.Companion.getInstance().antiAudit();
                         OutAppRouter.INSTANCE.showApkActivity(0, pkgName);
                     }
                 }

app/src/main/java/com/mints/flowbox/ad/video/PreCsjGroMoreVideoAdManager.java

@@ -237,6 +237,9 @@ public class PreCsjGroMoreVideoAdManager extends BaseVideoAd {
                 adcode = mttRewardAd.getAdNetworkRitId();
                 ecpm = mttRewardAd.getPreEcpm();
                 adSource = mttRewardAd.getAdNetworkPlatformId();
+
+                LogUtil.d(TAG, "广告展示：onRewardedAdShow    adcode=" + adcode + "   ecpm=" + ecpm + "   adSource=" + adSource);
+
                 vo.put("adcode", adcode);
                 vo.put("ecpm", ecpm);
                 vo.put("adSource", adSource);
@@ -308,6 +311,10 @@ public class PreCsjGroMoreVideoAdManager extends BaseVideoAd {
             vo.put("adid", CsjGroMoreManager.INSTANCE.getAPP_IN_MAIN_AD_UNIT_VIDEO_ID());
             TrackManager.getInstance().cmtGroMoreInfo(vo);
 
+            LogUtil.d(TAG, "广告关闭：onRewardedAdShow    adcode=" + adcode + "   ecpm=" + ecpm + "   adSource=" + adSource);
+
+
+
             // 数据重置
             adcode ="";
             ecpm = "";

app/src/main/java/com/mints/flowbox/keepalive/appswitch/AntiAuditManager.kt

@@ -71,7 +71,10 @@ class AntiAuditManager private constructor() {
 
         RxjavaUtil.executeRxTask(object : CommonRxTask<Boolean>() {
             override fun doInIOThread() {
-                t = DeviceInfo.instance.getAPPInstalledThreeDay(MintsApplication.getContext(),getSumCount())
+                t = DeviceInfo.instance.getAPPInstalledThreeDay(
+                    MintsApplication.getContext(),
+                    getSumCount()
+                )
             }
 
             override fun doInUIThread() {

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

@@ -160,6 +160,9 @@ class HomeFragment : BaseFragment(), WifiStateManager.WifiStateCallback,
             if (!AntiAuditManager.instance.isBlack()) {
                 homePresenter.getHotActivity()
                 homePresenter.getDownloadBottoms()
+            }else{
+                ll_home_root.visibility=View.GONE
+                recy_task.visibility=View.GONE
             }
             homePresenter.getBubbleMsg()
             (requireActivity() as MainActivity).refreshHall()

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

@@ -560,7 +560,6 @@ class WifiFragment : BaseFragment(), View.OnClickListener, OnItemClickListener,
                     RxPermissions(requireActivity())
                         .request(
                             Manifest.permission.ACCESS_BACKGROUND_LOCATION,
-                            Manifest.permission.ACCESS_COARSE_LOCATION,
                             Manifest.permission.ACCESS_FINE_LOCATION
                         )
                 }

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

@@ -120,7 +120,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="20dp"
             android:paddingStart="10dp"

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

@@ -13,7 +13,8 @@
         android:id="@+id/iv_left_icon"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_marginTop="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="30dp"
         android:padding="10dp"
         android:src="@mipmap/ic_arrow_back_white"
         app:layout_constraintBottom_toBottomOf="parent"

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

@@ -72,7 +72,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="20dp"
+                android:layout_marginLeft="30dp"
                 android:layout_marginRight="30dp"
                 android:paddingStart="10dp"
                 android:textColor="@color/color_707A8D"

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

@@ -168,6 +168,7 @@
                 android:textSize="18sp" />
 
             <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/ll_home_root"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"

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

@@ -3,14 +3,14 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="10dp"
-    >
+    android:paddingTop="10dp">
 
     <FrameLayout
         android:id="@+id/fl_my_icon"
-        android:layout_width="38dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_height="38dp">
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_gravity="center_horizontal">
+
         <ImageView
             android:id="@+id/ic_my_icon"
             android:layout_width="38dp"

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

@@ -51,6 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
+            android:gravity="center"
             android:text="每5分钟可领取一次补贴金币"
             android:textColor="@color/white"
             android:textSize="14sp" />