diff --git a/app/src/main/java/com/gh/common/DefaultJsApi.kt b/app/src/main/java/com/gh/common/DefaultJsApi.kt index c1a83357e8..68a8166e31 100644 --- a/app/src/main/java/com/gh/common/DefaultJsApi.kt +++ b/app/src/main/java/com/gh/common/DefaultJsApi.kt @@ -23,18 +23,12 @@ import com.gh.gamecenter.entity.NotificationUgc import com.gh.gamecenter.help.QaFeedbackDialogFragment import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.personalhome.border.AvatarBorderActivity -import com.gh.gamecenter.retrofit.BiResponse -import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.security.BindPhoneActivity import com.gh.gamecenter.user.LoginTag import com.gh.gamecenter.user.UserRepository import com.halo.assistant.HaloApp import com.lightgame.utils.Utils -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers -import okhttp3.ResponseBody import org.json.JSONObject -import retrofit2.HttpException import java.io.BufferedOutputStream import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 75c6c4b89e..072ca0349b 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -361,7 +361,7 @@ public class BindingAdapters { @Nullable String location) { // 恢复DialogFragment - restoreDialogFragment(progressBar, gameEntity, traceEvent); + restoreDialogFragment(progressBar); // 判断是否显示按钮 if (gameEntity != null @@ -614,7 +614,7 @@ public class BindingAdapters { * 当页面完全重建时,若存在重建的DialogFragment,则需要手动恢复该DialogFragment之前配置的回调(因为DialogFragment重建时只会从arguments中获取之前的配置内容, * 而arguments无法传递回调),或者dismiss该DialogFragment */ - private static void restoreDialogFragment(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent) { + private static void restoreDialogFragment(DownloadProgressBar progressBar) { GamePermissionDialogFragment gamePermissionDialogFragment = ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName())); if (gamePermissionDialogFragment != null) { diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 771b2c29f9..8d4480f6a5 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -114,7 +114,7 @@ public class SplashScreenActivity extends BaseActivity { long ghLastUpdateTime = SPUtils.getLong(Constants.SP_GH_LAST_UPDATE_TIME, 0); if (ghLastUpdateTime != 0 && ghLastUpdateTime != PackageUtils.getHaloLastUpdateTime()) { - HaloApp.getInstance().isReinstallTheSameVersion = true; + HaloApp.getInstance().setIsReinstallTheSameVersion(true); } } @@ -309,7 +309,7 @@ public class SplashScreenActivity extends BaseActivity { SPUtils.setString(Constants.SP_TEMPORARY_DEVICE_ID, localTemporaryDeviceId); } map.put("launch_type", DeviceTokenUtils.getLaunchType().name()); - } else if (HaloApp.getInstance().isReinstallTheSameVersion) { + } else if (HaloApp.getInstance().isReinstallTheSameVersion()) { map.put("launch_type", LunchType.UPDATE.toString()); } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 44595dc3c6..253156b7f5 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -82,12 +82,12 @@ public class HaloApp extends MultiDexApplication { private String mServerUserMark = ""; // 服务端用来标记用户是新/老的标记,有 new 和 old 两个,获取不到时为空 private boolean mIsPostInitialized = false; // 是否已经延迟初始化过相关组件,避免重复初始化 - private boolean isEmulator = false; // 当前设备是否为模拟器 + private boolean mIsEmulator = false; // 当前设备是否为模拟器 + private boolean mIsReinstallTheSameVersion = false; // 当前用户是否重新安装了一次当前版本后的第一次打开 public long deviceRamSize = 0; public boolean isBrandNewInstall = false; // 当前用户是否是安装光环后第一次打开 public boolean isNewForThisVersion = false; // 当前用户是否是安装当前版本后第一次打开 (包括全新和更新) - public boolean isReinstallTheSameVersion = false; // 当前用户是否重新安装了一次当前版本后的第一次打开 public boolean isRunningForeground = false; // 标记当前 APP 是否处于前台运行中 public int mCacheKeyboardHeight = 0; @@ -390,19 +390,27 @@ public class HaloApp extends MultiDexApplication { * 检查当前设备是否为模拟器 */ private void checkIfDeviceIsEmulator() { - isEmulator = SPUtils.getBoolean(Constants.SP_IS_EMULATOR); - if (!isEmulator) { + mIsEmulator = SPUtils.getBoolean(Constants.SP_IS_EMULATOR); + if (!mIsEmulator) { EmulatorUtil.getSingleInstance().readSysProperty(HaloApp.getInstance().getApplication(), arg -> { if (arg) { SPUtils.setBoolean(Constants.SP_IS_EMULATOR, true); - isEmulator = true; + mIsEmulator = true; } }); } } public boolean isEmulator() { - return isEmulator; + return mIsEmulator; + } + + public boolean isReinstallTheSameVersion() { + return mIsReinstallTheSameVersion; + } + + public void setIsReinstallTheSameVersion(boolean value) { + mIsReinstallTheSameVersion = value; } public boolean isPostInitialized() {