代码合并

animlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

-#Fri Nov 12 11:04:22 CST 2021
+#Tue Nov 23 16:30:08 CST 2021

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId rootProject.APPLICATION_ID
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 20211020
-        versionName "1.1.4"
+        versionCode 20211022
+        versionName "1.1.6"
         flavorDimensions "default"
 
         // dex突破65535的限制

app/src/main/java/com/mints/fiveworld/ad/express/InHomeWifiExpress.kt

@@ -922,6 +922,7 @@ class InHomeWifiExpress : GMSettingConfigCallback {
             vo["adSource"] = adSource
             vo["adType"] = Constant.GRO_MORE_ADTYPE1
             vo["adid"] = expressId
+            vo["inner"] = AdReportManager.INNER_IN
             TrackManager.getInstance().cmtGroMoreInfo(vo)
             return
         }

app/src/main/java/com/mints/fiveworld/ad/express/InSceneExpress.kt

@@ -919,6 +919,7 @@ class InSceneExpress : GMSettingConfigCallback {
             vo["adSource"] = adSource
             vo["adType"] = Constant.GRO_MORE_ADTYPE1
             vo["adid"] = expressId
+            vo["inner"] = AdReportManager.INNER_IN
             TrackManager.getInstance().cmtGroMoreInfo(vo)
             return
         }

app/src/main/java/com/mints/fiveworld/ad/express/OutSceneExpress.kt

@@ -909,6 +909,7 @@ class OutSceneExpress : GMSettingConfigCallback {
             vo["adSource"] = adSource
             vo["adType"] = Constant.GRO_MORE_ADTYPE1
             vo["adid"] = expressId
+            vo["inner"] = AdReportManager.INNER_OUT
             TrackManager.getInstance().cmtGroMoreInfo(vo)
 
             return

app/src/main/java/com/mints/fiveworld/ad/express/OutScreenExpress.kt

@@ -311,6 +311,7 @@ class OutScreenExpress private constructor() : GMSettingConfigCallback {
         vo["adSource"] = adSource
         vo["adType"] = Constant.GRO_MORE_ADTYPE1
         vo["adid"] = CsjGroMoreManager.getOutLockExpressId()
+        vo["inner"] = AdReportManager.INNER_OUT
         TrackManager.getInstance().cmtGroMoreInfo(vo)
     }
 

app/src/main/java/com/mints/fiveworld/ad/express/OutSimpleExpress.kt

@@ -936,6 +936,7 @@ class OutSimpleExpress private constructor() : GMSettingConfigCallback {
             vo["adSource"] = adSource
             vo["adType"] = Constant.GRO_MORE_ADTYPE1
             vo["adid"] = CsjGroMoreManager.getOutCommonExpressId()
+            vo["inner"] = AdReportManager.INNER_OUT
             TrackManager.getInstance().cmtGroMoreInfo(vo)
             return
         }

app/src/main/java/com/mints/fiveworld/ad/full/InSceneFull.java

@@ -271,6 +271,7 @@ public class InSceneFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_IN);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/full/Notice_OutSceneFull.java

@@ -319,6 +319,7 @@ public class Notice_OutSceneFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/full/OutSceneFull.java

@@ -260,6 +260,7 @@ public class OutSceneFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/full/OutTimeFull.java

@@ -265,6 +265,7 @@ public class OutTimeFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/half/NewInSceneFull.java

@@ -269,6 +269,7 @@ public class NewInSceneFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_IN);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/half/NewOutSceneFull.java

@@ -260,6 +260,7 @@ public class NewOutSceneFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/half/NewOutTimeFull.java

@@ -264,6 +264,7 @@ public class NewOutTimeFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/half/Notice_NewOutSceneFull.java

