修改2.0升级

MobilePortal/MobilePortal.xcodeproj/project.pbxproj

@@ -5284,7 +5284,7 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3.4;
+				CURRENT_PROJECT_VERSION = 2.0;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5304,7 +5304,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.4;
+				MARKETING_VERSION = 2.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -5364,9 +5364,9 @@
 					"-weak_framework",
 					"\"UserNotifications\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTest_dis_8;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd_new_dis4;
 				SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
@@ -5385,7 +5385,7 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3.4;
+				CURRENT_PROJECT_VERSION = 2.0;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5405,7 +5405,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.4;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -5464,9 +5464,9 @@
 					"-weak_framework",
 					"\"UserNotifications\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTest_dis_8;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd_new_dis4;
 				SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -5585,9 +5585,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/ServiceExtension",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest.ServiceExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd.ServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTestServiceExtension_dis2;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd.ServiceExtension_dis2;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -5615,9 +5615,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/ServiceExtension",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest.ServiceExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd.ServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTestServiceExtension_dis2;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd.ServiceExtension_dis2;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

MobilePortal/MobilePortal.xcworkspace/xcuserdata/caiyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -748,8 +748,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "191"
             endingLineNumber = "191"
-            landmarkName = "webView(_:createWebViewWith:for:windowFeatures:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -765,8 +765,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "122"
             endingLineNumber = "122"
-            landmarkName = "webView(_:didFail:withError:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
             <Locations>
                <Location
                   uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8579"
@@ -899,8 +899,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "21"
             endingLineNumber = "21"
-            landmarkName = "unknown"
-            landmarkType = "0">
+            landmarkName = "juDeactivateEnableSinglePointData(array:)"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

MobilePortal/MobilePortal/AppDelegate.swift

