Commit 1c5ec1a8 authored by xiejb's avatar xiejb

添加AI资讯页面

parent 42e62770
...@@ -5296,7 +5296,7 @@ ...@@ -5296,7 +5296,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.4; CURRENT_PROJECT_VERSION = 2.4;
DEVELOPMENT_TEAM = 7FYU37G7W6; DEVELOPMENT_TEAM = 7FYU37G7W6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5315,7 +5315,7 @@ ...@@ -5315,7 +5315,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.4; MARKETING_VERSION = 2.4;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
...@@ -5396,7 +5396,7 @@ ...@@ -5396,7 +5396,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.4; CURRENT_PROJECT_VERSION = 2.4;
DEVELOPMENT_TEAM = 7FYU37G7W6; DEVELOPMENT_TEAM = 7FYU37G7W6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -5415,7 +5415,7 @@ ...@@ -5415,7 +5415,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.4; MARKETING_VERSION = 2.4;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
......
...@@ -440,8 +440,8 @@ ...@@ -440,8 +440,8 @@
timestampString = "651493562.330161" timestampString = "651493562.330161"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "345" startingLineNumber = "387"
endingLineNumber = "345" endingLineNumber = "387"
landmarkName = "addCellModel(array:)" landmarkName = "addCellModel(array:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
...@@ -769,7 +769,7 @@ ...@@ -769,7 +769,7 @@
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8624" uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8981"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
...@@ -779,12 +779,12 @@ ...@@ -779,12 +779,12 @@
urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift" urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "143" startingLineNumber = "146"
endingLineNumber = "143" endingLineNumber = "146"
offsetFromSymbolStart = "522"> offsetFromSymbolStart = "522">
</Location> </Location>
<Location <Location
uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - 4475a31735ebbaf7" uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - 4475a31735ebb552"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
...@@ -794,8 +794,8 @@ ...@@ -794,8 +794,8 @@
urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift" urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "143" startingLineNumber = "146"
endingLineNumber = "143" endingLineNumber = "146"
offsetFromSymbolStart = "45"> offsetFromSymbolStart = "45">
</Location> </Location>
</Locations> </Locations>
...@@ -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 = "199" startingLineNumber = "230"
endingLineNumber = "199" endingLineNumber = "230"
landmarkName = "setHTTPCookie(count:host:)" landmarkName = "setHTTPCookie(count:host:)"
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 = "208" startingLineNumber = "239"
endingLineNumber = "208" endingLineNumber = "239"
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 = "161" startingLineNumber = "192"
endingLineNumber = "161" endingLineNumber = "192"
landmarkName = "setwebView(strUrl:)" landmarkName = "setwebView(strUrl:)"
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
...@@ -1307,8 +1307,8 @@ ...@@ -1307,8 +1307,8 @@
filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift" filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "174" startingLineNumber = "205"
endingLineNumber = "174" endingLineNumber = "205"
landmarkName = "setwebView(strUrl:)" landmarkName = "setwebView(strUrl:)"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
...@@ -1323,8 +1323,8 @@ ...@@ -1323,8 +1323,8 @@
filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift" filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "132" startingLineNumber = "156"
endingLineNumber = "132" endingLineNumber = "156"
landmarkName = "setStatusBarBackgroundColor()" landmarkName = "setStatusBarBackgroundColor()"
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
......
...@@ -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 {
...@@ -52,6 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate { ...@@ -52,6 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate {
AccountInfo.sharedInstance().CustomerServicePower = "" AccountInfo.sharedInstance().CustomerServicePower = ""
// 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 = "199476" // AccountInfo.sharedInstance().UserId = "199476"
// AccountInfo.sharedInstance().singlePoint_access_token = "1"
// 网络框架 // 网络框架
ProjectConfigGroup.initHttpConfig() ProjectConfigGroup.initHttpConfig()
HTHttpConfig.sharedInstance().isout = false HTHttpConfig.sharedInstance().isout = false
......
{ {
"info" : { "info" : {
"version" : 1, "author" : "xcode",
"author" : "xcode" "version" : 1
} }
} }
{
"images" : [
{
"filename" : "lv@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "lv@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "lv@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"filename" : "lan@1X.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "lan@2X.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "lan@3X.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
...@@ -99,8 +99,21 @@ private let AccountInfo_webViewUrl:String="AccountInfo_webViewUrl" ...@@ -99,8 +99,21 @@ private let AccountInfo_webViewUrl:String="AccountInfo_webViewUrl"
private let AccountInfo_CustomerServicePower:String="AccountInfo_CustomerServicePower" private let AccountInfo_CustomerServicePower:String="AccountInfo_CustomerServicePower"
private let Advisory_Url:String="AdvisoryUrl"
@objcMembers class AccountInfo: NSObject { @objcMembers class AccountInfo: NSObject {
var AdvisoryUrl:String?{
set{
let userData:UserDefaults=UserDefaults.standard
userData.set(newValue, forKey: Advisory_Url)
}
get{
let userData:UserDefaults=UserDefaults.standard
return userData.object(forKey: Advisory_Url) as? String
}
}
var CustomerServicePower:String?{ var CustomerServicePower:String?{
set{ set{
let userData:UserDefaults=UserDefaults.standard let userData:UserDefaults=UserDefaults.standard
......
...@@ -73,6 +73,48 @@ extension HomeViewController { ...@@ -73,6 +73,48 @@ extension HomeViewController {
} }
self.hidenHintView() self.hidenHintView()
} }
//MARK:获取对应资讯服务
func getApplicationByBelongAction2(applicationName:String) {
// showHintView()
let cmd:HttpCommand = ApplicationByBelongHttpGetCmd.init(version: PHttpVersion_v1)
let block:httpBlock = {[weak self] (result:RequestResult!,useInfo:Any!)->() in
if result != nil {
self?.httpApplicationByBelongHttpResultResponse2(result: result)
}else{
print("空的")
}
}
let dic:NSMutableDictionary = NSMutableDictionary()
dic[kHttpApplicationByBelongHttpGetCmd_applicationName] = applicationName
cmd.requestInfo = dic as [NSObject:AnyObject]
let completeDelegate = SMBaseHttpComplete.init(block: block , withUserInfo: nil)
cmd.requestInfo = dic as? [AnyHashable : Any]
cmd.completeDelegate=completeDelegate
print("url==%@",cmd.getUrl())
cmd.execute()
}
@objc func httpApplicationByBelongHttpResultResponse2(result:RequestResult){
let r:ApplicationByBelongHttpResult = result as! ApplicationByBelongHttpResult
if r.isOk() {
let array:NSMutableArray = r.getApplicationByBelongHttpResult()
if array.count != 0{
let httpDetailModel:ApplicationHttpListModel = array[0] as! ApplicationHttpListModel
self.selectGotoAutonomous2(model: httpDetailModel)
}
}else{
SMToastView.showMessage("请查看当前网络状态!")
}
// self.hidenHintView()
}
func selectGotoAutonomous2(model:ApplicationHttpListModel) {
var strUrl = model.hurl!
if (strUrl.contains("?")) {
strUrl = strUrl + "&userId="
} else {
strUrl = strUrl + "?userId="
}
AccountInfo.sharedInstance().AdvisoryUrl = strUrl + judgmentStrNil(str: AccountInfo.sharedInstance().UserId) + "&userCompany=" + judgmentStrNil(str: AccountInfo.sharedInstance().infoCompanyName) + "&userName=" + judgmentStrNil(str: AccountInfo.sharedInstance().userName) + "&IDMToken="+judgmentStrNil(str: AccountInfo.sharedInstance( ).singlePoint_access_token) + "&loginType="+judgmentStrNil(str: AccountInfo.sharedInstance().loginType) + "&clientId=" + md5(strs: judgmentStrNil(str: AccountInfo.sharedInstance().UserId))
}
//MARK:获取消息详情 //MARK:获取消息详情
func getApplicationDetailsHttpActin(applicationName:String) { func getApplicationDetailsHttpActin(applicationName:String) {
showHintView() showHintView()
......
...@@ -122,6 +122,7 @@ class HomeViewController: BaseViewController,UIPopoverPresentationControllerDele ...@@ -122,6 +122,7 @@ class HomeViewController: BaseViewController,UIPopoverPresentationControllerDele
addInitTableView() addInitTableView()
addHeaderFooter() addHeaderFooter()
actionHttpGCD() actionHttpGCD()
getApplicationByBelongAction2(applicationName: "Real_Time_Info")
CustomerServicePowerHttpPostCmdAction() CustomerServicePowerHttpPostCmdAction()
// setStatusBarBackgroundColor() // setStatusBarBackgroundColor()
// self.title = "首页" // self.title = "首页"
......
...@@ -29,7 +29,7 @@ class MyTabbar: UITabBar { ...@@ -29,7 +29,7 @@ class MyTabbar: UITabBar {
}() }()
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
self.addSubview(myTabbarImageView) //self.addSubview(myTabbarImageView)
self.addSubview(publishBtn) self.addSubview(publishBtn)
NotificationCenter.default.addObserver(self, selector: #selector(publishBtnEetNum), name: NSNotification.Name(rawValue: "publishBtnEetNum"), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(publishBtnEetNum), name: NSNotification.Name(rawValue: "publishBtnEetNum"), object: nil)
} }
......
...@@ -76,8 +76,9 @@ class RootTabBarViewController: UITabBarController,UITabBarControllerDelegate { ...@@ -76,8 +76,9 @@ class RootTabBarViewController: UITabBarController,UITabBarControllerDelegate {
vc.isTabBarVC = IsTabBarVC.isTabBarVC vc.isTabBarVC = IsTabBarVC.isTabBarVC
vc.isEncryptionType = IsEncryptionType.NoEncryptionType vc.isEncryptionType = IsEncryptionType.NoEncryptionType
vc.isHomePushType = IsHomePushType.NOIsHomePushType vc.isHomePushType = IsHomePushType.NOIsHomePushType
vc.webViewUrl = "http://222.66.127.246:8021/syqxerp/#/doneList?userId=199476&sysUserId=135965" vc.webViewUrl = "https://www.baidu.com"
return self.getNavigationWithVc(vc: vc, title: "资讯", img1: "tabbar_two_nor", selectImg:"tabbar_two_select") // return self.getNavigationWithVc(vc: vc, title: "资讯", img1: "tabbar_two_nor", selectImg:"tabbar_two_select")
return self.getNavigationWithVc(vc: vc, title: "", img1: "ai_nor_image", selectImg:"ai_select_image")
} }
func gainService()->UINavigationController{ func gainService()->UINavigationController{
// let vc:ServiceViewController=ServiceViewController() // let vc:ServiceViewController=ServiceViewController()
......
...@@ -32,7 +32,9 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -32,7 +32,9 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
// var hmsCustomScanViewController = HmsCustomScanViewController() // var hmsCustomScanViewController = HmsCustomScanViewController()
var documentController = UIDocumentInteractionController() var documentController = UIDocumentInteractionController()
var companyListModelArray = NSMutableArray()
var departmentListModelArray = NSMutableArray()
var selecClassModel:ApplicationHttpListModel!
///js调用原生方法名 ///js调用原生方法名
var webActionTitle = ["AppLogout","callPhone","sendSms","openScanActivity","getTitle","hideTitleLayout","copyContent","gotoLogin","openWeb","openFileDownload","openScan","getCookie","openDefaultWeb","openFileDownloadZIP"] var webActionTitle = ["AppLogout","callPhone","sendSms","openScanActivity","getTitle","hideTitleLayout","copyContent","gotoLogin","openWeb","openFileDownload","openScan","getCookie","openDefaultWeb","openFileDownloadZIP"]
lazy var webView: WKWebView = { lazy var webView: WKWebView = {
...@@ -95,6 +97,10 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -95,6 +97,10 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
self.navigationController?.setNavigationBarHidden(true, animated: true)
setNeedsStatusBarAppearanceUpdate()
}
// WebActionOC.share()?.setNSURLProtocolCustom() // WebActionOC.share()?.setNSURLProtocolCustom()
} }
...@@ -106,7 +112,12 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -106,7 +112,12 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
if self.isShowTitleType == .NoShowTitleType { if self.isShowTitleType == .NoShowTitleType {
self.navigationController?.setNavigationBarHidden(true, animated: true) self.navigationController?.setNavigationBarHidden(true, animated: true)
setNeedsStatusBarAppearanceUpdate() setNeedsStatusBarAppearanceUpdate()
webView.frame = CGRect(x:0, y: getStatusBarH(), width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()-getStatusBarH()-HEIGHT_BOTTOM_MARGIN() ) if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
webView.frame = CGRect(x:0, y: 0, width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()-getTabBarH() + 5 )
webView.scrollView.contentInset = UIEdgeInsetsMake(-getStatusBarH()-6, 0, 0, 0)
} else {
webView.frame = CGRect(x:0, y: getStatusBarH(), width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()-getStatusBarH() )
}
// setStatusBarBackgroundColor() // setStatusBarBackgroundColor()
}else{ }else{
self.navigationController?.setNavigationBarHidden(false, animated: true) self.navigationController?.setNavigationBarHidden(false, animated: true)
...@@ -125,8 +136,21 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -125,8 +136,21 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
if self.isEncryptionType == .YesEncryptionType { if self.isEncryptionType == .YesEncryptionType {
// self.webViewUrl = getWebCookieUrl(urlStr: self.webViewUrl) // self.webViewUrl = getWebCookieUrl(urlStr: self.webViewUrl)
} }
if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
webViewUrl = AccountInfo.sharedInstance().AdvisoryUrl
}
self.setwebView(strUrl: webViewUrl!) self.setwebView(strUrl: webViewUrl!)
} }
override func gotoIntelligentCustomerService(){
self.getApplicationByBelongAction(applicationName: "IT_ROBOT")
}
func getTabBarH() -> CGFloat {
if (self.isTabBarVC == IsTabBarVC.noIsTabBarVC) {
return 0
}
return HEIGHT_TAB_BAR()+HEIGHT_BOTTOM_MARGIN()
}
override func setStatusBarBackgroundColor(){ override func setStatusBarBackgroundColor(){
let stateView:UIView = UIView.init(frame: CGRect(x:0, y: 0, width:SCREEN_WHIDTH() , height:getStatusBarH() )) let stateView:UIView = UIView.init(frame: CGRect(x:0, y: 0, width:SCREEN_WHIDTH() , height:getStatusBarH() ))
stateView.backgroundColor = statusBarColor stateView.backgroundColor = statusBarColor
...@@ -134,6 +158,13 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -134,6 +158,13 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
} }
//webView的加载 //webView的加载
func setwebView(strUrl:String){ func setwebView(strUrl:String){
// 定义要清除的所有数据类型
let websiteDataTypes = WKWebsiteDataStore.allWebsiteDataTypes()
// 清除所有数据
WKWebsiteDataStore.default().removeData(ofTypes: websiteDataTypes, modifiedSince: NSDate(timeIntervalSince1970: 0) as Date, completionHandler: {
// 清除完成后的回调
print("所有网站数据已清除")
})
AccountInfo.sharedInstance().webViewUrl = self.webViewUrl 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 {
...@@ -156,7 +187,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -156,7 +187,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
} }
let urlRequest:NSMutableURLRequest = NSMutableURLRequest.init(url: url2 as URL) let urlRequest:NSMutableURLRequest = NSMutableURLRequest.init(url: url2 as URL)
if self.appid == nil || (self.appid != "uh5uTvFBTAbKXDsq" && self.appid != "ZPeuHeJgPWNRhyQs" && self.appid != "ZYv36b9FG2YG3Eu0" && self.appid != "wlXo64TRm3l5GRgU" && self.appid != "OwRfV3D27BR9DXTo" && self.appid != "doCc2vJt04HR5jUP"){ if self.appid == nil || (self.appid != "uh5uTvFBTAbKXDsq" && self.appid != "ZPeuHeJgPWNRhyQs" && self.appid != "ZYv36b9FG2YG3Eu0" && self.appid != "wlXo64TRm3l5GRgU" && self.appid != "OwRfV3D27BR9DXTo" && self.appid != "doCc2vJt04HR5jUP" && self.appid != "dFkQ8AFyDsc2BJMx" && self.appid != "m9CXAtoJSDltVE2t" && self.appid != "VQPlWK3vl9YuA285" && self.appid != "y0aAm0niob8J7Awp"){
// doCc2vJt04HR5jUP // doCc2vJt04HR5jUP
urlRequest.setValue(WebActionOC.share()?.getCookieValue((WebActionOC.share()?.encryptAES(count, key: self.appid))!, host: host) as String?, forHTTPHeaderField: "Cookie") urlRequest.setValue(WebActionOC.share()?.getCookieValue((WebActionOC.share()?.encryptAES(count, key: self.appid))!, host: host) as String?, forHTTPHeaderField: "Cookie")
print("----urlRequest") print("----urlRequest")
...@@ -253,6 +284,9 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -253,6 +284,9 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
@objc func backPrevious(){ @objc func backPrevious(){
if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
return
}
if #available(iOS 11.0, *){ if #available(iOS 11.0, *){
let cookieStore = webView.configuration.websiteDataStore.httpCookieStore let cookieStore = webView.configuration.websiteDataStore.httpCookieStore
cookieStore.getAllCookies { (cookie) in cookieStore.getAllCookies { (cookie) in
...@@ -269,14 +303,12 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega ...@@ -269,14 +303,12 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
} }
} }
} else { }
if let cookiesList = HTTPCookieStorage.shared.cookies { if let cookiesList = HTTPCookieStorage.shared.cookies {
for item in cookiesList { for item in cookiesList {
HTTPCookieStorage.shared.deleteCookie(item) HTTPCookieStorage.shared.deleteCookie(item)
} }
} }
}
SuspensionView.share().getsuspensionBtn()?.isHidden = false SuspensionView.share().getsuspensionBtn()?.isHidden = false
BDVoiceWakeUp.share().startWakeup() BDVoiceWakeUp.share().startWakeup()
// webView.removeObserver(self, forKeyPath: "estimatedProgress", context: nil) // webView.removeObserver(self, forKeyPath: "estimatedProgress", context: nil)
......
#ifndef Demo_codeObfuscation_h #ifndef Demo_codeObfuscation_h
#define Demo_codeObfuscation_h #define Demo_codeObfuscation_h
//confuse string at Thu Mar 6 15:16:54 CST 2025 //confuse string at Thu Apr 3 17:07:24 CST 2025
#define BaseViewController vzcdeNdiBypvXBBF #define BaseViewController HnsTaRMNHztQGXlp
#define myTableView MEovhrrFLVhBsLcM #define myTableView hCjdliSlOPWnYuNR
#define setCacheAccountInfo keAiCvvqqhLbmElZ #define setCacheAccountInfo lNyQpnBmkNhCkZqW
#define setClassWebUrlAccountInfo MSAiSFBjwKnAwLbD #define setClassWebUrlAccountInfo JylufpizgNOntnFP
#define setWebUrlAction JfBJeAKcvRccAExn #define setWebUrlAction uEANVuStmhYSvpPj
#define SinglePointWeChatVC LpTkxxlmPmJVLMsb #define SinglePointWeChatVC vwOXgsHUYfkLPlsY
#define onLogin kZGRDyGdcjeyugxr #define onLogin LeZhPJJELzgTdIba
#define getLoginTypeHttpAction fmTvdGRQOwtazGtO #define getLoginTypeHttpAction PqhOnSLZzbXhsVbx
#define loginTypeHttpGetCmdTypeAction fASEfSNadGgTgAVP #define loginTypeHttpGetCmdTypeAction JJylWFagVozMOlxU
#define getScopeListHttpCmd XALbemscXqhhqPyK #define getScopeListHttpCmd vgNoggHkLNSXtMpU
#define selectSinglePointTypeAction QqUettLVISoptSzz #define selectSinglePointTypeAction kYfxdGWTzeyEjDZD
#define getLoginHttpPostCmdCmd ZLQPxqWxAessgbXO #define getLoginHttpPostCmdCmd PMhNOZEmACqcPgPm
#define httpLoginHttpPostResultResponse OhgRAyGQQjxsgXIl #define httpLoginHttpPostResultResponse BaIAbNxSwwVpgxYo
#define getNewVersionUpdateHttpCmd hUWNnALwZggrlpeO #define getNewVersionUpdateHttpCmd HJaipISVLaoWqyLb
#define getLoginDeviceInformationHttpCmd iAVrGJXicqfNZvhh #define getLoginDeviceInformationHttpCmd mtrRFPpxlqxIBlmy
#define getMyInformationHttpGetCmd pVPGbdKtpNgsifsD #define getMyInformationHttpGetCmd FwkfDPRkZwcCdLVF
#define getVerifyTokenHttpPostCmdAction MWNmdrmyjWbhKCiY #define getVerifyTokenHttpPostCmdAction JvUxtoABgUtZCmbf
#define httpVerifyTokenHttpResultResponse ikACdEsQxwXytHGz #define httpVerifyTokenHttpResultResponse ZLaxOMRVrqjJFXXu
#define loginGetUserInfo XzwLHHqYNCyIsrKe #define loginGetUserInfo KUolGUpXlMcVAAKI
#define httpSinglePointinfoHttpResultResponse rnOjcHxMNOtyWHBf #define httpSinglePointinfoHttpResultResponse RQHATGnqZAyZndJg
#define getWeChatXinfoHttpPostCmd TCpJWuNrVzOEKLAh #define getWeChatXinfoHttpPostCmd WPTfzGkHpdkqEYNt
#define getWeChatBindingHttpPostCmd TXWufoxkugrBvIkE #define getWeChatBindingHttpPostCmd JAgEYRKDSNIkDKKz
#define httpWeChatXinfoHttpResultResponse jNszgSNorMhMCUge #define httpWeChatXinfoHttpResultResponse jGASVJrataYayuDv
#define SinglePointWeChatHttp WlRBVUlVcQNiPRSp #define SinglePointWeChatHttp QaTfsiWyWlugOkfV
#define judgmentTokenExpired(resultBlock:@escaping RXSVxfGwFyOgxlwT #define judgmentTokenExpired(resultBlock:@escaping LBTiDHcKnxxRaDlk
#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping vQAGpYQklYgAEyes #define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping KVjNtNIuHpXiQxAy
#define getRefreshTokenHttpPostCmd(resultBlock:@escaping drjBCAWNHpPGeWDl #define getRefreshTokenHttpPostCmd(resultBlock:@escaping rwXbohwfsszflzRY
#define func RcFNitmGxmICaphx #define func TQLSZGozpCGzRDgk
#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping GargDikpCEVeJiJP #define getLoginDeviceInformationHttpCmd(resultBlock:@escaping qDUplNSHeYmxaXoZ
#define httpDeviceInformationHttpResultResponse(result: spusHScgEAwlwHkx #define httpDeviceInformationHttpResultResponse(result: KEilGpDigJRglFgk
#define LoginViewController lmBxbxvbTVimwKCL #define LoginViewController uyFriBJrBNBrxBwd
#define WeChatBindingViewController yCUYJsToxzjtPJCW #define WeChatBindingViewController vzPsRqYZkqyezDpb
#define SinglePointViewController oRysElmElqExoiGs #define SinglePointViewController LTGjskJqUghsgZTS
#define MineViewController KMeMzhMdmutAbxEY #define MineViewController vwdqsbYzXMQGYhBY
#define getSelectCompanyHttpCmd FIGqYfWYESKEDjOi #define getSelectCompanyHttpCmd aOjDXNPASqvjnACI
#define httpSelectCompanyHttpResultResponse ysAtMgeGITeqLeha #define httpSelectCompanyHttpResultResponse iuIKliTygFWNOSvX
#define SelectCompanyViewController FCFDFUPRYmHDsPbF #define SelectCompanyViewController ODiXlmcgByBGWuJs
#define MineMoreViewController EsVsjBtMUJlYkuKY #define MineMoreViewController jVPLAdtJudVyinIp
#define WebSwiftViewController vWfDqVFydyDRVAeu #define WebSwiftViewController LoymTpdHjLYOzdlF
#define webView PXpCpkqkuhlrfVHz #define webView EOQTsDBMvGTgjAxy
#define webViewUrl MHzBycySbeSBlkST #define webViewUrl wGKpTYuHunCdTkyM
#define appid YbgZltfhUBNAZtHr #define appid UENeAqxezxPmwsdq
#define webActionTitle CImrRIwdkztoMAEw #define webActionTitle TCwBwazRVzsBYXcq
#define setwebView iZPLlPBzCqncMonp #define setwebView TKCGAvTpRzmJnYjM
#define backPrevious aTXxMKvUqwjdedhB #define backPrevious MawdQKbChOyKGtpP
#define WebActionOC eIZxrNENWpqJFSCU #define WebActionOC MPzYiopEFBchDplR
#define getUrl jqJVNodnvhLceMPq #define getUrl QbwhAkJIAiBsJKJl
#define getWebCookie GjAfHsgrgPJYiLtH #define getWebCookie RcKNohGmFVrENvIN
#define encryptAES CWqHWiKGKeiojTSi #define encryptAES dlsDefrLPxUgTvEi
#define decryptAES UIglfqvRbWKiodIP #define decryptAES PbNkMJmcLDNAEuiQ
#define ChangePassWordViewController oJIVKlfeyGerTwJH #define ChangePassWordViewController lqUxLqWmVOKCwmXt
#define oldTextView DYDvDGwVrusftQlS #define oldTextView elsmyOnFeUFAtMzu
#define newTextView PKHcOKtPfXxFPIUl #define newTextView dCWaOOlibOBAHTmU
#define confirmPassTextView MLJUwhrEwMoNMpMz #define confirmPassTextView cVKjFvVihSdbeHHh
#define actionChangePassWord oMuAZrEVrFchHGki #define actionChangePassWord fxqOirYlzuxWKNaR
#define getChangePasswordHttpCmd gIxVmwUkZtVspnJM #define getChangePasswordHttpCmd TImzGdXFbiBLbESu
#define httpChangePasswordHttpResultResponse zFYCSkvfChgaFSiw #define httpChangePasswordHttpResultResponse ahVQjIwHAzqTvzIZ
#define getSinglePointPasswordHttpPostCmd joOSckSHMWSHEEcO #define getSinglePointPasswordHttpPostCmd BVdEXmWUZXGJAKYi
#define httpSinglePointPasswordHttpResultResponse yDwZOAYJMEXgELnO #define httpSinglePointPasswordHttpResultResponse eBfxeRGptMZTpWBo
#define loginTypeHttpGetCmdTypeAction DgJaidgTuRvWePrm #define loginTypeHttpGetCmdTypeAction TVDhleUHlSDrfQOL
#define MineMoreViewController WiAQDxfnnEBtzqLm #define MineMoreViewController bFdCOZMbbWRxfGjy
#define getMyApplicationListHttpCmd mbuaGWxVQigLvBcf #define getMyApplicationListHttpCmd umeSzxksABHQorMQ
#define httpMyApplicationListHttpResultResponse ONJXglflDJMiOOXT #define httpMyApplicationListHttpResultResponse ncDxSWZMSFvPiTby
#define getAllApplicationHttpListCmd koYTAuPDHDlCznBE #define getAllApplicationHttpListCmd WXgEsKAsAQafGCkp
#define httpMoreApplicationsTwoHttpResultResponse NEdkJvcpatYXoRTQ #define httpMoreApplicationsTwoHttpResultResponse RckhJkBcjKsLKwSD
#define changeBlockAction FqEQtZjFxRCBwIcD #define changeBlockAction qaNGOCtpYFACnamv
#define getHttpCollcetionViewModellArray QpenrlFYhhfsTfOt #define getHttpCollcetionViewModellArray KVLNyVLqZDQhesaX
#define getHttpCollcetionViewModellTwoArray EVNoMcynmeVxCdJt #define getHttpCollcetionViewModellTwoArray bKcJLJLqPYbXEbdp
#define getHttpMineMoreCollectionViewCellModel xHNguTYVSNAWpkDF #define getHttpMineMoreCollectionViewCellModel AsWMpAwsEduNsBFM
#define getSaveApplicationsHttpCmd lGpTjGlhnroSwVwL #define getSaveApplicationsHttpCmd zgavdkDywxXFwLVp
#define httpSaveApplicationListHttpResultResponse IAohxDeGMFMQVPwt #define httpSaveApplicationListHttpResultResponse BOgyLQLbaDsHCtpE
#define httpSelectCompanyHttpResultResponse fdyPOBcVEDXFJvOf #define httpSelectCompanyHttpResultResponse mKKCvVhvElwcaAIu
#define gotoCompanyListVC JXvGGwfBQtLWlHhY #define gotoCompanyListVC uVMVTKmaIIvMDIUK
#define SelectCompanyViewController zyJCRizrTtmsGTdg #define SelectCompanyViewController PyoEQHesIftTcmnq
#define actionCompanyHttpGCD HOIqUxNIAlhQAWLN #define actionCompanyHttpGCD gIzGDbsFqoWeKtem
#define actiondepartmentHttpGCD YXrZQXLPRVtTOVvU #define actiondepartmentHttpGCD ZTEpDXTsQHbFZMGx
#define myApplicationAction MJbWDMiUbGPsbOUi #define myApplicationAction rcFCvhsqjAJanSfF
#define downloadOpenApp fYSrjnAdGOuzWlmA #define downloadOpenApp HTVqvIWJZWnddKgx
#define oftenApplicationType tltValSZnyBaLaNy #define oftenApplicationType DQASVgQpkdsBBCEG
#define HTHttpConfig tYVPfoIdYGmCaVXG #define HTHttpConfig opuVIGIPGpeihmID
#define kServiceAddressURL1 peMPnmIzngvInAMZ #define kServiceAddressURL1 zVRSscvuqxtPNtXN
#define imageURL1 EvfhZagNQDrDHLwJ #define imageURL1 RUNzLIDspvvHkxsl
#define kServiceAddressURL qxArRxkNEbIJxlLF #define kServiceAddressURL YTCjXRAbzMPXYbpH
#define imageURL PeEuQsKmWCBPLnDF #define imageURL fbpMSOUilwcVwEkv
#define kServiceAddressURL2 AbHLHdyqKADAkNTb #define kServiceAddressURL2 FNqfreFWrmKzuMRH
#define imageURL2 MYtSnUXSFMRYNgZL #define imageURL2 nARMoFowKNnWrJDg
#define HomeViewController UOzIGVkCAOUmtlRN #define HomeViewController TqtwBCrxUcTmpMTU
#define actionHttpGCD jXoylYTyuTyesySk #define actionHttpGCD PBZOdEoMhKeiKHuJ
#define getHttpHomeClassListCmd dWFSvzVSqldEJryZ #define getHttpHomeClassListCmd bydJYDCXBMNgvQMJ
#define httpHttpHomeClassListResultResponse WbZNXsgpdZfZfUgY #define httpHttpHomeClassListResultResponse YkZLtNxGOwGQTgvC
#define getUpcomingCountHttpPostCmd fnDBBvTkXdKEtBZZ #define getUpcomingCountHttpPostCmd eKnScBxzsJhWPZWO
#define httpUpcomingCountHttpResultResponse HqXZlTcQVygVwtdv #define httpUpcomingCountHttpResultResponse UaudbSoXBurJdSCy
#define getMessageNunberShowHttpPostCmd bVbLyaEuiqpSPYPK #define getMessageNunberShowHttpPostCmd SjnQXiyHuMlsETUF
#define httpMessageNumberShowHttpResultResponse uerswBJhSIqygzfX #define httpMessageNumberShowHttpResultResponse pHeDxocJVqpftfOh
#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