From 63f7ed967433acee3ae8764c7a077e15c29c41f2 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期三, 06 十一月 2024 21:17:19 +0800
Subject: [PATCH] fix bug
---
XQMuse/SceneDelegate.swift | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/XQMuse/SceneDelegate.swift b/XQMuse/SceneDelegate.swift
index 6215f3d..9559df3 100644
--- a/XQMuse/SceneDelegate.swift
+++ b/XQMuse/SceneDelegate.swift
@@ -95,19 +95,28 @@
if let m = model{
WeChatTools.getUserInfo(access_token: m.access_token, openId: m.openid) { userInfoModel in
if let u = userInfoModel{
- Services.loginByWechat(headImgUrl: u.headimgurl, nickname: u.nickname, sex: u.sex, wxOpenId: u.openid).subscribe(onNext: {data in
- if let model = data.data{
- sceneDelegate?.loginSuccess()
- JQ_currentViewController().dismiss(animated:true)
- UserViewModel.saveLoginInfo(model)
+ if UserViewModel.getToken()?.isEmpty ?? true{
+ Services.loginByWechat(headImgUrl: u.headimgurl, nickname: u.nickname, sex: u.sex, wxOpenId: u.openid).subscribe(onNext: {data in
+ if let model = data.data{
+ sceneDelegate?.loginSuccess()
+ JQ_currentViewController().dismiss(animated:true)
+ UserViewModel.saveLoginInfo(model)
- Services.getUserInfo().subscribe(onNext: {data in
- if let model = data.data{
- UserViewModel.saveAvatarInfo(model)
- }
- }).disposed(by: JQ_disposeBag)
- }
- }).disposed(by: JQ_disposeBag)
+ Services.getUserInfo().subscribe(onNext: {data in
+ if let model = data.data{
+ UserViewModel.saveAvatarInfo(model)
+ }
+ }).disposed(by: JQ_disposeBag)
+ }
+ }).disposed(by: JQ_disposeBag)
+ }else{
+
+
+// NotificationCenter.default.post(name: BindWechat_Noti, object: nil)
+// let v = UserViewModel.getAvatarInfo()
+// v.wxOpenId = u.openid
+// UserViewModel.saveAvatarInfo(v)
+ }
}else{
alertError(msg: "获取信息失败")
}
--
Gitblit v1.7.1