Parcourir la source

v1.2.3 提审

openlockPPP il y a 1 an
Parent
commit
b242d698b6

+ 2 - 2
JiaPeiManage.xcodeproj/project.pbxproj

@@ -1582,7 +1582,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1625,7 +1625,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

+ 12 - 4
JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.swift

@@ -82,8 +82,6 @@ final class LoginViewController: BaseViewController {
         self.username_textField.placeholderColor = .db_place
         self.userpassword_textField.placeholderColor = .db_place
         self.userlocation_textField.placeholderColor = .db_place
-//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
-//        }
         if LocalManager.userInfo.ios_login_open == 0 {
             self.wx_btn_layout_L.constant = 21.f
             self.apple_button.isHidden = true
@@ -145,11 +143,21 @@ final class LoginViewController: BaseViewController {
         }).disposed(by: disposeBag)
         //wxin_button
         wxin_button.rx.tap.subscribe ({ [unowned self] (_)  in
-            self.showDialog(type: 1)
+            if WXApi.isWXAppInstalled() {
+                self.showDialog(type: 1)
+            }else {
+                NYTips.showMsg(txt: "本地未安装微信")
+            }
+            
         }).disposed(by: disposeBag)
         //apple id
         apple_button.rx.tap.subscribe ({ [unowned self] (_)  in
-            self.showDialog(type: 2)
+            if #available(iOS 13.0, *) {
+                self.showDialog(type: 2)
+            } else {
+                // Fallback on earlier versions
+                NYTips.showMsg(txt: "请升级到iOS13.0以上")
+            }
         }).disposed(by: disposeBag)
         //登录
         login_button.rx.tap