iOS Team / CNLiveMateCode · Commits

Commit cd18391ea373ffe4fc0f25f65c856d98b622656f

Authored by 张旭
1 parent 313f0a79

优化一键登录按钮二次弹窗点击后没有直接登录的问题 ,打包提审

Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
metaCode.xcodeproj/project.pbxproj
  View file @cd18391
@@ -2978,7 +2978,7 @@ @@ -2978,7 +2978,7 @@
2978 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 2978 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2979 CODE_SIGN_IDENTITY = "Apple Development"; 2979 CODE_SIGN_IDENTITY = "Apple Development";
2980 CODE_SIGN_STYLE = Automatic; 2980 CODE_SIGN_STYLE = Automatic;
2981 - CURRENT_PROJECT_VERSION = 1.2.3.25.08.08.14; 2981 + CURRENT_PROJECT_VERSION = 1.2.4.25.08.12.14;
2982 DEBUG_INFORMATION_FORMAT = dwarf; 2982 DEBUG_INFORMATION_FORMAT = dwarf;
2983 DEVELOPMENT_TEAM = 94X49GG3ZW; 2983 DEVELOPMENT_TEAM = 94X49GG3ZW;
2984 ENABLE_BITCODE = NO; 2984 ENABLE_BITCODE = NO;
@@ -3051,7 +3051,7 @@ @@ -3051,7 +3051,7 @@
3051 "$(inherited)", 3051 "$(inherited)",
3052 "@executable_path/Frameworks", 3052 "@executable_path/Frameworks",
3053 ); 3053 );
3054 - MARKETING_VERSION = 1.2.3; 3054 + MARKETING_VERSION = 1.2.4;
3055 OTHER_LDFLAGS = ( 3055 OTHER_LDFLAGS = (
3056 "$(inherited)", 3056 "$(inherited)",
3057 "-all_load", 3057 "-all_load",
@@ -3234,7 +3234,7 @@ @@ -3234,7 +3234,7 @@
3234 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 3234 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
3235 CODE_SIGN_IDENTITY = "Apple Development"; 3235 CODE_SIGN_IDENTITY = "Apple Development";
3236 CODE_SIGN_STYLE = Automatic; 3236 CODE_SIGN_STYLE = Automatic;
3237 - CURRENT_PROJECT_VERSION = 1.2.3.25.08.08.14; 3237 + CURRENT_PROJECT_VERSION = 1.2.4.25.08.12.14;
3238 DEVELOPMENT_TEAM = 94X49GG3ZW; 3238 DEVELOPMENT_TEAM = 94X49GG3ZW;
3239 ENABLE_BITCODE = NO; 3239 ENABLE_BITCODE = NO;
3240 ENABLE_MODULE_VERIFIER = NO; 3240 ENABLE_MODULE_VERIFIER = NO;
@@ -3306,7 +3306,7 @@ @@ -3306,7 +3306,7 @@
3306 "$(inherited)", 3306 "$(inherited)",
3307 "@executable_path/Frameworks", 3307 "@executable_path/Frameworks",
3308 ); 3308 );
3309 - MARKETING_VERSION = 1.2.3; 3309 + MARKETING_VERSION = 1.2.4;
3310 OTHER_LDFLAGS = ( 3310 OTHER_LDFLAGS = (
3311 "$(inherited)", 3311 "$(inherited)",
3312 "-all_load", 3312 "-all_load",
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
  View file @cd18391
@@ -708,7 +708,7 @@ extension CNLiveLoginViewController { @@ -708,7 +708,7 @@ extension CNLiveLoginViewController {
708 model.privacyAlertButtonFont = UIFont.systemFont(ofSize: 18) 708 model.privacyAlertButtonFont = UIFont.systemFont(ofSize: 18)
709 model.privacyAlertCloseButtonIsNeedShow = true 709 model.privacyAlertCloseButtonIsNeedShow = true
710 model.privacyAlertMaskIsNeedShow = true 710 model.privacyAlertMaskIsNeedShow = true
711 - model.privacyAlertIsNeedAutoLogin = false 711 + model.privacyAlertIsNeedAutoLogin = true
712 model.tapPrivacyAlertMaskCloseAlert = false 712 model.tapPrivacyAlertMaskCloseAlert = false
713 model.expandAuthPageCheckedScope = true 713 model.expandAuthPageCheckedScope = true
714 model.privacyAlertCloseButtonIsNeedShow = true 714 model.privacyAlertCloseButtonIsNeedShow = true
@@ -746,6 +746,7 @@ extension CNLiveLoginViewController { @@ -746,6 +746,7 @@ extension CNLiveLoginViewController {
746 // TXCommonHandler.sharedInstance().setCheckboxIsChecked(true) 746 // TXCommonHandler.sharedInstance().setCheckboxIsChecked(true)
747 // print(TXCommonHandler.sharedInstance().queryCheckBoxIsChecked()) 747 // print(TXCommonHandler.sharedInstance().queryCheckBoxIsChecked())
748 // } 748 // }
  749 +
749 }else if "700020" == resultCode{ 750 }else if "700020" == resultCode{
750 print("页面已完全销毁dealloc：\(resultDic)") 751 print("页面已完全销毁dealloc：\(resultDic)")
751 }else if PNSCodeSuccess == resultCode{ 752 }else if PNSCodeSuccess == resultCode{