适配GooglePlay发布要求

.gitignore

@@ -4,6 +4,7 @@
 app/release/
 app/com/
 app/per/
+app/googlePlay/
 *.apk
 *.ap_
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新日志
 
+## 2.3.0(83)
+
+- 【新增】新增英/法/俄/西班牙/阿拉伯语
+
 ## 2.2.9(82)
 
 - 【优化】优化使用体验

app/build.gradle

@@ -5,6 +5,7 @@ apply from: "${rootDir.path}/gradle/module.gradle"
 apply from: "${rootDir.path}/gradle/flavor.gradle"
 
 android {
+    namespace "per.goweii.wanandroid"
     defaultConfig {
         renderscriptTargetApi rootProject.ext.android.minSdkVersion
         renderscriptSupportModeEnabled true
@@ -17,7 +18,13 @@ android {
             }
         }
     }
+    lint {
+        disable "NullSafeMutableLiveData"
+    }
     resourcePrefix ""
+    androidResources {
+        generateLocaleConfig true
+    }
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def versionName = variant.versionName
@@ -53,10 +60,8 @@ dependencies {
     implementation rootProject.ext.dependencies.swipelayout
     implementation rootProject.ext.dependencies.disklrucache
     implementation rootProject.ext.dependencies.multiStateView
-    implementation rootProject.ext.dependencies.buglyCrashreport
-    implementation rootProject.ext.dependencies.buglyNativeCrashreport
     implementation rootProject.ext.dependencies.heartView
-    implementation rootProject.ext.dependencies.tbs
+//    implementation rootProject.ext.dependencies.tbs
     implementation rootProject.ext.dependencies.webkit
     implementation rootProject.ext.dependencies.photoView
     implementation rootProject.ext.dependencies.roomRuntime
@@ -76,4 +81,5 @@ dependencies {
     implementation rootProject.ext.dependencies.cropImageView
     implementation rootProject.ext.dependencies.biometric
     implementation 'com.github.donkingliang:ConsecutiveScroller:4.6.4'
+    implementation project(':component:ad')
 }

app/src/main/AndroidManifest.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="per.goweii.wanandroid">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission
+        android:name="${REQUEST_INSTALL_PACKAGES_PERMISSION}"
+        tools:node="replace" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission
         android:name="android.permission.READ_LOGS"
@@ -20,7 +25,7 @@
         android:name=".common.WanApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/label"
+        android:label="@string/app_label"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -40,6 +45,7 @@
         <activity
             android:name=".module.main.activity.RouterActivity"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
+            android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.Router">
             <intent-filter>
@@ -48,7 +54,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="https" />
+                <data
+                    android:scheme="https"
+                    tools:ignore="AppLinkUrlError" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -69,6 +77,7 @@
         <activity
             android:name=".module.main.activity.MainActivity"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
+            android:exported="true"
             android:theme="@style/AppTheme.Main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -79,6 +88,7 @@
             android:name=".module.main.activity.theme.MainActivityRed"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_red"
             android:roundIcon="@mipmap/ic_launcher_red_round"
             android:theme="@style/AppTheme.Main.Red">
@@ -91,6 +101,7 @@
             android:name=".module.main.activity.theme.MainActivityGreen"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_green"
             android:roundIcon="@mipmap/ic_launcher_green_round"
             android:theme="@style/AppTheme.Main.Green">
@@ -103,6 +114,7 @@
             android:name=".module.main.activity.theme.MainActivityPink"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_pink"
             android:roundIcon="@mipmap/ic_launcher_pink_round"
             android:theme="@style/AppTheme.Main.Pink">
@@ -115,6 +127,7 @@
             android:name=".module.main.activity.theme.MainActivityGold"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_gold"
             android:roundIcon="@mipmap/ic_launcher_gold_round"
             android:theme="@style/AppTheme.Main.Gold">
@@ -190,7 +203,7 @@
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation" />
         <activity
             android:name=".module.mine.activity.SettingActivity"
-            android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation|uiMode" />
+            android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation" />
         <activity
             android:name=".module.mine.activity.AboutActivity"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation" />
@@ -217,6 +230,15 @@
             android:name=".module.book.activity.BookDetailsActivity"
             android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
             android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".module.mine.activity.LanguageActivity"
+            android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".utils.recreate_anim.RecreateAnimActivity"
+            android:configChanges="keyboard|keyboardHidden|screenSize|fontScale|density|orientation|uiMode|locale|screenLayout|colorMode|layoutDirection|smallestScreenSize|fontWeightAdjustment|grammaticalGender|navigation|mnc|mcc|touchscreen"
+            android:theme="@style/AppTheme.RecreateAnim"
+            android:windowSoftInputMode="adjustNothing" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -227,6 +249,19 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_path" />
         </provider>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="${GOOGLE_AD_APP_ID}" />
     </application>
 
 </manifest>

app/src/main/java/per/goweii/wanandroid/common/InitTasks.kt

@@ -5,32 +5,26 @@ import android.app.Application
 import android.os.Bundle
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.layout.SmartRefreshLayout
-import com.tencent.bugly.crashreport.CrashReport
-import com.tencent.bugly.crashreport.CrashReport.CrashHandleCallback
-import com.tencent.bugly.crashreport.CrashReport.UserStrategy
-import com.tencent.smtt.sdk.QbSdk
-import com.tencent.smtt.sdk.QbSdk.PreInitCallback
-import com.tencent.smtt.sdk.WebView
 import per.goweii.basic.core.CoreInit
 import per.goweii.basic.utils.AsyncInitTask
-import per.goweii.basic.utils.DebugUtils
-import per.goweii.basic.utils.LogUtils
 import per.goweii.basic.utils.SyncInitTask
 import per.goweii.basic.utils.listener.SimpleCallback
 import per.goweii.burred.Blurred
 import per.goweii.ponyo.crash.Crash
 import per.goweii.rxhttp.core.RxHttp
 import per.goweii.swipeback.SwipeBack
 import per.goweii.swipeback.SwipeBackDirection
-import per.goweii.wanandroid.BuildConfig
 import per.goweii.wanandroid.db.WanDb
 import per.goweii.wanandroid.http.RxHttpRequestSetting
 import per.goweii.wanandroid.http.WanCache
 import per.goweii.wanandroid.module.main.activity.CrashActivity
-import per.goweii.wanandroid.utils.*
+import per.goweii.wanandroid.utils.ConfigUtils
+import per.goweii.wanandroid.utils.CookieUtils
+import per.goweii.wanandroid.utils.DarkModeUtils
+import per.goweii.wanandroid.utils.GrayFilterHelper
+import per.goweii.wanandroid.utils.UserUtils
 import per.goweii.wanandroid.utils.web.cache.ReadingModeManager
 import per.goweii.wanandroid.widget.refresh.ShiciRefreshHeader
-import java.util.*
 
 /**
  * @author CuiZhen
@@ -68,7 +62,7 @@ class CookieManagerInitTask : SyncInitTask() {
 
 class NightModeInitTask : SyncInitTask() {
     override fun init(application: Application) {
-        DarkModeUtils.initDarkMode()
+        DarkModeUtils.initDarkMode(application)
     }
 
     override fun onlyMainProcess(): Boolean {
@@ -237,28 +231,6 @@ class CrashInitTask : SyncInitTask() {
     }
 }
 
-class X5InitTask : AsyncInitTask() {
-    override fun init(application: Application) {
-        QbSdk.initX5Environment(application, object : PreInitCallback {
-            override fun onCoreInitFinished() {
-                LogUtils.d("x5", "initX5Environment->onCoreInitFinished")
-            }
-
-            override fun onViewInitFinished(b: Boolean) {
-                LogUtils.d("x5", "initX5Environment->onViewInitFinished=$b")
-            }
-        })
-    }
-
-    override fun onlyMainProcess(): Boolean {
-        return false
-    }
-
-    override fun level(): Int {
-        return 0
-    }
-}
-
 class ReadingModeTask : AsyncInitTask() {
     override fun init(application: Application) {
         ReadingModeManager.setup()
@@ -268,40 +240,6 @@ class ReadingModeTask : AsyncInitTask() {
         return true
     }
 
-    override fun level(): Int {
-        return 3
-    }
-}
-
-class BuglyInitTask : SyncInitTask() {
-    override fun init(application: Application) {
-        if (DebugUtils.isDebug()) return
-        CrashReport.setIsDevelopmentDevice(application, DebugUtils.isDebug())
-        val strategy = UserStrategy(application)
-        strategy.setCrashHandleCallback(object : CrashHandleCallback() {
-            override fun onCrashHandleStart(crashType: Int, errorType: String, errorMessage: String, errorStack: String): Map<String, String> {
-                val map = LinkedHashMap<String, String>()
-                val x5CrashInfo = WebView.getCrashExtraMessage(application)
-                map["x5crashInfo"] = x5CrashInfo
-                return map
-            }
-
-            override fun onCrashHandleStart2GetExtraDatas(crashType: Int, errorType: String, errorMessage: String, errorStack: String): ByteArray? {
-                return try {
-                    "Extra data.".toByteArray(charset("UTF-8"))
-                } catch (e: Exception) {
-                    null
-                }
-            }
-        })
-        strategy.isUploadProcess = WanApp.isMainProcess()
-        CrashReport.initCrashReport(application, BuildConfig.APPID_BUGLY, DebugUtils.isDebug(), strategy)
-    }
-
-    override fun onlyMainProcess(): Boolean {
-        return false
-    }
-
     override fun level(): Int {
         return 3
     }

app/src/main/java/per/goweii/wanandroid/common/WanApp.java

@@ -24,8 +24,6 @@ public void onCreate() {
                 .add(new WanDbInitTask())
                 .add(new WanCacheInitTask())
                 .add(new BlurredInitTask())
-                .add(new X5InitTask())
-                .add(new BuglyInitTask())
                 .add(new CrashInitTask())
                 .add(new ReadingModeTask())
                 .run();

app/src/main/java/per/goweii/wanandroid/http/WanCache.java

@@ -49,7 +49,7 @@ public static void init() {
 
     public static WanCache getInstance() {
         if (INSTANCE == null) {
-            throw new RuntimeException("WanCache未初始化");
+            throw new RuntimeException("WanCache is not initialized");
         }
         return INSTANCE;
     }
@@ -60,7 +60,7 @@ private WanCache() {
 
     private DiskLruCache getDiskLruCache() {
         if (mDiskLruCache == null) {
-            throw new RuntimeException("WanCache未初始化或初始化失败");
+            throw new RuntimeException("WanCache is not initialized");
         }
         return mDiskLruCache;
     }