Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
#	app/src/main/java/com/gh/gamecenter/history/HistoryWrapperFragment.kt
#	assistant_flutter
#	dependencies.gradle
This commit is contained in:
juntao
2022-01-21 16:03:27 +08:00
parent 72e061b344 6f7374c479
commit 3ab52cadd5
24 changed files with 284 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
View File

@ -308,8 +308,8 @@ public class SplashScreenActivity extends BaseActivity {
HaloApp.getInstance().setLocalTemporaryDeviceId(localTemporaryDeviceId);
SPUtils.setString(Constants.SP_TEMPORARY_DEVICE_ID, localTemporaryDeviceId);
}
map.put("launch_type", DeviceTokenUtils.getLaunchType().name());
} else if (HaloApp.getInstance().isReinstallTheSameVersion()) {
map.put("launch_type", DeviceTokenUtils.getLaunchType(true).name());
} else if (HaloApp.getInstance().isReinstallTheSameVersion) {
map.put("launch_type", LunchType.UPDATE.toString());
}