Commit 3db15a78 authored by xiejb's avatar xiejb

版本2.3

parent b1be3d1a
...@@ -5306,7 +5306,7 @@ ...@@ -5306,7 +5306,7 @@
CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements; CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd."; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3.3; CURRENT_PROJECT_VERSION = 2.3;
DEVELOPMENT_TEAM = 7FYU37G7W6; DEVELOPMENT_TEAM = 7FYU37G7W6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5326,7 +5326,7 @@ ...@@ -5326,7 +5326,7 @@
"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib", "$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK", "$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
); );
MARKETING_VERSION = 3.3; MARKETING_VERSION = 2.3;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
...@@ -5386,9 +5386,9 @@ ...@@ -5386,9 +5386,9 @@
"-weak_framework", "-weak_framework",
"\"UserNotifications\"", "\"UserNotifications\"",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest; PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTest_new_dis3; PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd_new_dis6;
SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
...@@ -5407,7 +5407,7 @@ ...@@ -5407,7 +5407,7 @@
CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements; CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd."; CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3.3; CURRENT_PROJECT_VERSION = 2.3;
DEVELOPMENT_TEAM = 7FYU37G7W6; DEVELOPMENT_TEAM = 7FYU37G7W6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5427,7 +5427,7 @@ ...@@ -5427,7 +5427,7 @@
"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib", "$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK", "$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
); );
MARKETING_VERSION = 3.3; MARKETING_VERSION = 2.3;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -5486,9 +5486,9 @@ ...@@ -5486,9 +5486,9 @@
"-weak_framework", "-weak_framework",
"\"UserNotifications\"", "\"UserNotifications\"",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest; PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTest_new_dis3; PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd_new_dis6;
SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
...@@ -5607,9 +5607,9 @@ ...@@ -5607,9 +5607,9 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/ServiceExtension", "$(PROJECT_DIR)/ServiceExtension",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest.ServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd.ServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTestServiceExtension_dis3; PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd.ServiceExtension_dis6;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
...@@ -5637,9 +5637,9 @@ ...@@ -5637,9 +5637,9 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/ServiceExtension", "$(PROJECT_DIR)/ServiceExtension",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest.ServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd.ServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTestServiceExtension_dis3; PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd.ServiceExtension_dis6;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
......
...@@ -1185,8 +1185,8 @@ ...@@ -1185,8 +1185,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "163" startingLineNumber = "163"
endingLineNumber = "163" endingLineNumber = "163"
landmarkName = "unknown" landmarkName = "setwebView(strUrl:)"
landmarkType = "0"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
...@@ -1201,8 +1201,8 @@ ...@@ -1201,8 +1201,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "198" startingLineNumber = "198"
endingLineNumber = "198" endingLineNumber = "198"
landmarkName = "unknown" landmarkName = "setHTTPCookie(count:host:)"
landmarkType = "0"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
...@@ -1217,8 +1217,8 @@ ...@@ -1217,8 +1217,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "207" startingLineNumber = "207"
endingLineNumber = "207" endingLineNumber = "207"
landmarkName = "unknown" landmarkName = "setHTTPCookie(count:host:)"
landmarkType = "0"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
...@@ -1233,8 +1233,8 @@ ...@@ -1233,8 +1233,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "160" startingLineNumber = "160"
endingLineNumber = "160" endingLineNumber = "160"
landmarkName = "unknown" landmarkName = "setwebView(strUrl:)"
landmarkType = "0"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
......
...@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate { ...@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate {
/// 键盘 /// 键盘
IQKeyboardManager.shared.enable = true IQKeyboardManager.shared.enable = true
// 2体验版 1 测试版 0正式 106785 // 2体验版 1 测试版 0正式 106785
AccountInfo.sharedInstance().isTest = "1" AccountInfo.sharedInstance().isTest = "2"
AccountInfo.sharedInstance().messageNumber = "0" AccountInfo.sharedInstance().messageNumber = "0"
// 1新接口 0老接口 // 1新接口 0老接口
if AccountInfo.sharedInstance().oldType == nil { if AccountInfo.sharedInstance().oldType == nil {
......
...@@ -99,7 +99,16 @@ ...@@ -99,7 +99,16 @@
// TODO:这边结合 WRCellView 会不会更好呢? // TODO:这边结合 WRCellView 会不会更好呢?
-(void)updateFrame { -(void)updateFrame {
NSInteger top = ([WRCustomNavigationBar isIphoneX]) ? 44 : 20; // NSInteger top = ([WRCustomNavigationBar isIphoneX]) ? 44 : 20;
// NSInteger top = ([WRCustomNavigationBar isIphoneX]) ? (([WRCustomNavigationBar isIphoneXPro]) ? 59 : 44) : 20;
NSInteger top = 0;
if ([WRCustomNavigationBar isIphoneXPro]) {
top = 59;
} else if ([WRCustomNavigationBar isIphoneX]) {
top = 44;
} else {
top = 20;
}
NSInteger margin = 0; NSInteger margin = 0;
NSInteger buttonHeight = 44; NSInteger buttonHeight = 44;
NSInteger buttonWidth = 44; NSInteger buttonWidth = 44;
...@@ -276,10 +285,13 @@ ...@@ -276,10 +285,13 @@
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) || return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(360, 780)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(780, 360)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(390, 844)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(844, 390)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(428, 926)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(926, 428))); CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(360, 780)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(780, 360)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(390, 844)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(844, 390)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(428, 926)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(926, 428)));
} }
BOOL isIPhoneX = [platform isEqualToString:@"iPhone10,3"] || [platform isEqualToString:@"iPhone10,6"] || [platform isEqualToString:@"iPhone11,8"] || [platform isEqualToString:@"iPhone11,2"] || [platform isEqualToString:@"iPhone11,6"] || [platform isEqualToString:@"iPhone11,4"] || [platform isEqualToString:@"iPhone12,1"] || [platform isEqualToString:@"iPhone12,3"] || [platform isEqualToString:@"iPhone12,5"] || [platform isEqualToString:@"iPhone13,1"] || [platform isEqualToString:@"iPhone13,2"] || [platform isEqualToString:@"iPhone13,3"] || [platform isEqualToString:@"iPhone13,4"] || [platform isEqualToString:@"iPhone14,2"] || [platform isEqualToString:@"iPhone14,3"] || [platform isEqualToString:@"iPhone14,4"] || [platform isEqualToString:@"iPhone14,5"] || [platform isEqualToString:@"iPhone15,4"] || [platform isEqualToString:@"iPhone15,5"] || [platform isEqualToString:@"iPhone16,1"] || [platform isEqualToString:@"iPhone14,2"]; BOOL isIPhoneX = [platform isEqualToString:@"iPhone10,3"] || [platform isEqualToString:@"iPhone10,6"] || [platform isEqualToString:@"iPhone11,8"] || [platform isEqualToString:@"iPhone11,2"] || [platform isEqualToString:@"iPhone11,6"] || [platform isEqualToString:@"iPhone11,4"] || [platform isEqualToString:@"iPhone12,1"] || [platform isEqualToString:@"iPhone12,3"] || [platform isEqualToString:@"iPhone12,5"] || [platform isEqualToString:@"iPhone13,1"] || [platform isEqualToString:@"iPhone13,2"] || [platform isEqualToString:@"iPhone13,3"] || [platform isEqualToString:@"iPhone13,4"] || [platform isEqualToString:@"iPhone14,2"] || [platform isEqualToString:@"iPhone14,3"] || [platform isEqualToString:@"iPhone14,4"] || [platform isEqualToString:@"iPhone14,5"] || [platform isEqualToString:@"iPhone14,7"] || [platform isEqualToString:@"iPhone14,8"] || [platform isEqualToString:@"iPhone15,2"] || [platform isEqualToString:@"iPhone15,3"] || [platform isEqualToString:@"iPhone15,4"] || [platform isEqualToString:@"iPhone15,5"] || [platform isEqualToString:@"iPhone16,1"] || [platform isEqualToString:@"iPhone16,2"];
return isIPhoneX; return isIPhoneX;
} }
+ (BOOL)isIphoneXPro {
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(430, 932)) ||
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(932, 430)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(393, 852)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(852, 393)));
}
@end @end
......
...@@ -22,12 +22,24 @@ ...@@ -22,12 +22,24 @@
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) || return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(360, 780)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(780, 360)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(390, 844)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(844, 390)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(428, 926)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(926, 428))); CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(360, 780)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(780, 360)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(390, 844)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(844, 390)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(428, 926)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(926, 428)));
} }
BOOL isIPhoneX = [platform isEqualToString:@"iPhone10,3"] || [platform isEqualToString:@"iPhone10,6"] || [platform isEqualToString:@"iPhone11,8"] || [platform isEqualToString:@"iPhone11,2"] || [platform isEqualToString:@"iPhone11,6"] || [platform isEqualToString:@"iPhone11,4"] || [platform isEqualToString:@"iPhone12,1"] || [platform isEqualToString:@"iPhone12,3"] || [platform isEqualToString:@"iPhone12,5"] || [platform isEqualToString:@"iPhone13,1"] || [platform isEqualToString:@"iPhone13,2"] || [platform isEqualToString:@"iPhone13,3"] || [platform isEqualToString:@"iPhone13,4"] || [platform isEqualToString:@"iPhone14,2"] || [platform isEqualToString:@"iPhone14,3"] || [platform isEqualToString:@"iPhone14,4"] || [platform isEqualToString:@"iPhone14,5"] || [platform isEqualToString:@"iPhone15,4"] || [platform isEqualToString:@"iPhone15,5"] || [platform isEqualToString:@"iPhone16,1"] || [platform isEqualToString:@"iPhone14,2"]; BOOL isIPhoneX = [platform isEqualToString:@"iPhone10,3"] || [platform isEqualToString:@"iPhone10,6"] || [platform isEqualToString:@"iPhone11,8"] || [platform isEqualToString:@"iPhone11,2"] || [platform isEqualToString:@"iPhone11,6"] || [platform isEqualToString:@"iPhone11,4"] || [platform isEqualToString:@"iPhone12,1"] || [platform isEqualToString:@"iPhone12,3"] || [platform isEqualToString:@"iPhone12,5"] || [platform isEqualToString:@"iPhone13,1"] || [platform isEqualToString:@"iPhone13,2"] || [platform isEqualToString:@"iPhone13,3"] || [platform isEqualToString:@"iPhone13,4"] || [platform isEqualToString:@"iPhone14,2"] || [platform isEqualToString:@"iPhone14,3"] || [platform isEqualToString:@"iPhone14,4"] || [platform isEqualToString:@"iPhone14,5"] || [platform isEqualToString:@"iPhone14,7"] || [platform isEqualToString:@"iPhone14,8"] || [platform isEqualToString:@"iPhone15,2"] || [platform isEqualToString:@"iPhone15,3"] || [platform isEqualToString:@"iPhone15,4"] || [platform isEqualToString:@"iPhone15,5"] || [platform isEqualToString:@"iPhone16,1"] || [platform isEqualToString:@"iPhone16,2"];
return isIPhoneX; return isIPhoneX;
} }
+ (BOOL)isIphoneXPro {
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(430, 932)) ||
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(932, 430)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(393, 852)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(852, 393)));
}
+ (CGFloat)navBarBottom { + (CGFloat)navBarBottom {
return [self isIphoneX] ? 88 : 64; if ([self isIphoneXPro]) {
return 105;
} else if ([self isIphoneX]) {
return 88;
} else {
return 64;
}
// return [self isIphoneX] ? ([self isIphoneXPro] ? 103 : 88) : 64;
// return [self isIphoneX] ? 88 : 64;
} }
+ (CGFloat)tabBarHeight { + (CGFloat)tabBarHeight {
return [self isIphoneX] ? 83 : 49; return [self isIphoneX] ? 83 : 49;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string> <string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>上药移动测试</string> <string>上药移动</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
......
...@@ -112,6 +112,7 @@ class MineMoreViewController: BaseViewController { ...@@ -112,6 +112,7 @@ class MineMoreViewController: BaseViewController {
// wr_setDefaultNavBarTintColor(UIColor.white) // wr_setDefaultNavBarTintColor(UIColor.white)
self.wr_setNavBarTintColor(UIColorFromRGB(rgbValue: 0x23262A)) self.wr_setNavBarTintColor(UIColorFromRGB(rgbValue: 0x23262A))
self.view.backgroundColor = UIColorFromRGB(rgbValue: 0xF4F9FD) self.view.backgroundColor = UIColorFromRGB(rgbValue: 0xF4F9FD)
self.wr_setNavBarShadowImageHidden(true)
//self.title = "更多" //self.title = "更多"
addInitTableView() addInitTableView()
actionHttpGCD() actionHttpGCD()
......
...@@ -52,7 +52,7 @@ class MineInfoViewController: BaseViewController,WXAuthDelegate,WXApiDelegate { ...@@ -52,7 +52,7 @@ class MineInfoViewController: BaseViewController,WXAuthDelegate,WXApiDelegate {
addHeaderFooter() addHeaderFooter()
// addInitLoginButton() // addInitLoginButton()
// wr_setDefaultNavBarShadowImageHidden // wr_setDefaultNavBarShadowImageHidden
self.wr_setNavBarShadowImageHidden(false) self.wr_setNavBarShadowImageHidden(true)
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
......
...@@ -40,7 +40,8 @@ class SetUpViewController: BaseViewController { ...@@ -40,7 +40,8 @@ class SetUpViewController: BaseViewController {
// addHeaderFooter() // addHeaderFooter()
// addInitLoginButton() // addInitLoginButton()
// wr_setDefaultNavBarShadowImageHidden // wr_setDefaultNavBarShadowImageHidden
self.wr_setNavBarShadowImageHidden(false) // self.wr_setNavBarShadowImageHidden(false)
self.wr_setNavBarShadowImageHidden(true)
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }
func addInitTableView() { func addInitTableView() {
......
...@@ -258,6 +258,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -258,6 +258,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
self.webView.configuration.userContentController.removeScriptMessageHandler(forName: actionName) self.webView.configuration.userContentController.removeScriptMessageHandler(forName: actionName)
} }
webView.stopLoading() webView.stopLoading()
self.wr_setNavBarShadowImageHidden(true)
// webView.removeFromSuperview() // webView.removeFromSuperview()
// webView.uiDelegate = nil // webView.uiDelegate = nil
// webView.navigationDelegate = nil // webView.navigationDelegate = nil
......
#ifndef Demo_codeObfuscation_h #ifndef Demo_codeObfuscation_h
#define Demo_codeObfuscation_h #define Demo_codeObfuscation_h
//confuse string at Wed Jan 24 17:37:19 CST 2024 //confuse string at Fri Jul 19 11:02:36 CST 2024
#define BaseViewController scUczMsmrNPgZPOG #define BaseViewController sLKgTHWAJysQQcor
#define myTableView kCcKFJGrcxyKnKdW #define myTableView uqFPkRPPKZPbbpqy
#define setCacheAccountInfo WvznAOnIbZIPZyqH #define setCacheAccountInfo jUXolRHacAOpgoiO
#define setClassWebUrlAccountInfo zFEpnsmKVQHQeAdU #define setClassWebUrlAccountInfo pfHqxlnYLNWFlpkK
#define setWebUrlAction AKcgGJEsQvujJfjW #define setWebUrlAction fTxYjmMzqRAQtGHp
#define SinglePointWeChatVC sstksncEeUcWnjmP #define SinglePointWeChatVC RlEYCQxWHKFLVrEk
#define onLogin BdKHAPJfrySdnvuD #define onLogin qdCtlQvbZEURTemz
#define getLoginTypeHttpAction XVZnyBTVoRWKihBu #define getLoginTypeHttpAction CJSxHOAgnXBfBCdA
#define loginTypeHttpGetCmdTypeAction UvVSSIzXjXQlotqb #define loginTypeHttpGetCmdTypeAction XNnGXtJYiuBzVfpc
#define getScopeListHttpCmd OnDkxDQmmbvNtYaY #define getScopeListHttpCmd KMrDQkFzZbyhaJbW
#define selectSinglePointTypeAction HHbcTxGDCQTKTzXl #define selectSinglePointTypeAction MLFIlnYoHudKPerv
#define getLoginHttpPostCmdCmd bjKIFJnHKBmrScvM #define getLoginHttpPostCmdCmd kBxMsYhVsYzrVQkE
#define httpLoginHttpPostResultResponse FRXQpcckDHpVnrCd #define httpLoginHttpPostResultResponse nbfdWyjghyepjzWO
#define getNewVersionUpdateHttpCmd qELmQVBaLCbXxNDn #define getNewVersionUpdateHttpCmd yuEMtuTuUdFzRMHs
#define getLoginDeviceInformationHttpCmd xXjibzFvCwZTqRqF #define getLoginDeviceInformationHttpCmd KnWrlgmfHXAnfAVQ
#define getMyInformationHttpGetCmd KgBLqMHzYhBIOiJJ #define getMyInformationHttpGetCmd wvCsnzXQKBiVuHTg
#define getVerifyTokenHttpPostCmdAction oHrDlHTHCUiDkNNU #define getVerifyTokenHttpPostCmdAction voxcbqNvtsTHyXuC
#define httpVerifyTokenHttpResultResponse rsdgWWxrBKDAiVMv #define httpVerifyTokenHttpResultResponse NpIPagnyqSIRAPfJ
#define loginGetUserInfo YnedQUmwDzbgPCQH #define loginGetUserInfo tBSJejBnAzMLZfUm
#define httpSinglePointinfoHttpResultResponse gRPeUFlsHAKKdIUq #define httpSinglePointinfoHttpResultResponse BVfluknWpznAOkbt
#define getWeChatXinfoHttpPostCmd yAThAvrNfZLtBcmT #define getWeChatXinfoHttpPostCmd cZJNKBejpPDUzWwy
#define getWeChatBindingHttpPostCmd RjQEJDHnTIBvaTSt #define getWeChatBindingHttpPostCmd rgxNLteVsuxmcLDl
#define httpWeChatXinfoHttpResultResponse UGmEOuDtxnLlWkVu #define httpWeChatXinfoHttpResultResponse sfSAZRNOfDpmUbjg
#define SinglePointWeChatHttp QmxDfwUwofbkKRKD #define SinglePointWeChatHttp vuHnMRVjYAmquaLY
#define judgmentTokenExpired(resultBlock:@escaping DURneoegNPuAcTgn #define judgmentTokenExpired(resultBlock:@escaping MLZKofmwEFmCPxWc
#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping UXlgsVMjeAsHSEgH #define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping RytqnaCHHzXsgFIi
#define getRefreshTokenHttpPostCmd(resultBlock:@escaping GdzxPFXryiMAZjOA #define getRefreshTokenHttpPostCmd(resultBlock:@escaping goyLQXDCEWnGDlii
#define func KwGYmNsDbImzRErT #define func zCNYUZpUZuUToUTv
#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping NEkqbyRalVYEZkCd #define getLoginDeviceInformationHttpCmd(resultBlock:@escaping fOJGPNUEmjZvgfnF
#define httpDeviceInformationHttpResultResponse(result: BZNysyFKzmAXkKzF #define httpDeviceInformationHttpResultResponse(result: GpYBEPGWrfsVViXS
#define LoginViewController RhelgKGFdJBSxZgU #define LoginViewController JFJXJbwFbGNyzaTC
#define WeChatBindingViewController DEBLdFfujWCpxVNV #define WeChatBindingViewController pesaPpocnOfdPhEJ
#define SinglePointViewController IGnvplJYDEmFhqxU #define SinglePointViewController hvnwUCRrIatAqRpn
#define MineViewController kqVKMEbqugiUawoj #define MineViewController GOuVtUHPhJyPwQsW
#define getSelectCompanyHttpCmd SgKFPpzdydLUjPOU #define getSelectCompanyHttpCmd JJcTOBGLIbzhTlHR
#define httpSelectCompanyHttpResultResponse mUlJflTXYqagNePQ #define httpSelectCompanyHttpResultResponse rUOLooOaYUjWXmsk
#define SelectCompanyViewController khxWqZKKqIHpURxk #define SelectCompanyViewController gPvuucSDIJOoHgKM
#define MineMoreViewController sTRqltAzlgmvjhgq #define MineMoreViewController kjqoNDBTFQZywRuE
#define WebSwiftViewController rvEIspGqItVybCDx #define WebSwiftViewController MxnRKJgQGtaydGkV
#define webView WVRFTZTDaDeRtalW #define webView gjHHJGPTuEBqhxNU
#define webViewUrl zoyHKmjmkWFeOWtm #define webViewUrl KaNOMcXdmpWPgMKo
#define appid qUrOHuIoxLbTGBzX #define appid LkHRBmekOltDesax
#define webActionTitle DSbbjPsYrbQjMIMS #define webActionTitle TYyfyZOYRwUxRlzz
#define setwebView PsydMdhAIelCjybV #define setwebView AlLrPGxUJKPSdOXN
#define backPrevious dRnNfwUwvoGJLwDp #define backPrevious OqmMOItxpmXibxmi
#define WebActionOC xoeUNjMlYbVPacBE #define WebActionOC UjhqilJmsqjRxvph
#define getUrl BMzMAZNkXPtsBPHk #define getUrl eKliLewtNzSVTkRI
#define getWebCookie BZHLAGxTYGHqkECu #define getWebCookie OqlqebxUSmyLvgdD
#define encryptAES xnKuAUIGeClqrHTM #define encryptAES aESAjZJrERHCMAbH
#define decryptAES uQuxPmiUVmVoZoKX #define decryptAES fhhDbJPKQreiuqnU
#define ChangePassWordViewController qSkKaftLQiWEAfqG #define ChangePassWordViewController hFdyOSjpoEbKyNXe
#define oldTextView EgLzHeJxUEAUSIDp #define oldTextView jwWCeLnBWWLpHvhq
#define newTextView SDaCcHsIQfXNRqat #define newTextView vqVZKSwwqrYMLaaF
#define confirmPassTextView GskTMMDVcqmuOfEH #define confirmPassTextView PqFwqRpolTczfChl
#define actionChangePassWord QauGRHuHLwEbBIdd #define actionChangePassWord qRDAfazYgamUfQvN
#define getChangePasswordHttpCmd VDSkAqgTORZYmncl #define getChangePasswordHttpCmd LCgAZtrKwNnHtyGO
#define httpChangePasswordHttpResultResponse dnqeDpjjeSjmBTUx #define httpChangePasswordHttpResultResponse yOXQmUyweZRVvhmO
#define getSinglePointPasswordHttpPostCmd FKIlggNDLLkvKkTN #define getSinglePointPasswordHttpPostCmd akjOvLgBiFRzrNCO
#define httpSinglePointPasswordHttpResultResponse LpMFxugDkKEyGCgA #define httpSinglePointPasswordHttpResultResponse XEoywcmSVlGHLaLS
#define loginTypeHttpGetCmdTypeAction ZwcRxtBBzwriFkYd #define loginTypeHttpGetCmdTypeAction SgaoQlHpgLizGnTe
#define MineMoreViewController NLgzALEuoZeTWndY #define MineMoreViewController DLbmBuuJRVVHeEFr
#define getMyApplicationListHttpCmd BUDtDvAWyIfuhdud #define getMyApplicationListHttpCmd MPWaHBgkJTTrSrNN
#define httpMyApplicationListHttpResultResponse zLKKnoOMEGSTbhxL #define httpMyApplicationListHttpResultResponse cHFpYqBkkmRhEDnj
#define getAllApplicationHttpListCmd uQBkvWISWVtWXuQy #define getAllApplicationHttpListCmd iTaisWHqlIiIoHFd
#define httpMoreApplicationsTwoHttpResultResponse NXQDDEPWlvCMspgR #define httpMoreApplicationsTwoHttpResultResponse BwGAUcHjTztbBlYH
#define changeBlockAction fnuqkEEJELDsNuwm #define changeBlockAction CYpbeWgjCjeQrijt
#define getHttpCollcetionViewModellArray yeEdLdkXxaQfnTXp #define getHttpCollcetionViewModellArray scdqxIQPTDQNQRbn
#define getHttpCollcetionViewModellTwoArray TXCugSbNldZofCak #define getHttpCollcetionViewModellTwoArray zeGUUafNxijaxMFo
#define getHttpMineMoreCollectionViewCellModel RLmVpiYFIXbrhCdf #define getHttpMineMoreCollectionViewCellModel lRGTILdRNCkwFFKV
#define getSaveApplicationsHttpCmd IOmxjncuoysewRjI #define getSaveApplicationsHttpCmd PeAGubSohhpfeBho
#define httpSaveApplicationListHttpResultResponse XqRuKIDlMLYdrhdj #define httpSaveApplicationListHttpResultResponse tNVWCPFJplpJIjYa
#define httpSelectCompanyHttpResultResponse OBTEruNMXJxrqFwV #define httpSelectCompanyHttpResultResponse XMHUuOYqnSRIduHv
#define gotoCompanyListVC wcaTjcuqCNywxfBQ #define gotoCompanyListVC BfeXiKqbFXYNiJKc
#define SelectCompanyViewController mQdUlsUOyVocHyiY #define SelectCompanyViewController wURGEabPznmSXaqr
#define actionCompanyHttpGCD KwUyvAOrymoqHhZc #define actionCompanyHttpGCD pMtHhztmSEsjWYDE
#define actiondepartmentHttpGCD YNTeqeNVzjYXWUDO #define actiondepartmentHttpGCD vrhLqlEXdXpyZZSS
#define myApplicationAction JHijHxYgtLMoumTx #define myApplicationAction aWGCJrvfMFIfNpdW
#define downloadOpenApp peBAABdfwftqZRhe #define downloadOpenApp BKfTIYZZTXXGHBUQ
#define oftenApplicationType ZrAdQcCxtwplBdgm #define oftenApplicationType BSwJgATEWGyVCpJO
#define HTHttpConfig kvRpqMWLoJamguRB #define HTHttpConfig qpptLNHbpHPSxgaa
#define kServiceAddressURL1 WjKDzacotyMMRWda #define kServiceAddressURL1 iKcbQjzLJArfjEnx
#define imageURL1 QgCviQrmferMzrJr #define imageURL1 ktsbhIAaknxUotVp
#define kServiceAddressURL GbOqylbDbbyzvjGk #define kServiceAddressURL RrBhrEpJoIreQVyY
#define imageURL kPunkaBAxKjySOhD #define imageURL fVXVZqEubmJHTgxP
#define kServiceAddressURL2 GJNjyNMpuPnnIjgY #define kServiceAddressURL2 rfCyNYrwTINpKcAZ
#define imageURL2 srNbKRGnjxddWhKZ #define imageURL2 GKTaocIXizXeIPsF
#define HomeViewController SkjeSxUNFquEntEG #define HomeViewController RMhhTsBTmCAsIwFq
#define actionHttpGCD mlcPQdgLDhjIFxsQ #define actionHttpGCD GbMHROZmvyhKyOqI
#define getHttpHomeClassListCmd dNSmJHSBxpmmfcDl #define getHttpHomeClassListCmd zcmhPLxJCDTGRdSO
#define httpHttpHomeClassListResultResponse BTgHsjASFbshpzcX #define httpHttpHomeClassListResultResponse VBNTkNhUVbpnpGkl
#define getUpcomingCountHttpPostCmd iBukMucozIrtKfoN #define getUpcomingCountHttpPostCmd PoFViNoiryeLrvCD
#define httpUpcomingCountHttpResultResponse oxRuqQXnhlzhBrko #define httpUpcomingCountHttpResultResponse iVEzGgpCvqIYTRCo
#define getMessageNunberShowHttpPostCmd VVRDzMSBpJpqNCQx #define getMessageNunberShowHttpPostCmd fyHsaczNWdmFHxES
#define httpMessageNumberShowHttpResultResponse hyKhyBIXwBricKgO #define httpMessageNumberShowHttpResultResponse wpDwreBzFhNwgwsm
#endif #endif
...@@ -20,7 +20,7 @@ class NotificationService: UNNotificationServiceExtension { ...@@ -20,7 +20,7 @@ class NotificationService: UNNotificationServiceExtension {
// c0eb5d604f19e9d58af5f8de 正式 // c0eb5d604f19e9d58af5f8de 正式
JPushNotificationExtensionService.jpushSetAppkey("444b4a4c86a09bd2e27367fe") JPushNotificationExtensionService.jpushSetAppkey("c0eb5d604f19e9d58af5f8de")
JPushNotificationExtensionService.jpushReceive(request) { JPushNotificationExtensionService.jpushReceive(request) {
print("apns upload success") print("apns upload success")
contentHandler(request.content) contentHandler(request.content)
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment