From f9ac94b80c67360c0f68ec889865bb2e6bb870ba Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Mon, 20 Mar 2023 20:38:30 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E8=B0=B7=E6=AD=8C=E4=B8=8B=E6=9E=B6?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=8E=92=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 19 ++-----------------
 .../erban/application/ReportManager.java      |  9 +++++++--
 .../erban/upgrade/AppUpdateDialog.java        |  5 +----
 core/build.gradle                             |  5 +++--
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3d7fdd8c3..c3a6d7713 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,6 +70,8 @@
     <uses-permission android:name="${applicationId}.push.permission.MESSAGE" />
     <uses-permission android:name="com.meizu.c2dm.permission.RECEIVE" />
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+    <!-- AppsFlyer需要，参考：https://dev.appsflyer.com/hc/docs/install-android-sdk#setting-required-permissions -->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application
         android:name=".application.XChatApplication"
@@ -966,14 +968,6 @@
             android:exported="false"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".treasurefairy.HomeFairyActivity"
-            android:theme="@style/dialog_web_view_activity" />
-
-        <activity
-            android:name=".ui.webview.FairyDialogWebViewActivity"
-            android:theme="@style/dialog_web_view_activity" />
-
         <meta-data
             android:name="notch.config"
             android:value="portrait|landscape" />
@@ -1024,15 +1018,6 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".reciever.NotificationClickReceiver" />
-        <receiver
-            android:name="com.adjust.sdk.AdjustReferrerReceiver"
-            android:exported="true"
-            android:permission="android.permission.INSTALL_PACKAGES">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER" />
-            </intent-filter>
-        </receiver>
-
         <service
             android:name="com.netease.nimlib.service.NimService"
             android:process=":core" />
diff --git a/app/src/main/java/com/yizhuan/erban/application/ReportManager.java b/app/src/main/java/com/yizhuan/erban/application/ReportManager.java
index 1dd1dd24b..a3a6d342f 100644
--- a/app/src/main/java/com/yizhuan/erban/application/ReportManager.java
+++ b/app/src/main/java/com/yizhuan/erban/application/ReportManager.java
@@ -59,9 +59,14 @@ public class ReportManager implements IReportService {
     //Adjust初始化
     private void initAdjust() {
         String appToken = XChatConstants.ADJUST_APP_TOKEN;
-        String environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+        String environment;
+        if (XChatApplication.isDebug()) {
+            environment = AdjustConfig.ENVIRONMENT_SANDBOX;
+        } else {
+            environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+        }
         AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment);
-        config.setLogLevel(LogLevel.VERBOSE);
+        config.setLogLevel(LogLevel.WARN);
         Adjust.onCreate(config);
     }
 
diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
index 3d956dc6b..f80f5cb5a 100644
--- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
+++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
@@ -23,7 +23,6 @@ import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.yizhuan.xchat_android_core.Constants;
 import com.yizhuan.xchat_android_core.UriHelper;
 import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo;
-import com.yizhuan.xchat_android_core.upgrade.model.UpgradeModel;
 import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
 
 public class AppUpdateDialog extends DialogFragment implements View.OnClickListener {
@@ -41,6 +40,7 @@ public class AppUpdateDialog extends DialogFragment implements View.OnClickListe
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         Window window = getDialog().getWindow();
         // setup window and width
+
         View view = inflater.inflate(R.layout.dialog_erban_update, window.findViewById(android.R.id.content), false);
         window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         window.setLayout(UIUtil.dip2px(getContext(), 280), ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -97,9 +97,6 @@ public class AppUpdateDialog extends DialogFragment implements View.OnClickListe
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tvLater:
-                if (UpgradeModel.get().isDownloading()) {
-                    UpgradeModel.get().stopDownload();
-                }
                 dismissAllowingStateLoss();
                 break;
 
diff --git a/core/build.gradle b/core/build.gradle
index 17c550daf..e45ac1e68 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -92,9 +92,10 @@ dependencies {
     api 'androidx.room:room-rxjava2:2.3.0'
 
     //firebase推送、统计
-    implementation 'com.google.firebase:firebase-messaging:22.0.0'
-    implementation 'com.google.android.gms:play-services-base:17.6.0'
+    implementation 'com.google.firebase:firebase-messaging:23.1.1'
+    implementation 'com.google.android.gms:play-services-base:18.1.0'
     implementation 'com.google.firebase:firebase-core:19.0.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
 
     //googleplay内购
     api 'com.google.android.gms:play-services-wallet:19.1.0'