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

Merge remote-tracking branch 'origin/release' into dev

Browse Source 
# Conflicts:
#	dependencies.gradle
This commit is contained in:
chenjuntao
2024-05-14 17:38:18 +08:00
parent b1c267b179 196e719358
commit dd65bc8bc2
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java
View File

@ -26,11 +26,11 @@ import com.gh.gamecenter.common.utils.DeviceUtils;
import com.gh.gamecenter.common.utils.EnvHelper;
import com.gh.gamecenter.common.utils.PackageFlavorHelper;
import com.gh.gamecenter.common.utils.SensorsBridge;
import com.gh.gamecenter.core.provider.IPushProvider;
import com.gh.gamecenter.core.provider.IAppProvider;
import com.gh.gamecenter.core.provider.IDataUtilsProvider;
import com.gh.gamecenter.core.provider.IDownloadManagerProvider;
import com.gh.gamecenter.core.provider.IErrorHelperProvider;
import com.gh.gamecenter.core.provider.IPushProvider;
import com.gh.gamecenter.core.provider.IReservationRepositoryProvider;
import com.gh.gamecenter.core.provider.IWechatBindHelperProvider;
import com.gh.gamecenter.core.utils.GsonUtils;
@ -136,11 +136,13 @@ public class UserRepository {
.getInstance()
.build(RouteConsts.provider.push)
.navigation();
pushProvider
.unbindAlias(userId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe((s) -> {}, (e) -> {});
if (pushProvider != null) {
pushProvider
.unbindAlias(userId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe((s) -> {}, (e) -> {});
}
}
mLoginObsResponseUserInfo.postValue(null);
@ -535,11 +537,13 @@ public class UserRepository {
.getInstance()
.build(RouteConsts.provider.push)
.navigation();
pushProvider
.bindAlias(response.getUserId())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe((s) -> {}, (e) -> {});
if (pushProvider != null) {
pushProvider
.bindAlias(response.getUserId())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe((s) -> {}, (e) -> {});
}
}
if (UserManager.getInstance().getLoginTokenEntity() != null) {