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 @@ + + - - - - @@ -1024,15 +1018,6 @@ - - - - - - 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'