diff --git a/OrderScheduling/Global/User/UserData.swift b/OrderScheduling/Global/User/UserData.swift index 7d79caf..9738712 100644 --- a/OrderScheduling/Global/User/UserData.swift +++ b/OrderScheduling/Global/User/UserData.swift @@ -85,6 +85,14 @@ open class UserData { UserDefaults.standard.set(userId, forKey: userId_key) } + public var username : String? { + return UserDefaults.standard.object(forKey: username_key) as? String + } + + func setUsername(username: String?) { + UserDefaults.standard.set(username, forKey: username_key) + } + public var deviceId : String? public var regId : String? @@ -99,6 +107,7 @@ open class UserData { setSupplierType(supplierType: nil) setUserId(userId: nil) setSupplierId(supplierId: nil) + setUsername(username: nil) GongdanpiciTool.default.refreshCount() } diff --git a/OrderScheduling/Login/ViewController/LoginController.swift b/OrderScheduling/Login/ViewController/LoginController.swift index 7868208..47ad834 100644 --- a/OrderScheduling/Login/ViewController/LoginController.swift +++ b/OrderScheduling/Login/ViewController/LoginController.swift @@ -194,6 +194,7 @@ extension LoginController { USER.setSupplierName(supplierName: responseModel?.data?.additionalParameters.user_info?.supplierName) USER.setUserId(userId: responseModel?.data?.additionalParameters.user_info?.userId) USER.setSupplierId(supplierId: responseModel?.data?.additionalParameters.user_info?.supplierId) + USER.setUsername(username: responseModel?.data?.additionalParameters.user_info?.username) } NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil) }else{ diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index 2c88238..bde5318 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -219,10 +219,10 @@ extension MineController { .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] response in self?.view.dd_hideHUD() - if response?.success == true, let token = response?.data, let userId = USER.userId { - WEBTOOL.open(name: .gjUrl, appending: "userId=zd\(userId)&token=\(token)") + if response?.success == true, let token = response?.data, let username = USER.username { + WEBTOOL.open(name: .gjUrl, appending: "userId=\(username)&token=\(token)") } else { - self?.view.dd_makeToast(response?.msg ?? "获取失败") + self?.view.dd_makeToast(response?.msg ?? "请先退出登录,然后重新登录app") } }) .disposed(by: disposeBag) @@ -237,7 +237,6 @@ extension MineController { mineView.tongzhitixingGes.rx.event .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in -// NOTIAUTHTOOL.openSetting() let vc = NotificationSetUpController() self?.navigationController?.pushViewController(vc, animated: true) }) diff --git a/OrderScheduling/Strings/UserDefaultStrings.swift b/OrderScheduling/Strings/UserDefaultStrings.swift index 41ca3ae..b8268c8 100644 --- a/OrderScheduling/Strings/UserDefaultStrings.swift +++ b/OrderScheduling/Strings/UserDefaultStrings.swift @@ -21,6 +21,8 @@ public let supplierId_key = "supplierId_key" public let userId_key = "userId_key" +public let username_key = "username_key" + public let appUpdateIgnore_key = "appUpdateIgnore_key" public let deviceToken_key = "deviceToken_key"