代码提交

MobilePortal/MobilePortal.xcodeproj/project.pbxproj

@@ -5306,7 +5306,7 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.3;
+				CURRENT_PROJECT_VERSION = 2.4;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5326,7 +5326,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 2.3;
+				MARKETING_VERSION = 2.4;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -5407,7 +5407,7 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.3;
+				CURRENT_PROJECT_VERSION = 2.4;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5427,7 +5427,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 2.3;
+				MARKETING_VERSION = 2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

MobilePortal/MobilePortal/Info.plist

@@ -138,6 +138,8 @@
 	<string>App需要您的同意,才能访问当前位置</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>App需要您的同意,才能访问麦克风</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
 	<key>Photo Library Additions Usage Description</key>
 	<string>App需要您的同意,才能访问相册</string>
 	<key>UIBackgroundModes</key>

MobilePortal/MobilePortal/VC/ChangePassword/ChangePassWordViewController+initView.swift

@@ -82,7 +82,7 @@ extension ChangePassWordViewController {
         self.view .addSubview(redImage)
         
         redLabel = UILabel.init(frame: CGRect(x:redImage.originX+redImage.width+10, y: redImage.originY, width:SCREEN_WHIDTH()-(redImage.originX+redImage.width+30) , height:30 ))
-        redLabel.text = "用户密码必须包含字母、数字、特殊字符(列如：!@#%&*.)长度不得小于8位且不超过16位"
+        redLabel.text = "用户密码必须包含字母、数字、特殊字符(例如：!@#%&*.)长度不得小于8位且不超过16位"
         redLabel.textColor = UIColor.red
         redLabel.font = UIFont.test_systemFont(ofSize: 11.33)
         redLabel.numberOfLines = 0

MobilePortal/MobilePortal/VC/Web/WebSwiftViewController.swift

@@ -251,6 +251,31 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
     }
     
     @objc func backPrevious(){
+        
+        if #available(iOS 11.0, *){
+            let cookieStore = webView.configuration.websiteDataStore.httpCookieStore
+            cookieStore.getAllCookies { (cookie) in
+                let cookiesArr:NSArray = cookie as NSArray
+                for index in 0..<cookiesArr.count {
+                    print("----",index,cookiesArr[index])
+                }
+                
+                for item in cookiesArr {
+//                    HTTPCookieStorage.shared.deleteCookie(item)
+                    cookieStore.delete(item as! HTTPCookie) {
+                        print("调用web===")
+                    }
+                }
+            }
+            
+        } else {
+            if let cookiesList = HTTPCookieStorage.shared.cookies {
+                for item in cookiesList {
+                    HTTPCookieStorage.shared.deleteCookie(item)
+                }
+            }
+        }
+        
         SuspensionView.share().getsuspensionBtn()?.isHidden = false
         BDVoiceWakeUp.share().startWakeup()
 //        webView.removeObserver(self, forKeyPath: "estimatedProgress", context: nil)

MobilePortal/MobilePortal/codeObfuscation.h

 #ifndef Demo_codeObfuscation_h
 #define Demo_codeObfuscation_h
