Commit 53c0eec2 authored by xiejb's avatar xiejb

适配新机型

parent 5fbded9f
...@@ -5282,7 +5282,7 @@ ...@@ -5282,7 +5282,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements; CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer: Jiangbo Xie (67SU32D76X)"; CODE_SIGN_IDENTITY = "Apple Development: Jiangbo Xie (67SU32D76X)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3.3; CURRENT_PROJECT_VERSION = 3.3;
DEVELOPMENT_TEAM = 2A3UC4VYB3; DEVELOPMENT_TEAM = 2A3UC4VYB3;
...@@ -5366,7 +5366,7 @@ ...@@ -5366,7 +5366,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test; PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test_dev5; PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test_dev7;
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;
...@@ -5383,7 +5383,7 @@ ...@@ -5383,7 +5383,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements; CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer: Jiangbo Xie (67SU32D76X)"; CODE_SIGN_IDENTITY = "Apple Development: Jiangbo Xie (67SU32D76X)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3.3; CURRENT_PROJECT_VERSION = 3.3;
DEVELOPMENT_TEAM = 2A3UC4VYB3; DEVELOPMENT_TEAM = 2A3UC4VYB3;
...@@ -5466,7 +5466,7 @@ ...@@ -5466,7 +5466,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test; PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test_dev5; PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test_dev7;
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;
...@@ -5571,7 +5571,7 @@ ...@@ -5571,7 +5571,7 @@
buildSettings = { buildSettings = {
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Jiangbo Xie (67SU32D76X)"; CODE_SIGN_IDENTITY = "Apple Development: Jiangbo Xie (67SU32D76X)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = 2A3UC4VYB3; DEVELOPMENT_TEAM = 2A3UC4VYB3;
INFOPLIST_FILE = ServiceExtension/Info.plist; INFOPLIST_FILE = ServiceExtension/Info.plist;
...@@ -5587,7 +5587,7 @@ ...@@ -5587,7 +5587,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test.ServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test.ServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test.ServiceExtension_dev_1; PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test.ServiceExtension_dev_2;
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";
...@@ -5601,7 +5601,7 @@ ...@@ -5601,7 +5601,7 @@
buildSettings = { buildSettings = {
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Jiangbo Xie (67SU32D76X)"; CODE_SIGN_IDENTITY = "Apple Development: Jiangbo Xie (67SU32D76X)";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = 2A3UC4VYB3; DEVELOPMENT_TEAM = 2A3UC4VYB3;
INFOPLIST_FILE = ServiceExtension/Info.plist; INFOPLIST_FILE = ServiceExtension/Info.plist;
...@@ -5617,7 +5617,7 @@ ...@@ -5617,7 +5617,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test.ServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.ekingwing.test.ServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test.ServiceExtension_dev_1; PROVISIONING_PROFILE_SPECIFIER = com.ekingwing.test.ServiceExtension_dev_2;
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;
......
...@@ -899,8 +899,8 @@ ...@@ -899,8 +899,8 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "21" startingLineNumber = "21"
endingLineNumber = "21" endingLineNumber = "21"
landmarkName = "juDeactivateEnableSinglePointData(array:)" landmarkName = "unknown"
landmarkType = "7"> landmarkType = "0">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
...@@ -1183,8 +1183,8 @@ ...@@ -1183,8 +1183,8 @@
filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift" filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "162" startingLineNumber = "163"
endingLineNumber = "162" endingLineNumber = "163"
landmarkName = "setwebView(strUrl:)" landmarkName = "setwebView(strUrl:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
...@@ -1199,8 +1199,8 @@ ...@@ -1199,8 +1199,8 @@
filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift" filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "197" startingLineNumber = "198"
endingLineNumber = "197" endingLineNumber = "198"
landmarkName = "setHTTPCookie(count:host:)" landmarkName = "setHTTPCookie(count:host:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
...@@ -1215,8 +1215,8 @@ ...@@ -1215,8 +1215,8 @@
filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift" filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "206" startingLineNumber = "207"
endingLineNumber = "206" endingLineNumber = "207"
landmarkName = "setHTTPCookie(count:host:)" landmarkName = "setHTTPCookie(count:host:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
...@@ -1231,8 +1231,8 @@ ...@@ -1231,8 +1231,8 @@
filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift" filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "159" startingLineNumber = "160"
endingLineNumber = "159" endingLineNumber = "160"
landmarkName = "setwebView(strUrl:)" landmarkName = "setwebView(strUrl:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
......
...@@ -41,12 +41,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate { ...@@ -41,12 +41,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate {
} }
// 199476 1234@qwer // 199476 1234@qwer
AccountInfo.sharedInstance().oldType = "2" AccountInfo.sharedInstance().oldType = "1"
AccountInfo.sharedInstance().UMS_messageJSON = "" AccountInfo.sharedInstance().UMS_messageJSON = ""
AccountInfo.sharedInstance().messageId = "" AccountInfo.sharedInstance().messageId = ""
AccountInfo.sharedInstance().UMS_messageType = "" AccountInfo.sharedInstance().UMS_messageType = ""
// AccountInfo.sharedInstance().UMS_messageDetaUrl = "https://employeedev.shaphar.com/mobile-portal/messagedetail/1174" // AccountInfo.sharedInstance().UMS_messageDetaUrl = "https://employeedev.shaphar.com/mobile-portal/messagedetail/1174"
AccountInfo.sharedInstance().UserId = "164629" // AccountInfo.sharedInstance().UserId = "199476"
// 网络框架 // 网络框架
ProjectConfigGroup.initHttpConfig() ProjectConfigGroup.initHttpConfig()
HTHttpConfig.sharedInstance().isout = false HTHttpConfig.sharedInstance().isout = false
......
...@@ -288,7 +288,7 @@ class BaseViewController: UIViewController,UIGestureRecognizerDelegate { ...@@ -288,7 +288,7 @@ class BaseViewController: UIViewController,UIGestureRecognizerDelegate {
// model.hurl = "https://mobileportal.shaphar.com:8443/SYERP/SYOrderLife/#/information" // model.hurl = "https://mobileportal.shaphar.com:8443/SYERP/SYOrderLife/#/information"
// httpDetailModel.hurl = "http://192.168.1.149:8080/#/upcoming" // httpDetailModel.hurl = "http://192.168.1.149:8080/#/upcoming"
} }
// model.hurl = "http://10.1.56.109:8080/#/todo" // model.hurl = "http://192.168.0.21:8081/#/login"
// model.hurl = "https://mobiletms.plovehj.com/#/entrustTransList" // model.hurl = "https://mobiletms.plovehj.com/#/entrustTransList"
var str = model.hurl var str = model.hurl
if model.applicationPlatformsType == .AndroidiOSType { if model.applicationPlatformsType == .AndroidiOSType {
......
...@@ -54,6 +54,10 @@ ...@@ -54,6 +54,10 @@
if ([platform isEqualToString:@"iPhone14,5"]) {return @"iPhone 13";} if ([platform isEqualToString:@"iPhone14,5"]) {return @"iPhone 13";}
if ([platform isEqualToString:@"iPhone14,2"]) {return @"iPhone 13 Pro";} if ([platform isEqualToString:@"iPhone14,2"]) {return @"iPhone 13 Pro";}
if ([platform isEqualToString:@"iPhone14,3"]) {return @"iPhone 13 Pro Max";} if ([platform isEqualToString:@"iPhone14,3"]) {return @"iPhone 13 Pro Max";}
if ([platform isEqualToString:@"iPhone14,7"]) {return @"iPhone 14";}
if ([platform isEqualToString:@"iPhone14,8"]) {return @"iPhone 14 Plus";}
if ([platform isEqualToString:@"iPhone15,2"]) {return @"iPhone 14 Pro";}
if ([platform isEqualToString:@"iPhone15,3"]) {return @"iPhone 14 Pro Max";}
return platform; return platform;
} }
@end @end
......
...@@ -273,10 +273,14 @@ ...@@ -273,10 +273,14 @@
NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding]; NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) { if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) {
// judgment by height when in simulators // judgment by height when in simulators
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) || 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)) ||
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"]; 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"];
return isIPhoneX; return isIPhoneX;
} }
......
...@@ -19,10 +19,14 @@ ...@@ -19,10 +19,14 @@
NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding]; NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) { if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) {
// judgment by height when in simulators // judgment by height when in simulators
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) || 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)) ||
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"]; 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"];;
return isIPhoneX; return isIPhoneX;
} }
......
...@@ -95,8 +95,20 @@ private let AccountInfo_UMS_messageJSON:String="AccountInfo_UMS_messageJSON" ...@@ -95,8 +95,20 @@ private let AccountInfo_UMS_messageJSON:String="AccountInfo_UMS_messageJSON"
private let AccountInfo_UnReadNumber:String="AccountInfo_UnReadNumber" private let AccountInfo_UnReadNumber:String="AccountInfo_UnReadNumber"
private let AccountInfo_webViewUrl:String="AccountInfo_webViewUrl"
@objcMembers class AccountInfo: NSObject { @objcMembers class AccountInfo: NSObject {
var webViewUrl:String?{
set{
let userData:UserDefaults=UserDefaults.standard
userData.set(newValue, forKey: AccountInfo_webViewUrl)
}
get{
let userData:UserDefaults=UserDefaults.standard
return userData.object(forKey: AccountInfo_webViewUrl) as? String
}
}
var UnReadNumber:String?{ var UnReadNumber:String?{
set{ set{
let userData:UserDefaults=UserDefaults.standard let userData:UserDefaults=UserDefaults.standard
......
...@@ -28,7 +28,13 @@ class CompanyListTableViewCell: BaseTableViewCell { ...@@ -28,7 +28,13 @@ class CompanyListTableViewCell: BaseTableViewCell {
override func configurateTheCell(_ xinfo: BaseCellModel) { override func configurateTheCell(_ xinfo: BaseCellModel) {
self.infoModel = xinfo as! CompanyListTableViewCellModel self.infoModel = xinfo as! CompanyListTableViewCellModel
valueLable.frame = CGRect(x:10, y: 5, width:self.width-15 , height:self.height-10 ) valueLable.frame = CGRect(x:10, y: 5, width:self.width-15 , height:self.height-10 )
self.valueLable.text = self.infoModel.titleValue self.valueLable.text = self.infoModel.titleValue!
// if (self.infoModel.titleValueSelecCompanyUserid != nil) {
// self.valueLable.text = self.infoModel.titleValueSelecCompanyUserid!
// } else {
// self.valueLable.text = self.infoModel.titleValue!
// }
self.valueLable.textColor = titleColor self.valueLable.textColor = titleColor
self.block = self.infoModel.block self.block = self.infoModel.block
if infoModel.titleValue == AccountInfo.sharedInstance().selecCompanyName && infoModel.selecCompanyUserid == AccountInfo.sharedInstance().sysUserId{ if infoModel.titleValue == AccountInfo.sharedInstance().selecCompanyName && infoModel.selecCompanyUserid == AccountInfo.sharedInstance().sysUserId{
...@@ -55,5 +61,5 @@ class CompanyListTableViewCellModel: BaseCellModel { ...@@ -55,5 +61,5 @@ class CompanyListTableViewCellModel: BaseCellModel {
var companyname:String? var companyname:String?
var companyid:String? var companyid:String?
var selecCompanyUserid:String? var selecCompanyUserid:String?
var titleValueSelecCompanyUserid:String?
} }
...@@ -58,6 +58,7 @@ extension SelectCompanyViewController { ...@@ -58,6 +58,7 @@ extension SelectCompanyViewController {
model.className = "CompanyListTableViewCell" model.className = "CompanyListTableViewCell"
model.titleValue = companyHttpModel.companyname model.titleValue = companyHttpModel.companyname
model.selecCompanyUserid = companyHttpModel.userid model.selecCompanyUserid = companyHttpModel.userid
model.titleValueSelecCompanyUserid = companyHttpModel.companyname! + "(" + companyHttpModel.userid! + ")"
model.isShowSelec = true model.isShowSelec = true
model.block = {[weak self] (value:Any) in model.block = {[weak self] (value:Any) in
self?.actionCompany(companyHttpModel: companyHttpModel) self?.actionCompany(companyHttpModel: companyHttpModel)
......
...@@ -79,7 +79,9 @@ class SetUpViewController: BaseViewController { ...@@ -79,7 +79,9 @@ class SetUpViewController: BaseViewController {
// self?.copyjuph_registrationID() // self?.copyjuph_registrationID()
// }, accessoryType: .disclosureIndicator) // }, accessoryType: .disclosureIndicator)
// self.getMineInfoTableViewCellModel(imageName: "email_image", title: judgmentStrNil(str: AccountInfo.sharedInstance().webViewUrl), name: "网页链接", block: {[weak self] in
// self?.webViewUrl()
// }, accessoryType: .disclosureIndicator)
self.getMineInfoTableViewCellModel(imageName: "email_image", title: self.getVersionString(), name: "版本信息", block: {[weak self] in self.getMineInfoTableViewCellModel(imageName: "email_image", title: self.getVersionString(), name: "版本信息", block: {[weak self] in
// self?.gotoWei() // self?.gotoWei()
...@@ -109,6 +111,12 @@ class SetUpViewController: BaseViewController { ...@@ -109,6 +111,12 @@ class SetUpViewController: BaseViewController {
SMToastView.showMessage("内容已复制!") SMToastView.showMessage("内容已复制!")
// self.gotoMessageVC() // self.gotoMessageVC()
} }
/// 复制设备ID
func webViewUrl(){
let pasteboard = UIPasteboard.general
pasteboard.string = AccountInfo.sharedInstance().webViewUrl
SMToastView.showMessage("内容已复制!")
}
/// 获取版本号 /// 获取版本号
func getVersionString() -> String { func getVersionString() -> String {
let infoDictionary = Bundle.main.infoDictionary! let infoDictionary = Bundle.main.infoDictionary!
......
...@@ -133,6 +133,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -133,6 +133,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
} }
//webView的加载 //webView的加载
func setwebView(strUrl:String){ func setwebView(strUrl:String){
AccountInfo.sharedInstance().webViewUrl = self.webViewUrl
var count = self.getWebCookie(urlStr: self.webViewUrl) var count = self.getWebCookie(urlStr: self.webViewUrl)
if self.isUMSMessageType == .IsUMSMessageType { if self.isUMSMessageType == .IsUMSMessageType {
count = self.encryptionContent count = self.encryptionContent
......
#ifndef Demo_codeObfuscation_h #ifndef Demo_codeObfuscation_h
#define Demo_codeObfuscation_h #define Demo_codeObfuscation_h
//confuse string at 2022年 7月 8日 星期五 14时50分49秒 CST //confuse string at 2022年11月23日 星期三 17时52分36秒 CST
#define BaseViewController qpdVXKmcQfZNjWXK #define BaseViewController toZgJmVyDNTTFsXp
#define myTableView YsmyRJjTWbbiwVad #define myTableView jQbmbkltDRUHeKYJ
#define setCacheAccountInfo GKVyTOzktgaGypeg #define setCacheAccountInfo IDVQDGltxhxiZnIa
#define setClassWebUrlAccountInfo RNlzCBPkvDCWdVjS #define setClassWebUrlAccountInfo AhySgSJzGIOvIqQw
#define setWebUrlAction yfsmqutFevmacRcC #define setWebUrlAction ojbabAmVVqUYDrLN
#define SinglePointWeChatVC zlHOpivarErQfIgV #define SinglePointWeChatVC IXRSKHmFVNzRYZkK
#define onLogin SqGSpUVycGaWjLOk #define onLogin IsIXEyqemuecmwIq
#define getLoginTypeHttpAction XCUCbxSYymWqwfWv #define getLoginTypeHttpAction xofvgfrtZeIDFtyX
#define loginTypeHttpGetCmdTypeAction shHQNkeuoSIyapkJ #define loginTypeHttpGetCmdTypeAction OBjijkZqjRXDsOeZ
#define getScopeListHttpCmd XDjGKlwvhwnUxSfZ #define getScopeListHttpCmd InrddUMJlxWHmHGO
#define selectSinglePointTypeAction KkcwVJxsYxEbTOSr #define selectSinglePointTypeAction kwyKCDESNUhcNRvv
#define getLoginHttpPostCmdCmd WOdzgUbTBTQdmKve #define getLoginHttpPostCmdCmd QNgqzTKalWiFWGEP
#define httpLoginHttpPostResultResponse PxhgbqqhAqXRtwBX #define httpLoginHttpPostResultResponse nHAQLqkNijmvJHhK
#define getNewVersionUpdateHttpCmd rtxttDHoiBMkrOdA #define getNewVersionUpdateHttpCmd aGSZYogUmNEdRbHI
#define getLoginDeviceInformationHttpCmd BXxEFRLZtrxEbIHl #define getLoginDeviceInformationHttpCmd bLhTbLfOlosbOeyi
#define getMyInformationHttpGetCmd xjklIrwhJMIvhjKL #define getMyInformationHttpGetCmd FnqCUpwCkiFeSjfJ
#define getVerifyTokenHttpPostCmdAction KUbwgqQMsBhNouaS #define getVerifyTokenHttpPostCmdAction drJYQEtDlNPIqAQO
#define httpVerifyTokenHttpResultResponse QQyjhRRsWVMIgKMT #define httpVerifyTokenHttpResultResponse lvlLgoOKdzRMIqkX
#define loginGetUserInfo zeJwVxQsCpsVWmRa #define loginGetUserInfo VufSJgiNtmrJPImu
#define httpSinglePointinfoHttpResultResponse wNszFIlOFWLQCTpr #define httpSinglePointinfoHttpResultResponse RpLntCFzusmTQoll
#define getWeChatXinfoHttpPostCmd uqGMynIPbGxgEVEO #define getWeChatXinfoHttpPostCmd WURXNWfKVaPcumoG
#define getWeChatBindingHttpPostCmd HlyckobFEdbsLFWQ #define getWeChatBindingHttpPostCmd UoUlvXxUJshRMLhb
#define httpWeChatXinfoHttpResultResponse OtOqohZokCWwXpIv #define httpWeChatXinfoHttpResultResponse iksKcrnysSmOSrHX
#define SinglePointWeChatHttp GrLVvURACcDPNzYe #define SinglePointWeChatHttp blazZKATgvBKjJiS
#define judgmentTokenExpired(resultBlock:@escaping suQEazAXuvUuETgz #define judgmentTokenExpired(resultBlock:@escaping ZwvCedeUSEDEVolm
#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping KGhLsUxMmJXxjPRf #define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping tQANluWCLLXmOQqD
#define getRefreshTokenHttpPostCmd(resultBlock:@escaping RkGCjjQPxCHNFMrV #define getRefreshTokenHttpPostCmd(resultBlock:@escaping gRxzIfjJnQcEwSMT
#define func ZpJhEqFPyuRjxiOd #define func lpQvEwsSyEUqyHfm
#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping VeGGnsrbOTqEkfPJ #define getLoginDeviceInformationHttpCmd(resultBlock:@escaping caxwQRzutpmZCJGr
#define httpDeviceInformationHttpResultResponse(result: TutGrVYjhXeVIwQh #define httpDeviceInformationHttpResultResponse(result: IbBJbJeEVvtGGyME
#define LoginViewController BWEtvLFLNkhPOOGH #define LoginViewController nEhOIoKXXeEiIpKw
#define WeChatBindingViewController SlSTtNyDspRrYdtP #define WeChatBindingViewController sCKEWKSjLlapVYDq
#define SinglePointViewController bHrtYNikdfGHvKVs #define SinglePointViewController TbakufGniEEkRrWZ
#define MineViewController vVuBnrCIzhlvvgOP #define MineViewController zBuhbtgMqMNKpbRn
#define getSelectCompanyHttpCmd ETVbNvsHSeIeUjRo #define getSelectCompanyHttpCmd jeYaZRrSOdbbvdlF
#define httpSelectCompanyHttpResultResponse frArcgFebjVdZQGJ #define httpSelectCompanyHttpResultResponse IiHYqGvcNUAVujhu
#define SelectCompanyViewController McPxePdjTdNFQVJQ #define SelectCompanyViewController lBFYMVVhttUiiEDz
#define MineMoreViewController pHwplXMRwGHViDUp #define MineMoreViewController dPfLxoHnSTqgqkkp
#define WebSwiftViewController dzfyDMtoYVTjYPkF #define WebSwiftViewController nMZRysOPiNtvZRYt
#define webView ueTzFdVBchwCLLli #define webView TVqczkWMdayXydDY
#define webViewUrl OHwSAdRpQgqpLaYj #define webViewUrl qnFGTLGXPdOaInBE
#define appid AOGDnnRpfSlcXxeD #define appid CWsOrEaaLRLMMnmY
#define webActionTitle tFfXIgnMumHhzVtP #define webActionTitle UoLzjyjlQwdIPeMU
#define setwebView pFTZoNLUMDpxNlSZ #define setwebView qOAHdZLkXNjuBqWC
#define backPrevious vmAtlqPQRuRRXIuQ #define backPrevious jYjtUTiRbkmPFjbT
#define WebActionOC dnLDBdWkgscFboSY #define WebActionOC CdXwEgepHpNsfXMt
#define getUrl MjGIgIYoIATwLFUS #define getUrl ZiYxIXHKKhMbUmWo
#define getWebCookie jYtbboSdQCAsdsFg #define getWebCookie ePEHEtQhOrwFRRVk
#define encryptAES QlFErHDyfVTPDxFd #define encryptAES kvQSTnoguvMZWteD
#define decryptAES SiBAtujTluZewgoE #define decryptAES IRvaGAWfEkHfZiGL
#define ChangePassWordViewController GvhqJCRCBXguTlqt #define ChangePassWordViewController JJzTOutHZuwsFUuw
#define oldTextView kRizJHzfvyOGmjqV #define oldTextView PzvCMblCYcjLPzwM
#define newTextView szvkdRYesUttcwML #define newTextView LtxSxAkktDAagwIC
#define confirmPassTextView ENARBPkEQTbsDdws #define confirmPassTextView ppmaWqqZtWUEgASm
#define actionChangePassWord bendwluAxwNpcqzB #define actionChangePassWord qZDEmqLuVsyxsZSd
#define getChangePasswordHttpCmd HfKHetTjmRFoIRHl #define getChangePasswordHttpCmd BcfinWLyVeFgILju
#define httpChangePasswordHttpResultResponse kkZgfWEhncwNdlIc #define httpChangePasswordHttpResultResponse cSOidozjWtduHWQL
#define getSinglePointPasswordHttpPostCmd gwooByHcVNIvivUZ #define getSinglePointPasswordHttpPostCmd QIBMfbBNETcwQiYW
#define httpSinglePointPasswordHttpResultResponse XNWXTbYhDjckhlLV #define httpSinglePointPasswordHttpResultResponse CBTjDnvtXwQpcNuY
#define loginTypeHttpGetCmdTypeAction PcjtIdXQGOWvOqIl #define loginTypeHttpGetCmdTypeAction vDChtrIsucmRPCCt
#define MineMoreViewController ufyeDMcsMFISGtbH #define MineMoreViewController ewZGAOQWIFQktyUm
#define getMyApplicationListHttpCmd SKKOXsUDdKdspkgf #define getMyApplicationListHttpCmd SGEGPLfwcdauKtAs
#define httpMyApplicationListHttpResultResponse QqOJYgLXfyfveRVG #define httpMyApplicationListHttpResultResponse kOAotDHdJkdPvdZQ
#define getAllApplicationHttpListCmd IBrRCQUQeSRHSsmH #define getAllApplicationHttpListCmd XBJpHIKArbUifMCB
#define httpMoreApplicationsTwoHttpResultResponse SwJCcIlXFpBNXLvA #define httpMoreApplicationsTwoHttpResultResponse wqklhbQMuDVmAneg
#define changeBlockAction LsGEOcWkfrxcoUHL #define changeBlockAction LdypxMQUjSEhTSMj
#define getHttpCollcetionViewModellArray JJhLMeRGxmLjdhqC #define getHttpCollcetionViewModellArray hOhYtOdFVcZdDbSR
#define getHttpCollcetionViewModellTwoArray BWVtulgmDwODKkGL #define getHttpCollcetionViewModellTwoArray NrjCxsKHxXhSGndk
#define getHttpMineMoreCollectionViewCellModel uYsXhSKcNGwtnLPt #define getHttpMineMoreCollectionViewCellModel MrzMTHwlRPufIVpI
#define getSaveApplicationsHttpCmd KGhZSZQCfbPQAMHq #define getSaveApplicationsHttpCmd UfSyDGDXNFRbdqMb
#define httpSaveApplicationListHttpResultResponse vxNEMuJAUGjtfdvi #define httpSaveApplicationListHttpResultResponse FzLxKqlAlmbuTAqq
#define httpSelectCompanyHttpResultResponse nmkhrEGPkzcWdvhg #define httpSelectCompanyHttpResultResponse DBsccnVWZKmvmRnJ
#define gotoCompanyListVC MRlDFieyHZTyddKi #define gotoCompanyListVC HXRvJcABQpBFKaOV
#define SelectCompanyViewController vPrkXcGQEStsCJJz #define SelectCompanyViewController advMEwpySJFENBeE
#define actionCompanyHttpGCD aJWibegmHdgVGAhr #define actionCompanyHttpGCD EmLYKoTkCKJsuewq
#define actiondepartmentHttpGCD TuGCpCTBMphikkEs #define actiondepartmentHttpGCD qMHqojAxJlFOvYtY
#define myApplicationAction VZEZoMCPggGNvUNB #define myApplicationAction XkxlJqbruicEqxWU
#define downloadOpenApp oQsHQclFLRSjpXOn #define downloadOpenApp uXmdxffDdPdEDzOs
#define oftenApplicationType MHrbDaHDnqmADHzd #define oftenApplicationType pjtIKsZNikdhZCNb
#define HTHttpConfig ktTYsPRcHFKHKiDU #define HTHttpConfig NMKclOxvtnSfCMIe
#define kServiceAddressURL1 BjSlvzZiQUpaGvFX #define kServiceAddressURL1 FgUqSEkDZatGWQBY
#define imageURL1 YgnDOzZDBkcrwPhT #define imageURL1 TLCWOROaVtlIXoCM
#define kServiceAddressURL phHQWSJczPcqMjvq #define kServiceAddressURL BMIoymQJTUOjufDi
#define imageURL ISmrjVnWIqJYvdnN #define imageURL IArgJOvOxdanqwoF
#define kServiceAddressURL2 MiKrzCXjQDrxlmld #define kServiceAddressURL2 wpIOaKMEHGrWTRbp
#define imageURL2 cznSvOvpClKXffJf #define imageURL2 KZhvjIhskpiFKMNN
#define HomeViewController mEFYOSnLjIuHlBZG #define HomeViewController PZtKYoOOjIQLVpvH
#define actionHttpGCD lUMDiKyazGQZGIFg #define actionHttpGCD ZhfgiUaUVRrrojuo
#define getHttpHomeClassListCmd fetMjsFtKkoHDCBa #define getHttpHomeClassListCmd rNDxgibPMMRRcmAd
#define httpHttpHomeClassListResultResponse QzxNVBfsTViWWZaf #define httpHttpHomeClassListResultResponse lgkxJVzcLkoCpyFZ
#define getUpcomingCountHttpPostCmd DwxFzxwtsRJBdFHE #define getUpcomingCountHttpPostCmd IXaIMrLUobyJssTo
#define httpUpcomingCountHttpResultResponse PfOEelIzsgkKKqyX #define httpUpcomingCountHttpResultResponse ffveoBrLxcNSFXvN
#define getMessageNunberShowHttpPostCmd sodPIBLoQKHSIiOm #define getMessageNunberShowHttpPostCmd uasDlypFzbNrVwEU
#define httpMessageNumberShowHttpResultResponse OsjiFrieXjrvHDwO #define httpMessageNumberShowHttpResultResponse sPyMQFQWfetQPZmj
#endif #endif
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