@@ -268,6 +268,7 @@ public class Notice_NewOutSceneFull {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE4);
                 vo.put("adid", fullId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventFull(

app/src/main/java/com/mints/fiveworld/ad/inscreen/InSceneInterstitial.java

@@ -243,6 +243,7 @@ public class InSceneInterstitial {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE3);
                 vo.put("adid", interstitialId);
+                vo.put("inner",AdReportManager.INNER_IN);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventInscreen(AdReportManager.INNER_IN, Constant.AD_SOURCE_GROMORE,

app/src/main/java/com/mints/fiveworld/ad/inscreen/Notice_OutSceneInterstitial.java

@@ -295,6 +295,7 @@ public class Notice_OutSceneInterstitial {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE3);
                 vo.put("adid", interstitialId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventInscreen(AdReportManager.INNER_OUT, Constant.AD_SOURCE_GROMORE,

app/src/main/java/com/mints/fiveworld/ad/inscreen/OutSceneInterstitial.java

@@ -243,6 +243,7 @@ public class OutSceneInterstitial {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE3);
                 vo.put("adid", interstitialId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventInscreen(AdReportManager.INNER_OUT, Constant.AD_SOURCE_GROMORE,

app/src/main/java/com/mints/fiveworld/ad/inscreen/OutTimeInterstitial.java

@@ -248,6 +248,7 @@ public class OutTimeInterstitial {
                 vo.put("adSource", adSource);
                 vo.put("adType", Constant.GRO_MORE_ADTYPE3);
                 vo.put("adid", interstitialId);
+                vo.put("inner",AdReportManager.INNER_OUT);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
 
                 AdReportManager.INSTANCE.eventInscreen(AdReportManager.INNER_OUT, Constant.AD_SOURCE_GROMORE,

app/src/main/java/com/mints/fiveworld/common/Constant.kt

@@ -17,7 +17,7 @@ object Constant {
     /**
      * app名称
      */
-    const val MINTS_APP_NAME = "5G世界清理"
+    const val MINTS_APP_NAME = "5G世界"
 
     /**
      * 应用包名

app/src/main/java/com/mints/fiveworld/ui/activitys/SignalStrengthActivity.kt

@@ -70,12 +70,15 @@ class SignalStrengthActivity : BaseActivity(), View.OnClickListener {
     }
 
     private fun loadAd() {
-        if (mIsFromAppOut) {
-            WifiAdManager.instance.loadNoticeAppOutAd(this, Constant.CARRIER_WIFI_BOOST)
+        if (Utils.canLoadAd()) {
 
-            overridePendingTransition(0, 0)
-        } else {
-            WifiAdManager.instance.loadWifiAd(this, Constant.CARRIER_WIFI_BOOST)
+            if (mIsFromAppOut) {
+                WifiAdManager.instance.loadNoticeAppOutAd(this, Constant.CARRIER_WIFI_BOOST)
+
+                overridePendingTransition(0, 0)
+            } else {
+                WifiAdManager.instance.loadWifiAd(this, Constant.CARRIER_WIFI_BOOST)
+            }
         }
     }
 

app/src/main/java/com/mints/fiveworld/ui/activitys/SplashActivity.java

@@ -298,6 +298,7 @@ public class SplashActivity extends BaseActivity implements SplashView {
                 vo.put("adSource", mTTSplashAd.getAdNetworkPlatformId());
                 vo.put("adType", Constant.GRO_MORE_ADTYPE0);
                 vo.put("adid", CsjGroMoreManager.INSTANCE.getInMoneySplashId());
+                vo.put("inner",AdReportManager.INNER_IN);
                 TrackManager.getInstance().cmtGroMoreInfo(vo);
             }
 

app/src/main/java/com/mints/fiveworld/ui/fragment/MainFragment.kt

@@ -18,6 +18,7 @@ import com.mints.fiveworld.common.AppConfig
 import com.mints.fiveworld.common.Constant
 import com.mints.fiveworld.common.DeviceInfo
 import com.mints.fiveworld.common.random.HitChanceKeeper
+import com.mints.fiveworld.keepalive.appswitch.AntiAuditManager
 import com.mints.fiveworld.manager.UserManager
 import com.mints.fiveworld.manager.wifi.WifiDataManager
 import com.mints.fiveworld.ui.activitys.*
@@ -25,6 +26,7 @@ import com.mints.fiveworld.ui.activitys.appswitch.AppSwitchActivity
 import com.mints.fiveworld.ui.fragment.base.BaseFragment
 import com.mints.fiveworld.utils.*
 import com.mints.library.net.netstatus.NetUtils
+import com.mints.library.utils.CommonUtils
 import com.mints.library.utils.nodoubleclick.AntiShake
 import com.permissionx.guolindev.PermissionX
 import kotlinx.android.synthetic.main.fragment_main.*
@@ -85,6 +87,15 @@ class MainFragment : BaseFragment(), View.OnClickListener {
 
     /** 更新UI页面数据 */
     private fun updateUiState() {
+        if(AntiAuditManager.instance.isBlack()){
+            //拉黑
+            main_bottom.visibility=View.GONE
+            constraintLayout.visibility=View.GONE
+        }else{
+            main_bottom.visibility=View.VISIBLE
+            constraintLayout.visibility=View.VISIBLE
+        }
+
         val fakeLastScore = WifiDataManager.getFakeLastScore()
         if (!TextUtils.isEmpty(fakeLastScore)) {
             val char = fakeLastScore?.toCharArray()

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

@@ -38,7 +38,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="我们依据最新的法律,向您说明5G世界清理软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
+                    android:text="我们依据最新的法律,向您说明5G世界软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 

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

@@ -98,6 +98,7 @@
             app:layout_constraintTop_toBottomOf="@+id/tvScore2" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:visibility="gone"
             android:id="@+id/constraintLayout"
             android:layout_width="match_parent"
             android:layout_height="280dp"
@@ -253,6 +254,8 @@
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:visibility="gone"
+            android:id="@+id/main_bottom"
             android:layout_width="match_parent"
             android:layout_height="170dp"
             android:layout_marginStart="20dp"

app/src/main/res/values/strings.xml

 <resources>
-    <string name="appName">5G世界清理</string>
+    <string name="appName">5G世界</string>
 
     <string name="netfail">网络异常，请检查网络</string>
     <string name="notifyTitle">提示</string>

gradle.properties

@@ -13,7 +13,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 # org.gradle.parallel=true
 
 
-DEBUG_URL="http://fiveworld-api.mints-id.com/"
+DEBUG_URL="http://test.mints-id.com/fiveworld-api/"
 RELEASE_URL="http://fiveworld-api.mints-id.com/"
 RELEASE_KEY_PASSWORD=mints.world
 RELEASE_KEY_ALIAS=mints_world