优化页面

animlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/debug/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file

animlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/debug/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file

animlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/main/assets"/><source path="/Users/hello/android_fiveworld/animlibrary/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/debug/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\assets"/><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\assets"/></dataSet></merger>
\ No newline at end of file

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

-#Mon Nov 08 14:30:59 CST 2021
+#Fri Nov 12 11:04:22 CST 2021

animlibrary/build/intermediates/incremental/packageDebugResources/merger.xml

 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/main/res"/><source path="/Users/hello/android_fiveworld/animlibrary/build/generated/res/rs/debug"/><source path="/Users/hello/android_fiveworld/animlibrary/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/main/res"><file path="/Users/hello/android_fiveworld/animlibrary/src/main/res/values/attrs.xml" qualifiers=""><declare-styleable name="AnimatedSvgView">
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\res"/><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\rs\debug"/><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\res"><file path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="AnimatedSvgView">
     <attr format="integer" name="animatedSvgImageSizeX"/>
     <attr format="integer" name="animatedSvgImageSizeY"/>
     <attr format="string" name="animatedSvgTraceTime"/>
@@ -11,7 +11,7 @@
     <attr format="reference" name="animatedSvgTraceResidueColors"/>
     <attr format="integer" name="animatedSvgTraceMarkerLength"/>
     <attr format="reference" name="animatedSvgFillColors"/>
-  </declare-styleable></file></source><source path="/Users/hello/android_fiveworld/animlibrary/build/generated/res/rs/debug"/><source path="/Users/hello/android_fiveworld/animlibrary/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hello/android_fiveworld/animlibrary/src/debug/res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="AnimatedSvgView">
+  </declare-styleable></file></source><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\rs\debug"/><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="AnimatedSvgView">
     <attr format="integer" name="animatedSvgImageSizeX"/>
     <attr format="integer" name="animatedSvgImageSizeY"/>
     <attr format="string" name="animatedSvgTraceTime"/>

animlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="14"
-6-->/Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
+6-->D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
 7        android:targetSdkVersion="28" />
-7-->/Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
+7-->D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
 8
 9</manifest>

animlibrary/build/outputs/logs/manifest-merger-debug-report.txt

 -- Merging decision tree log ---
 manifest
-ADDED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml:1:1-63
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml:1:1-63
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml:1:1-63
+ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
 	package
-		ADDED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml:1:11-61
-		INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-		INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
+		ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:11-61
+		INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml:1:1-63
+		ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
 uses-sdk
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-		ADDED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-		INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
+		INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-		ADDED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
-		INJECTED from /Users/hello/android_fiveworld/animlibrary/src/main/AndroidManifest.xml
+		INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+		ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
+		INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml

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

@@ -92,6 +92,9 @@ class AntiAuditManager private constructor() {
     /**
      * 重置黑名单
      *
+     * inadflag-应用内广告开关
+     * outadflag-应用外广告开关
+     *
      * adflag=true 可以看广告且是白名单
      */
     fun resetBlack(inadflag: Boolean, outadflag: Boolean, senceType: String) {

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

@@ -22,7 +22,6 @@ import com.mints.fiveworld.mvp.presenters.MainPresenter
 import com.mints.fiveworld.mvp.views.MainView
 import com.mints.fiveworld.ui.activitys.base.BaseActivity
 import com.mints.fiveworld.ui.fragment.MainFragment
-import com.mints.fiveworld.ui.fragment.WifiFragment
 import com.mints.fiveworld.utils.WifiUtils
 import com.permissionx.guolindev.PermissionX
 
@@ -107,7 +106,7 @@ class MainActivity : BaseActivity(), MainView {
         if (AppPreferencesManager.get().getBoolean(Constant.IS_ONE_PERMISSIONS, true)) {
             AppPreferencesManager.get().put(Constant.IS_ONE_PERMISSIONS, false)
             checkPermission()
-            (threeFragment as WifiFragment).setIsFirstEnter(true)
+            (threeFragment as MainFragment).setIsFirstEnter(true)
         }
 
         baseApplication.initMiitHelper()

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

@@ -95,17 +95,17 @@ class MainFragment : BaseFragment(), View.OnClickListener {
                     tvScore3.text = it[2].toString()
                     tvScore4.text = it[3].toString()
                 } catch (e: Exception) {
-                    tvScore1.text = "0"
-                    tvScore2.text = "0"
-                    tvScore3.text = "0"
-                    tvScore4.text = "0"
+                    tvScore1.text = "?"
+                    tvScore2.text = "?"
+                    tvScore3.text = "?"
+                    tvScore4.text = "?"
                 }
             }
         } else {
-            tvScore1.text = "0"
-            tvScore2.text = "0"
-            tvScore3.text = "0"
-            tvScore4.text = "0"
+            tvScore1.text = "?"
+            tvScore2.text = "?"
+            tvScore3.text = "?"
+            tvScore4.text = "?"
         }
 
         val appWhite = AppSwitchUtil.getAppWhite(requireContext())
@@ -179,11 +179,11 @@ class MainFragment : BaseFragment(), View.OnClickListener {
     /**初始化信息iyc*/
     private fun loadAd() {
         if (Utils.canLoadAd()) {
-            InHomeWifiExpress.instance.loadADFrameLayout(Constant.CARRIER_WIFI)
-            InHomeWifiExpress.instance.getAdView(
-                expressAdCallback,
-                Constant.CARRIER_WIFI
-            )
+//            InHomeWifiExpress.instance.loadADFrameLayout(Constant.CARRIER_WIFI)
+//            InHomeWifiExpress.instance.getAdView(
+//                expressAdCallback,
+//                Constant.CARRIER_WIFI
+//            )
             startTime()
 
             NewInSceneFull.getInstance().preloadFullAd(requireActivity(), Constant.CARRIER_WIFI)

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

@@ -31,7 +31,7 @@
             android:layout_marginBottom="10dp"
             android:background="@mipmap/ic_score_btn"
             android:gravity="center"
-            android:text="6666"
+            android:text="0"
             android:textColor="@color/color_00F6FF"
             android:textSize="40sp" />
 

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

@@ -34,7 +34,7 @@
             android:layout_marginTop="20dp"
             android:background="@mipmap/ic_tv_score"
             android:gravity="center"
-            android:text="0"
+            android:text="?"
             android:textColor="@color/color_00F6FF"
             android:textSize="40sp"
             app:layout_constraintEnd_toStartOf="@id/tvScore2"
@@ -48,7 +48,7 @@
             android:layout_marginTop="20dp"
             android:background="@mipmap/ic_tv_score"
             android:gravity="center"
-            android:text="0"
+            android:text="?"
             android:textColor="@color/color_00F6FF"
             android:textSize="40sp"
             app:layout_constraintEnd_toStartOf="@id/tvScore3"
@@ -62,7 +62,7 @@
             android:layout_marginTop="20dp"
             android:background="@mipmap/ic_tv_score"
             android:gravity="center"
-            android:text="0"
+            android:text="?"
             android:textColor="@color/color_00F6FF"
             android:textSize="40sp"
             app:layout_constraintEnd_toStartOf="@id/tvScore4"
@@ -77,7 +77,7 @@
             android:layout_marginEnd="50dp"
             android:background="@mipmap/ic_tv_score"
             android:gravity="center"
-            android:text="0"
+            android:text="?"
             android:textColor="@color/color_00F6FF"
             android:textSize="40sp"
             app:layout_constraintEnd_toEndOf="parent"