Merge branch 'dev_4.4.0' into dev

# Conflicts:
#	app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java
#	app/src/main/java/com/gh/common/util/DownloadObserver.kt
#	app/src/main/java/com/gh/gamecenter/user/UserRepository.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
This commit is contained in:
juntao
2020-10-23 10:47:40 +08:00
139 changed files with 3456 additions and 708 deletions

View File

@ -4,7 +4,6 @@ import android.app.Activity;
import android.app.Application.ActivityLifecycleCallbacks;
import android.os.Bundle;
import com.gh.common.im.ImManager;
import com.gh.common.notifier.Notifier;
import com.gh.common.util.DataUtils;
import com.gh.download.DownloadManager;
@ -39,7 +38,6 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
DataUtils.onResume(activity);
ImManager.updateFloatingWindow();
//FIXME 这里应该只是部分Activity需要
try {
// 初始化gameMap