@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate  {
         /// 键盘
         IQKeyboardManager.shared.enable = true
 //        2体验版 1 测试版 0正式 106785
-        AccountInfo.sharedInstance().isTest = "1"
+        AccountInfo.sharedInstance().isTest = "2"
         AccountInfo.sharedInstance().messageNumber = "0"
 //        1新接口 0老接口
         if AccountInfo.sharedInstance().oldType == nil {

MobilePortal/MobilePortal/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>上药移动测试版</string>
+	<string>上药移动</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -138,6 +138,8 @@
 	<string>App需要您的同意,才能访问当前位置</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>App需要您的同意,才能访问麦克风</string>
+	<key>Photo Library Additions Usage Description</key>
+	<string>App需要您的同意,才能访问相册</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>

MobilePortal/MobilePortal/codeObfuscation.h

 #ifndef Demo_codeObfuscation_h
 #define Demo_codeObfuscation_h
-//confuse string at Fri Feb 10 15:07:10 CST 2023
-#define BaseViewController NjXRQCsPFhjaDaDq
-#define myTableView ZSlFyotyCQqcUBWH
-#define setCacheAccountInfo vGCSUJUYHExdMgQQ
-#define setClassWebUrlAccountInfo wPthBxJDKEwzXozk
-#define setWebUrlAction PGAYTwEVRoDIfMGY
-#define SinglePointWeChatVC TVrXLUDuikcQHnPX
-#define onLogin lhDxyWFJNxcpxTCA
-#define getLoginTypeHttpAction JkPrWKGUoZMVaCMz
-#define loginTypeHttpGetCmdTypeAction rustUIgQzYNiXcYJ
-#define getScopeListHttpCmd wkJYvMlnbgFCuujn
-#define selectSinglePointTypeAction NdSFptaFvprfOhxz
-#define getLoginHttpPostCmdCmd dZqBjwMzTNPpeywL
-#define httpLoginHttpPostResultResponse YCxaFUBritGXibhd
-#define getNewVersionUpdateHttpCmd QOCsvZLnVtPfgwke
-#define getLoginDeviceInformationHttpCmd EoDnoygvvKhBSRDh
-#define getMyInformationHttpGetCmd iIvPiHkbyFjCZWRP
-#define getVerifyTokenHttpPostCmdAction EdLVUJgKyRUFcPlG
-#define httpVerifyTokenHttpResultResponse QgDMTRulJNZdDjsu
-#define loginGetUserInfo DNwfXpRjbqsjiqlB
-#define httpSinglePointinfoHttpResultResponse CInaKHqFOzPwuVWI
-#define getWeChatXinfoHttpPostCmd dzDAoQsrosJRCHGD
-#define getWeChatBindingHttpPostCmd mSUiDyhnGTZTibQJ
-#define httpWeChatXinfoHttpResultResponse NbSITdxYfMDuMxSb
-#define SinglePointWeChatHttp DTlskICQBGYPAaFH
-#define judgmentTokenExpired(resultBlock:@escaping jBxQGZbBHiSiXLin
-#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping oSGBrQTNnWaoYJaU
-#define getRefreshTokenHttpPostCmd(resultBlock:@escaping IGrGMuETlnLCjNmE
-#define func VwpdSLBWEKCUYDRz
-#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping CxDIPPerooOYGUwO
-#define httpDeviceInformationHttpResultResponse(result: jgtRBtMhxLnxdlDF
-#define LoginViewController ZgOxOmPibBpIAyly
-#define WeChatBindingViewController ERzFbmwUXUzVhxBu
-#define SinglePointViewController wiPfmlFKXcNFCXRi
-#define MineViewController XqcnTMiKzOIvOAwj
-#define getSelectCompanyHttpCmd PHiMKplZGHNdhiFQ
-#define httpSelectCompanyHttpResultResponse OvYvgblyGpuKZiNG
-#define SelectCompanyViewController dCuEzIUNYixwxgaD
-#define MineMoreViewController rtAYKoIznEQCLsMa
-#define WebSwiftViewController nBtQdLRSfYuFXROS
-#define webView uNiNUbqKWjVytHTF
-#define webViewUrl bYzDSPpJwDFmhtyJ
-#define appid YMToMtByWjBwjDTf
-#define webActionTitle dOTfrjhVPODJbfSG
-#define setwebView aaQlxKFGxPHWpzgF
-#define backPrevious KEzIwzWJViLNjTcx
-#define WebActionOC qaTnKUXxiMnIIwfQ
-#define getUrl bKNQTDGjfsFgxNOU
-#define getWebCookie idMEamSFTGmWtyuF
-#define encryptAES yeLdhydohinpkYWq
-#define decryptAES pIuBurShkhnWeqgd
-#define ChangePassWordViewController YjBXLwEmjXFgCiwc
-#define oldTextView PdFbHxKuKecULPYv
-#define newTextView SRwEOjYwSWsWUABS
-#define confirmPassTextView viErVEzdyagLUnhP
-#define actionChangePassWord zsUBMWzbJUpKGPHI
-#define getChangePasswordHttpCmd wPHWcLELhVqAYGKN
-#define httpChangePasswordHttpResultResponse HieoQsyAmYGbvHjw
-#define getSinglePointPasswordHttpPostCmd VXXhfbrOJRopJAjB
-#define httpSinglePointPasswordHttpResultResponse XhHwsPFSTxZwtgSp
-#define loginTypeHttpGetCmdTypeAction GWMzpGZejVnJfKNE
-#define MineMoreViewController qgxWKKXjWrbsihFz
-#define getMyApplicationListHttpCmd tEzJSsTDFiKdsBla
-#define httpMyApplicationListHttpResultResponse PcOaRqTARCagpIha
-#define getAllApplicationHttpListCmd dYrkvroDZHzRDRid
-#define httpMoreApplicationsTwoHttpResultResponse yurfARaKwKoWrjBn
-#define changeBlockAction lLDWZfwrFmXiSnid
-#define getHttpCollcetionViewModellArray KwEeioRVzSjDmzkt
-#define getHttpCollcetionViewModellTwoArray feTaFxdfQuplTSKN
-#define getHttpMineMoreCollectionViewCellModel cIEqQKDUOulqlNUF
-#define getSaveApplicationsHttpCmd lKvdwyMtxMIeCeaF
-#define httpSaveApplicationListHttpResultResponse lJhaESKFkQBOdszM
-#define httpSelectCompanyHttpResultResponse ZxldKalMewOojrte
-#define gotoCompanyListVC RuQXXQRiUmIALYct
-#define SelectCompanyViewController lsiJidZrQSClmDrH
-#define actionCompanyHttpGCD XckDhlmUVXTgWINH
-#define actiondepartmentHttpGCD mVmBCBsdePdmslai
-#define myApplicationAction oCTaqoVVyStCRLsE
-#define downloadOpenApp ShELCWflFBCOuxiY
-#define oftenApplicationType olOYUomKDAbgjuhe
-#define HTHttpConfig pbUhguPMwsMLMVlo
-#define kServiceAddressURL1 HpBeTsaqMKYlpxmL
-#define imageURL1 jlSwKDMpHMSjRAud
-#define kServiceAddressURL CnAZsLJFDCeAnptV
-#define imageURL zpKHdqXUTBOSzAtb
-#define kServiceAddressURL2 yrDdreTnSoCtWtUL
-#define imageURL2 OapAkAAjuxVjFAvH
-#define HomeViewController ifbkbKVaEjPlQTpj
-#define actionHttpGCD mhnYxvLgzqgHEWcm
-#define getHttpHomeClassListCmd hjsykYbTdtwXatBp
-#define httpHttpHomeClassListResultResponse HTNhMjqbEZxfzxWO
-#define getUpcomingCountHttpPostCmd SMSSBNXvfOlAEyeb
-#define httpUpcomingCountHttpResultResponse DDWogfiygsIwFghN
-#define getMessageNunberShowHttpPostCmd RgMayLMiVOyjzJUD
-#define httpMessageNumberShowHttpResultResponse GyeWoMHuTwPdIGOl
+//confuse string at Fri Jul  7 17:09:56 CST 2023
+#define BaseViewController xiJzokGXRDosFzMc
+#define myTableView CqjLPvOUelOOHDUO
+#define setCacheAccountInfo SeyzWXRKmqWafZbl
+#define setClassWebUrlAccountInfo YzyxmQMCuuVYYmUF
+#define setWebUrlAction LoMgAYIGCTvfiSyU
+#define SinglePointWeChatVC BzOzJoUQdguJfGEc
+#define onLogin sGPGTmjOwpldTwmt
+#define getLoginTypeHttpAction OxmrUIfzhBRKDMZP
+#define loginTypeHttpGetCmdTypeAction ZXbDoeVAyiNPzksG
+#define getScopeListHttpCmd bDryeTMgZhcBubOD
+#define selectSinglePointTypeAction DnpEmXUEJWwthCTY
+#define getLoginHttpPostCmdCmd voSoxvVyPdboRvYD
+#define httpLoginHttpPostResultResponse qZIDAbwOgeORmZbO
+#define getNewVersionUpdateHttpCmd ZNoJwssJoUVXCHbf
+#define getLoginDeviceInformationHttpCmd rAggRPZUuNRTlStQ
+#define getMyInformationHttpGetCmd PwIFodWrTUGFXyyi
+#define getVerifyTokenHttpPostCmdAction ezylQMcbummSmdhF
+#define httpVerifyTokenHttpResultResponse FgpyaXHTqHjdBWRZ
+#define loginGetUserInfo VieTbfcWScfrsBFh
+#define httpSinglePointinfoHttpResultResponse hJqTXhcFTrLdEnMl
+#define getWeChatXinfoHttpPostCmd qWYuRcrOgebeQPgb
+#define getWeChatBindingHttpPostCmd nOYmcqbUuIAjFjzs
+#define httpWeChatXinfoHttpResultResponse bfmzMzOTkvtStkEN
+#define SinglePointWeChatHttp nncgkuhZsZYUJGTE
+#define judgmentTokenExpired(resultBlock:@escaping gJhSuZowoxaxiKee
+#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping DoVJIyMQCwNdyKzP
+#define getRefreshTokenHttpPostCmd(resultBlock:@escaping yLYPeeHhODihsEPy
+#define func zRnIZLWuUkKNDnrB
+#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping gOehPHKxAjMgTEIL
+#define httpDeviceInformationHttpResultResponse(result: XeqePAitWUmKzJyY
+#define LoginViewController jkISjtQNlsTVvIXr
+#define WeChatBindingViewController HQPnJPjhMgRiLSxe
+#define SinglePointViewController isKqyPdViNOnTwON
+#define MineViewController NeuNwlQdJXeHNfJh
+#define getSelectCompanyHttpCmd VCYbDRiDSdzlAssC
+#define httpSelectCompanyHttpResultResponse GxizAqcgGZVYarNx
+#define SelectCompanyViewController wBFSitHKMjyGouVh
+#define MineMoreViewController WzHEVrrYimDpZeWZ
+#define WebSwiftViewController gUSwpjYTnMzByyRC
+#define webView KzZhXROMPsUAhCxP
+#define webViewUrl GyohoahdUvVIJtMA
+#define appid rbvIoCVzwPMZumzJ
+#define webActionTitle vuvxBDTGONgsjdLz
+#define setwebView AVadgxdbYDJfmSqO
+#define backPrevious LJFAqhWhzVhBzTnc
+#define WebActionOC bBLpESgDIePyHUKt
+#define getUrl iiYRdyDLZLABxTnj
+#define getWebCookie YGAIRwtrfNbFGqVm
+#define encryptAES GBPHKscTjDxbxCVO
+#define decryptAES ZkjzGBCtYCLqGgDR
+#define ChangePassWordViewController tCeKicvHatpLiOKS
+#define oldTextView zmimTSUlQRBhPXMV
+#define newTextView UoaLxQOmfINjjxly
+#define confirmPassTextView xXycTFTaESlEfwFN
+#define actionChangePassWord jHaQoSLJpCYyVSln
+#define getChangePasswordHttpCmd YniWXevnqWwaFWoC
+#define httpChangePasswordHttpResultResponse oXVyJaHkBjbBwSzn
+#define getSinglePointPasswordHttpPostCmd DqnMlXQUZAiUracx
+#define httpSinglePointPasswordHttpResultResponse jHlEqohNCrokhdgw
+#define loginTypeHttpGetCmdTypeAction zNdnTeESVtdycSXM
+#define MineMoreViewController BvKGQSxRoquzIYkV
+#define getMyApplicationListHttpCmd zElDlLEraZahDyJc
+#define httpMyApplicationListHttpResultResponse pESaYGfnHhDmsidV
+#define getAllApplicationHttpListCmd CUskFrVQrGsJaMJJ
+#define httpMoreApplicationsTwoHttpResultResponse rtxeLxENWQZplVEl
+#define changeBlockAction MUiAEoWBBafoQyND
+#define getHttpCollcetionViewModellArray SAmLIhkiqEgycopL
+#define getHttpCollcetionViewModellTwoArray LcoUWZKDzoPLDrod
+#define getHttpMineMoreCollectionViewCellModel iEvfCaPAsyqjxbRQ
+#define getSaveApplicationsHttpCmd zlbMMUICcbpNEyEP
+#define httpSaveApplicationListHttpResultResponse wldJRRaDTwtTZBwf
+#define httpSelectCompanyHttpResultResponse AXObItqwiiGkWfwD
+#define gotoCompanyListVC YMjBUMjTzZIHdCuu
+#define SelectCompanyViewController cWACIWkDrXIMSflZ
+#define actionCompanyHttpGCD kUBQHoLlrPIvzzSr
+#define actiondepartmentHttpGCD GrGmGwduwUoAusKb
+#define myApplicationAction srmohFmHhKRSniwE
+#define downloadOpenApp rTMTUQdaVyTBTSdc
+#define oftenApplicationType eIpraLLAphLyJYLq
+#define HTHttpConfig zIBOlCXEExSbQyzQ
+#define kServiceAddressURL1 tXPPsHdwGPehbyxd
+#define imageURL1 cLPKcSILXOBdgTNf
+#define kServiceAddressURL VcwdDWNEPSbHUMPT
+#define imageURL ysYmuQuDbgPOwAWP
+#define kServiceAddressURL2 QWFaAwXRgWYenfvP
+#define imageURL2 RKRNnHNorPPYyvMf
+#define HomeViewController huRtiflqrbzUrhMS
+#define actionHttpGCD ySvGdAwOlBQcByca
+#define getHttpHomeClassListCmd uZMMrbayTkjuKCew
+#define httpHttpHomeClassListResultResponse EJsultAdNVjNuesq
+#define getUpcomingCountHttpPostCmd NTZfoMkeYMQZVgGr
+#define httpUpcomingCountHttpResultResponse tdRLNaImSmSYZgBb
+#define getMessageNunberShowHttpPostCmd IKacXXSIYieEsmOW
+#define httpMessageNumberShowHttpResultResponse mxDEnEjHZEKpfqFn
 #endif

MobilePortal/ServiceExtension/NotificationService.swift

@@ -19,7 +19,7 @@ class NotificationService: UNNotificationServiceExtension {
         // 444b4a4c86a09bd2e27367fe  测试
         // c0eb5d604f19e9d58af5f8de  正式
         
-        JPushNotificationExtensionService.jpushSetAppkey("444b4a4c86a09bd2e27367fe")
+        JPushNotificationExtensionService.jpushSetAppkey("c0eb5d604f19e9d58af5f8de")
         JPushNotificationExtensionService.jpushReceive(request) {
             print("apns upload success")
             contentHandler(request.content)