-//confuse string at Fri Jul 19 11:02:36 CST 2024
-#define BaseViewController sLKgTHWAJysQQcor
-#define myTableView uqFPkRPPKZPbbpqy
-#define setCacheAccountInfo jUXolRHacAOpgoiO
-#define setClassWebUrlAccountInfo pfHqxlnYLNWFlpkK
-#define setWebUrlAction fTxYjmMzqRAQtGHp
-#define SinglePointWeChatVC RlEYCQxWHKFLVrEk
-#define onLogin qdCtlQvbZEURTemz
-#define getLoginTypeHttpAction CJSxHOAgnXBfBCdA
-#define loginTypeHttpGetCmdTypeAction XNnGXtJYiuBzVfpc
-#define getScopeListHttpCmd KMrDQkFzZbyhaJbW
-#define selectSinglePointTypeAction MLFIlnYoHudKPerv
-#define getLoginHttpPostCmdCmd kBxMsYhVsYzrVQkE
-#define httpLoginHttpPostResultResponse nbfdWyjghyepjzWO
-#define getNewVersionUpdateHttpCmd yuEMtuTuUdFzRMHs
-#define getLoginDeviceInformationHttpCmd KnWrlgmfHXAnfAVQ
-#define getMyInformationHttpGetCmd wvCsnzXQKBiVuHTg
-#define getVerifyTokenHttpPostCmdAction voxcbqNvtsTHyXuC
-#define httpVerifyTokenHttpResultResponse NpIPagnyqSIRAPfJ
-#define loginGetUserInfo tBSJejBnAzMLZfUm
-#define httpSinglePointinfoHttpResultResponse BVfluknWpznAOkbt
-#define getWeChatXinfoHttpPostCmd cZJNKBejpPDUzWwy
-#define getWeChatBindingHttpPostCmd rgxNLteVsuxmcLDl
-#define httpWeChatXinfoHttpResultResponse sfSAZRNOfDpmUbjg
-#define SinglePointWeChatHttp vuHnMRVjYAmquaLY
-#define judgmentTokenExpired(resultBlock:@escaping MLZKofmwEFmCPxWc
-#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping RytqnaCHHzXsgFIi
-#define getRefreshTokenHttpPostCmd(resultBlock:@escaping goyLQXDCEWnGDlii
-#define func zCNYUZpUZuUToUTv
-#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping fOJGPNUEmjZvgfnF
-#define httpDeviceInformationHttpResultResponse(result: GpYBEPGWrfsVViXS
-#define LoginViewController JFJXJbwFbGNyzaTC
-#define WeChatBindingViewController pesaPpocnOfdPhEJ
-#define SinglePointViewController hvnwUCRrIatAqRpn
-#define MineViewController GOuVtUHPhJyPwQsW
-#define getSelectCompanyHttpCmd JJcTOBGLIbzhTlHR
-#define httpSelectCompanyHttpResultResponse rUOLooOaYUjWXmsk
-#define SelectCompanyViewController gPvuucSDIJOoHgKM
-#define MineMoreViewController kjqoNDBTFQZywRuE
-#define WebSwiftViewController MxnRKJgQGtaydGkV
-#define webView gjHHJGPTuEBqhxNU
-#define webViewUrl KaNOMcXdmpWPgMKo
-#define appid LkHRBmekOltDesax
-#define webActionTitle TYyfyZOYRwUxRlzz
-#define setwebView AlLrPGxUJKPSdOXN
-#define backPrevious OqmMOItxpmXibxmi
-#define WebActionOC UjhqilJmsqjRxvph
-#define getUrl eKliLewtNzSVTkRI
-#define getWebCookie OqlqebxUSmyLvgdD
-#define encryptAES aESAjZJrERHCMAbH
-#define decryptAES fhhDbJPKQreiuqnU
-#define ChangePassWordViewController hFdyOSjpoEbKyNXe
-#define oldTextView jwWCeLnBWWLpHvhq
-#define newTextView vqVZKSwwqrYMLaaF
-#define confirmPassTextView PqFwqRpolTczfChl
-#define actionChangePassWord qRDAfazYgamUfQvN
-#define getChangePasswordHttpCmd LCgAZtrKwNnHtyGO
-#define httpChangePasswordHttpResultResponse yOXQmUyweZRVvhmO
-#define getSinglePointPasswordHttpPostCmd akjOvLgBiFRzrNCO
-#define httpSinglePointPasswordHttpResultResponse XEoywcmSVlGHLaLS
-#define loginTypeHttpGetCmdTypeAction SgaoQlHpgLizGnTe
-#define MineMoreViewController DLbmBuuJRVVHeEFr
-#define getMyApplicationListHttpCmd MPWaHBgkJTTrSrNN
-#define httpMyApplicationListHttpResultResponse cHFpYqBkkmRhEDnj
-#define getAllApplicationHttpListCmd iTaisWHqlIiIoHFd
-#define httpMoreApplicationsTwoHttpResultResponse BwGAUcHjTztbBlYH
-#define changeBlockAction CYpbeWgjCjeQrijt
-#define getHttpCollcetionViewModellArray scdqxIQPTDQNQRbn
-#define getHttpCollcetionViewModellTwoArray zeGUUafNxijaxMFo
-#define getHttpMineMoreCollectionViewCellModel lRGTILdRNCkwFFKV
-#define getSaveApplicationsHttpCmd PeAGubSohhpfeBho
-#define httpSaveApplicationListHttpResultResponse tNVWCPFJplpJIjYa
-#define httpSelectCompanyHttpResultResponse XMHUuOYqnSRIduHv
-#define gotoCompanyListVC BfeXiKqbFXYNiJKc
-#define SelectCompanyViewController wURGEabPznmSXaqr
-#define actionCompanyHttpGCD pMtHhztmSEsjWYDE
-#define actiondepartmentHttpGCD vrhLqlEXdXpyZZSS
-#define myApplicationAction aWGCJrvfMFIfNpdW
-#define downloadOpenApp BKfTIYZZTXXGHBUQ
-#define oftenApplicationType BSwJgATEWGyVCpJO
-#define HTHttpConfig qpptLNHbpHPSxgaa
-#define kServiceAddressURL1 iKcbQjzLJArfjEnx
-#define imageURL1 ktsbhIAaknxUotVp
-#define kServiceAddressURL RrBhrEpJoIreQVyY
-#define imageURL fVXVZqEubmJHTgxP
-#define kServiceAddressURL2 rfCyNYrwTINpKcAZ
-#define imageURL2 GKTaocIXizXeIPsF
-#define HomeViewController RMhhTsBTmCAsIwFq
-#define actionHttpGCD GbMHROZmvyhKyOqI
-#define getHttpHomeClassListCmd zcmhPLxJCDTGRdSO
-#define httpHttpHomeClassListResultResponse VBNTkNhUVbpnpGkl
-#define getUpcomingCountHttpPostCmd PoFViNoiryeLrvCD
-#define httpUpcomingCountHttpResultResponse iVEzGgpCvqIYTRCo
-#define getMessageNunberShowHttpPostCmd fyHsaczNWdmFHxES
-#define httpMessageNumberShowHttpResultResponse wpDwreBzFhNwgwsm
+//confuse string at Mon Dec  9 10:41:09 CST 2024
+#define BaseViewController ILwCQfrgtvsKKZPB
+#define myTableView GcuZAgOvNXHCDZwc
+#define setCacheAccountInfo CtQyqEWaCyLgyysv
+#define setClassWebUrlAccountInfo mzSQcqdzsoXOvLtZ
+#define setWebUrlAction DrtGrdyjDDwZUYsP
+#define SinglePointWeChatVC VAHXbRmxCaExylqy
+#define onLogin wDRRFjcNdJDFeEmJ
+#define getLoginTypeHttpAction DaNbwPpOOACOEJvb
+#define loginTypeHttpGetCmdTypeAction LuhmFoJXtSVpOztX
+#define getScopeListHttpCmd VNMELGpYtAyvPVIo
+#define selectSinglePointTypeAction OrdkEUqIuQIYcSXw
+#define getLoginHttpPostCmdCmd jzRhbVHTxgRYcjoR
+#define httpLoginHttpPostResultResponse dqSaaCNYEkkiPvlE
+#define getNewVersionUpdateHttpCmd OXXsPpUCPeefRAXY
+#define getLoginDeviceInformationHttpCmd oJmruVubzIofshEa
+#define getMyInformationHttpGetCmd AngvmCVxEBDxHKKg
+#define getVerifyTokenHttpPostCmdAction lSmesTUzSkQVKPhm
+#define httpVerifyTokenHttpResultResponse CcbDwsknsYRqrRiA
+#define loginGetUserInfo PPgKrBqsJxqVwkiW
+#define httpSinglePointinfoHttpResultResponse aUdIEZwEMbqebRDY
+#define getWeChatXinfoHttpPostCmd LwcBopfQvHPGIzpc
+#define getWeChatBindingHttpPostCmd ktLChsAYQOxvDZVW
+#define httpWeChatXinfoHttpResultResponse GrcNwBBFoXNPapHz
+#define SinglePointWeChatHttp ecelcCoRKDrfVEZV
+#define judgmentTokenExpired(resultBlock:@escaping dOAPpqEIRvqBowit
+#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping VIThTdJoHqwbopGb
+#define getRefreshTokenHttpPostCmd(resultBlock:@escaping mCwKssRblCKCuSxY
+#define func aUTZXeVPShdeUnPL
+#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping nHtFnnerHMucMcwf
+#define httpDeviceInformationHttpResultResponse(result: TFPoecYrOMqFdtsd
+#define LoginViewController KALpNQazLOKvrorR
+#define WeChatBindingViewController KgqbzgOtjgrKxLWU
+#define SinglePointViewController IWrTumjQJWKEspoY
+#define MineViewController mnfgkKlhDtGrBqpz
+#define getSelectCompanyHttpCmd jXTETCnPFJqOesmz
+#define httpSelectCompanyHttpResultResponse IggftnjaSrIYfJwz
+#define SelectCompanyViewController mYGLAHKlxbHjlcWO
+#define MineMoreViewController PgrNKAwzlNsoDgme
+#define WebSwiftViewController WSpyzTKeBdreKNDA
+#define webView ZzERnOsKbXwytQhg
+#define webViewUrl nrCESTIEXgjocUrx
+#define appid iDooyZgktHfjLKHy
+#define webActionTitle GzyveEEknVxycZJY
+#define setwebView WOlNQuFQZTeHUUMN
+#define backPrevious cEppfblbLBmGZDGv
+#define WebActionOC DZpoadkeuxvKUjfx
+#define getUrl ccKSAthkfqhwxAfV
+#define getWebCookie LzMbYLlGHrYIIUPW
+#define encryptAES XTmdonfMHhdsBrTc
+#define decryptAES uQpsGSGcZiWTtulv
+#define ChangePassWordViewController vaIuMBfqJTxcvDsq
+#define oldTextView vavUazoXDiTBLnXb
+#define newTextView THdOcdUfurpmlYqf
+#define confirmPassTextView TyJgLrMceHbAHMpp
+#define actionChangePassWord DOyMxYOsBpMHsjco
+#define getChangePasswordHttpCmd xrIHqbygAslLWrsI
+#define httpChangePasswordHttpResultResponse JhIlUBeGAVOLUldD
+#define getSinglePointPasswordHttpPostCmd qyZyBBnvWrOSaQEy
+#define httpSinglePointPasswordHttpResultResponse mrTYQcwaamTgxXSy
+#define loginTypeHttpGetCmdTypeAction jQjtFbaZuOvCBXBn
+#define MineMoreViewController NvIzcbhhFPLwMvjw
+#define getMyApplicationListHttpCmd dwXbUhpchLSMmkOd
+#define httpMyApplicationListHttpResultResponse uKqrpTvpEnuHKCVO
+#define getAllApplicationHttpListCmd GEbCdbjMnoWoooTt
+#define httpMoreApplicationsTwoHttpResultResponse ElkteqOUUxebDoZo
+#define changeBlockAction ZZplvEGYoGfWodNl
+#define getHttpCollcetionViewModellArray lDDXHbjzaTjTdBZo
+#define getHttpCollcetionViewModellTwoArray rMsWepGIjBPuzZbj
+#define getHttpMineMoreCollectionViewCellModel xDvgrtGhZgYGQISK
+#define getSaveApplicationsHttpCmd IbZGVOYMMpNzEnfA
+#define httpSaveApplicationListHttpResultResponse MKzXWpxdTrGhTDZS
+#define httpSelectCompanyHttpResultResponse IKSgWcZbiXRkdhna
+#define gotoCompanyListVC qQpUcthTlAUzwMAd
+#define SelectCompanyViewController bAyDEDsuxdzyJvoG
+#define actionCompanyHttpGCD cFpzzbFTZTMiNZga
+#define actiondepartmentHttpGCD UyMSUrwpKhiyuuTv
+#define myApplicationAction OlsFwHbLOPvlbRwI
+#define downloadOpenApp tWeiHXYuvRSDPjdw
+#define oftenApplicationType gCzNCnhBlxVPdBVj
+#define HTHttpConfig pkJTVvYPgoNhCObD
+#define kServiceAddressURL1 bVpAyIaobQPpznOZ
+#define imageURL1 VoxYrdLHyQWIdlld
+#define kServiceAddressURL NGngjZMmPNMWXUlS
+#define imageURL leQRQeSPpUrXOdio
+#define kServiceAddressURL2 guSnqlieoZSAlGEk
+#define imageURL2 DTnVpfBjgQkWoJqJ
+#define HomeViewController PjaGSOsTIABalhFa
+#define actionHttpGCD GHPgYxQoOHvxnLDd
+#define getHttpHomeClassListCmd TiNawKYAJDNrWCCt
+#define httpHttpHomeClassListResultResponse loRLhVvbPWscAxqN
+#define getUpcomingCountHttpPostCmd OlqvVCiIuYJldhsK
+#define httpUpcomingCountHttpResultResponse MxltVYtnOsguJTrz
+#define getMessageNunberShowHttpPostCmd TKwXOoQkMXRJCPiQ
+#define httpMessageNumberShowHttpResultResponse XEuxYIpmSGUMRRZy
 #endif