添加AI资讯页面

MobilePortal/MobilePortal.xcodeproj/project.pbxproj

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

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

@@ -440,8 +440,8 @@
             timestampString = "651493562.330161"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "345"
-            endingLineNumber = "345"
+            startingLineNumber = "387"
+            endingLineNumber = "387"
             landmarkName = "addCellModel(array:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -769,7 +769,7 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8624"
+                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8981"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -779,12 +779,12 @@
                   urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "143"
-                  endingLineNumber = "143"
+                  startingLineNumber = "146"
+                  endingLineNumber = "146"
                   offsetFromSymbolStart = "522">
                </Location>
                <Location
-                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - 4475a31735ebbaf7"
+                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - 4475a31735ebb552"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -794,8 +794,8 @@
                   urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "143"
-                  endingLineNumber = "143"
+                  startingLineNumber = "146"
+                  endingLineNumber = "146"
                   offsetFromSymbolStart = "45">
                </Location>
             </Locations>
@@ -1183,8 +1183,8 @@
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "199"
-            endingLineNumber = "199"
+            startingLineNumber = "230"
+            endingLineNumber = "230"
             landmarkName = "setHTTPCookie(count:host:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1199,8 +1199,8 @@
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "208"
-            endingLineNumber = "208"
+            startingLineNumber = "239"
+            endingLineNumber = "239"
             landmarkName = "setHTTPCookie(count:host:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1215,8 +1215,8 @@
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "161"
-            endingLineNumber = "161"
+            startingLineNumber = "192"
+            endingLineNumber = "192"
             landmarkName = "setwebView(strUrl:)"
             landmarkType = "7">
             <Locations>
@@ -1307,8 +1307,8 @@
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "174"
-            endingLineNumber = "174"
+            startingLineNumber = "205"
+            endingLineNumber = "205"
             landmarkName = "setwebView(strUrl:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1323,8 +1323,8 @@
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "132"
-            endingLineNumber = "132"
+            startingLineNumber = "156"
+            endingLineNumber = "156"
             landmarkName = "setStatusBarBackgroundColor()"
             landmarkType = "7">
          </BreakpointContent>

MobilePortal/MobilePortal/AppDelegate.swift

@@ -32,7 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate  {
         /// 键盘
         IQKeyboardManager.shared.enable = true
 //        2体验版 1 测试版 0正式 106785
-        AccountInfo.sharedInstance().isTest = "1"
+        AccountInfo.sharedInstance().isTest = "2"
         AccountInfo.sharedInstance().messageNumber = "0"
 //        1新接口 0老接口
         if AccountInfo.sharedInstance().oldType == nil {
@@ -52,6 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate  {
         AccountInfo.sharedInstance().CustomerServicePower = ""
 //        AccountInfo.sharedInstance().UMS_messageDetaUrl = "https://employeedev.shaphar.com/mobile-portal/messagedetail/1174"
 //        AccountInfo.sharedInstance().UserId = "199476"
+//        AccountInfo.sharedInstance().singlePoint_access_token = "1"
 //        网络框架
         ProjectConfigGroup.initHttpConfig()
         HTHttpConfig.sharedInstance().isout = false

MobilePortal/MobilePortal/Assets.xcassets/Tabbar/Contents.json

 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

MobilePortal/MobilePortal/Assets.xcassets/Tabbar/ai_nor_image.imageset/Contents.json

+{
+  "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
+  }
+}

MobilePortal/MobilePortal/Assets.xcassets/Tabbar/ai_select_image.imageset/Contents.json

+{
+  "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
+  }
+}

MobilePortal/MobilePortal/Model/AccountInfo.swift

@@ -99,8 +99,21 @@ private let AccountInfo_webViewUrl:String="AccountInfo_webViewUrl"
 
 private let  AccountInfo_CustomerServicePower:String="AccountInfo_CustomerServicePower"
 
+private let  Advisory_Url:String="AdvisoryUrl"
+
+
 @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?{
             set{
                 let userData:UserDefaults=UserDefaults.standard

MobilePortal/MobilePortal/VC/Home/HomeViewController+http.swift

@@ -73,6 +73,48 @@ extension HomeViewController {
         }
         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：获取消息详情
     func getApplicationDetailsHttpActin(applicationName:String)  {
         showHintView()

MobilePortal/MobilePortal/VC/Home/HomeViewController.swift

@@ -122,6 +122,7 @@ class HomeViewController: BaseViewController,UIPopoverPresentationControllerDele
         addInitTableView()
         addHeaderFooter()
         actionHttpGCD()
+        getApplicationByBelongAction2(applicationName: "Real_Time_Info")
         CustomerServicePowerHttpPostCmdAction()
 //        setStatusBarBackgroundColor()
 //        self.title = "首页"

MobilePortal/MobilePortal/VC/RootTabBarVC/MyTabbar.swift

@@ -29,7 +29,7 @@ class MyTabbar: UITabBar {
     }()
     override init(frame: CGRect) {
         super.init(frame: frame)
-        self.addSubview(myTabbarImageView)
+        //self.addSubview(myTabbarImageView)
         self.addSubview(publishBtn)
         NotificationCenter.default.addObserver(self, selector: #selector(publishBtnEetNum), name: NSNotification.Name(rawValue: "publishBtnEetNum"), object: nil)
     }

MobilePortal/MobilePortal/VC/RootTabBarVC/RootTabBarViewController.swift

@@ -76,8 +76,9 @@ class RootTabBarViewController: UITabBarController,UITabBarControllerDelegate {
         vc.isTabBarVC = IsTabBarVC.isTabBarVC
         vc.isEncryptionType = IsEncryptionType.NoEncryptionType
         vc.isHomePushType = IsHomePushType.NOIsHomePushType
-        vc.webViewUrl = "http://222.66.127.246:8021/syqxerp/#/doneList?userId=199476&sysUserId=135965"
-        return self.getNavigationWithVc(vc: vc, title: "资讯", img1: "tabbar_two_nor", selectImg:"tabbar_two_select")
+        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: "ai_nor_image", selectImg:"ai_select_image")
     }
     func gainService()->UINavigationController{
 //        let vc:ServiceViewController=ServiceViewController()

MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+QRView.swift

@@ -24,5 +24,232 @@ extension WebSwiftViewController {
 //    func customizedScanDelegate(forResult resultDic: [AnyHashable : Any]!) {
 //        print(resultDic)
 //    }
+    //MARK：获取对应服务
+    func getApplicationByBelongAction(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?.httpApplicationByBelongHttpResultResponse(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 httpApplicationByBelongHttpResultResponse(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.refreshTokenHttpAction(selecHttpModel: httpDetailModel)
+            }
+        }else{
+            SMToastView.showMessage("请查看当前网络状态！")
+        }
+        self.hidenHintView()
+    }
+    /// MARK: 刷新RefreshToken
+    func refreshTokenHttpAction(selecHttpModel:ApplicationHttpListModel) {
+        self.selecClassModel = selecHttpModel
+        if (AccountInfo.sharedInstance().loginType != nil && AccountInfo.sharedInstance().loginType == "1") {
+            SinglePointWeChatHttp.sharedInstance().judgmentTokenExpired(resultBlock: {[weak self] (value) in
+                self?.classAction(selecHttpModel: selecHttpModel)
+            }) { [weak self] (value) in
+                self?.classAction(selecHttpModel: selecHttpModel)
+            }
+        } else {
+            self.classAction(selecHttpModel: selecHttpModel)
+        }
+    }
+    //点击应用响应事件
+    func classAction(selecHttpModel:ApplicationHttpListModel){
+        if AccountInfo.sharedInstance().oldType == "0" {
+            classActionOld(selecHttpModel: selecHttpModel, type: .OftenApplicationType)
+            return
+        }
+        self.selecClassModel = selecHttpModel
+        if selecHttpModel.pointstate == "0" {
+            SMAlertView.showAlert("单点未开启,请联系管理员！")
+            return
+        }
+        if self.selecClassModel.applicationPlatformsType == .AndroidiOSType {
+            myApplicationAction(httpDetailModel: selecHttpModel)
+        } else {
+            oftenApplicationType(httpDetailModel: selecHttpModel)
+        }
+
+    }
+    //我的应用响应事件
+    private func myApplicationAction(httpDetailModel:ApplicationHttpListModel){
+        if self.isInstallation(urlString: httpDetailModel.iosopenurl!) == false{
+            //打开APP
+            self.appViewsSstatisticsAction(httpModel: httpDetailModel, type: "3")
+            self.downloadOpenApp(urlString: self.getSignInAction(model: httpDetailModel), openUrlType: .OpenAppType)
+        }else{
+            if httpDetailModel.iosurl?.count == 0{
+                SMToastView.showMessage("该应用暂无下载地址，请联系管理员！")
+                return
+            }
+            self.appViewsSstatisticsAction(httpModel: httpDetailModel, type: "2")
+            self.downloadOpenApp(urlString: httpDetailModel.iosurl!, openUrlType: .DownloadType)
+        }
+    }
+    // MARK:web响应事件
+    func oftenApplicationType(httpDetailModel:ApplicationHttpListModel){
+        if httpDetailModel.pointstate == "0" {
+            self.setWebUrlAction(selecClassModel: httpDetailModel)
+        }
+        let companyInfo:SelecCompanyDepartmentInfo = getSelecCompanyDepartment(tags: httpDetailModel.sysid ?? String())
+        if companyInfo.tags == nil {
+            getSelectCompanyHttpCmd()
+        }else{
+            if httpDetailModel.sysid == "ERP" && companyInfo.sysOrg == ""{
+                SMToastView.showMessage("ERP组织获取失败！")
+                hidenHintView()
+                return
+            }
+            self.setCacheAccountInfo(companyInfo: companyInfo, selecClassModel: self.selecClassModel)
+            return
+        }
+    }
+    /// 点击响应事件
+    func classActionOld(selecHttpModel:ApplicationHttpListModel,type:ApplicationType){
+        self.selecClassModel = selecHttpModel
+        if type == .MyApplicationType {
+            self.myApplicationActionOld(httpDetailModel: selecHttpModel)
+        } else {
+            self.oftenApplicationTypeOld(httpDetailModel: selecHttpModel)
+        }
+    }
+    /// 我的应用
+    func myApplicationActionOld(httpDetailModel:ApplicationHttpListModel){
+        if httpDetailModel.comments != nil && httpDetailModel.comments?.count != 0{
+            let url:String = httpDetailModel.comments!+"?docId="+judgmentStrNil(str: httpDetailModel.id)+"&userId="+AccountInfo.sharedInstance().UserId!+"&userName="+judgmentStrNil(str: AccountInfo.sharedInstance().userName)
+            self.actionGotoTitleWeb(webViewUrl: url, title: "", isHomePushType: .YesIsHomePushType, appid: httpDetailModel.appid!, isEncryptionType: .YesEncryptionType)
+            return
+        }
+        if self.isInstallation(urlString: httpDetailModel.openurl!) == false{
+            self.downloadOpenApp(urlString: httpDetailModel.openurl!, openUrlType: .OpenAppType)
+        }else{
+            if httpDetailModel.appid?.count == 0{
+                SMToastView.showMessage("该应用暂无下载地址，请联系管理员！")
+                return
+            }
+            self.downloadOpenApp(urlString: httpDetailModel.appid!, openUrlType: .DownloadType)
+        }
+    }
+    /// 我的常用
+    func oftenApplicationTypeOld(httpDetailModel:ApplicationHttpListModel) {
+        let companyInfo:SelecCompanyDepartmentInfo = getSelecCompanyDepartment(tags: httpDetailModel.sysid ?? String())
+        if companyInfo.tags == nil {
+            getSelectCompanyHttpCmd()
+        }else{
+            if httpDetailModel.sysid == "ERP" && companyInfo.sysOrg == ""{
+                SMToastView.showMessage("ERP组织获取失败！")
+                return
+            }
+            self.setCacheAccountInfo(companyInfo: companyInfo, selecClassModel: self.selecClassModel)
+            return
+        }
+    }
+    // MARK:获取公司列表
+    func getSelectCompanyHttpCmd(){
+        showHintView()
+        let cmd:HttpCommand = SelectCompanyHttpCmd.init(version: PHttpVersion_v1)
+        let block:httpBlock = {[weak self] (result:RequestResult!,useInfo:Any!)->() in
+            if result != nil {
+                self?.httpSelectCompanyHttpResultResponse(result: result)
+            }else{
+                print("空的")
+            }
+        }
+        let dic:NSMutableDictionary = NSMutableDictionary()
+        let attrDic:NSMutableDictionary = NSMutableDictionary()
+        attrDic[kHttpSelectCompanyHttpCmd_companyname] = ""
+        attrDic[kHttpSelectCompanyHttpCmd_sysname] = self.selecClassModel.belong
+        attrDic[kHttpSelectCompanyHttpCmd_empid] = judgmentStrNil(str: AccountInfo.sharedInstance().UserId)+",1"
+//        attrDic[kHttpSelectCompanyHttpCmd_empid] = judgmentStrNil(str: AccountInfo.sharedInstance().UserId)
+        dic[kHttpSelectCompanyHttpCmd_attr] = attrDic
+        dic[kHttpSelectCompanyHttpCmd_dbName] = ""
+        dic[kHttpSelectCompanyHttpCmd_length] = "100"
+        dic[kHttpSelectCompanyHttpCmd_start] = "1"
+        cmd.requestInfo = dic as [NSObject:AnyObject]
+        let completeDelegate = SMBaseHttpComplete.init(block: block , withUserInfo: nil)
+        cmd.completeDelegate=completeDelegate
+        print("url==%@",cmd.getUrl())
+        cmd.execute()
+    }
+    private func httpSelectCompanyHttpResultResponse(result:RequestResult){
+        let r:SelectCompanyHttpResult = result as! SelectCompanyHttpResult
+        if r.isOk() {
+            let array = r.getSelectCompanyHttpResult()
+            let selectCompanyModel:SelectCompanyHttpModel = array[0] as! SelectCompanyHttpModel
+            companyListModelArray = selectCompanyModel.sysCompany.data
+            departmentListModelArray = selectCompanyModel.orgList.data
+            if companyListModelArray.count == 0{
+                //SMToastView.showMessage("暂无公司！")
+                if (self.selecClassModel.sysid == "ERP" || self.selecClassModel.sysid == "erp") {
+                    SMToastView.showMessage("ERP部门组织获取失败！")
+                    hidenHintView()
+                    return
+                }
+                self.setWebUrlAction(selecClassModel: self.selecClassModel)
+            }else if companyListModelArray.count == 1 && departmentListModelArray.count == 0  {
+                if (self.selecClassModel.sysid == "ERP" || self.selecClassModel.sysid == "erp") {
+                    SMToastView.showMessage("ERP部门组织获取失败！")
+                    hidenHintView()
+                    return
+                }
+                //SMToastView.showMessage("暂无部门！")
+                self.selectOneCompany(companyListArray: companyListModelArray)
+                //setUrl()
+            }else if companyListModelArray.count == 1 && departmentListModelArray.count == 1  {
+                self.selectCompanyDeparttment(companyListArray: companyListModelArray, departmentListArray: departmentListModelArray)
+            }else if companyListModelArray.count != 1 || departmentListModelArray.count != 1  {
+                gotoCompanyListVC()
+                return
+            }
+        }else{
+            SMToastView.showMessage("请查看当前网络状态！")
+        }
+        hidenHintView()
+    }
+    
+    // MARK:解析出只有一个公司和只有一个部门时
+    func selectCompanyDeparttment(companyListArray:NSMutableArray,departmentListArray:NSMutableArray){
+        let companyModel:SelectCompanyHttpCompanyDataModel = companyListModelArray[0] as! SelectCompanyHttpCompanyDataModel
+        let departmentModel:SelectCompanyHttpOrgListDataModel = departmentListArray[0] as! SelectCompanyHttpOrgListDataModel
+        self.setClassWebUrlAccountInfo(selecClassModel: self.selecClassModel, companyModel: companyModel, departmentModel: departmentModel)
+    }
+    // MARK:解析出只有一个公司时
+    func selectOneCompany(companyListArray:NSMutableArray){
+        let companyModel:SelectCompanyHttpCompanyDataModel = companyListModelArray[0] as! SelectCompanyHttpCompanyDataModel
+        self.setClassWebUrlAccountInfo(selecClassModel: self.selecClassModel, companyModel: companyModel, departmentModel: SelectCompanyHttpOrgListDataModel())
+        
+    }
+    // MARK: 跳转公司
+    func gotoCompanyListVC()  {
+        let vc:SelectCompanyViewController=SelectCompanyViewController.createViewController(createArgs: nil) as! SelectCompanyViewController
+        vc.selecClassModel = self.selecClassModel
+        vc.block = {[weak self] (value:Any) in
+            self?.mineGotoWebVC()
+        }
+        vc.hidesBottomBarWhenPushed = true
+        self.pushViewController(viewController: vc, animated: true)
+    }
     
+    @objc func mineGotoWebVC(){
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            self.setWebUrlAction(selecClassModel: self.selecClassModel ?? ApplicationHttpListModel())
+        }
+    }
 }

MobilePortal/MobilePortal/VC/Web/WebSwiftViewController.swift

@@ -32,7 +32,9 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
     
 //    var hmsCustomScanViewController = HmsCustomScanViewController()
     var documentController = UIDocumentInteractionController()
-    
+    var companyListModelArray = NSMutableArray()
+    var departmentListModelArray = NSMutableArray()
+    var selecClassModel:ApplicationHttpListModel!
     ///js调用原生方法名
     var webActionTitle = ["AppLogout","callPhone","sendSms","openScanActivity","getTitle","hideTitleLayout","copyContent","gotoLogin","openWeb","openFileDownload","openScan","getCookie","openDefaultWeb","openFileDownloadZIP"]
     lazy var webView: WKWebView = {
@@ -95,6 +97,10 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
+            self.navigationController?.setNavigationBarHidden(true, animated: true)
+            setNeedsStatusBarAppearanceUpdate()
+        }
         //        WebActionOC.share()?.setNSURLProtocolCustom()
     }
     
@@ -106,7 +112,12 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
         if self.isShowTitleType == .NoShowTitleType {
             self.navigationController?.setNavigationBarHidden(true, animated: true)
             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()
         }else{
             self.navigationController?.setNavigationBarHidden(false, animated: true)
@@ -125,8 +136,21 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
         if self.isEncryptionType == .YesEncryptionType {
 //            self.webViewUrl = getWebCookieUrl(urlStr: self.webViewUrl)
         }
+        if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
+            webViewUrl = AccountInfo.sharedInstance().AdvisoryUrl
+        }
         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(){
         let stateView:UIView = UIView.init(frame: CGRect(x:0, y: 0, width:SCREEN_WHIDTH() , height:getStatusBarH() ))
         stateView.backgroundColor = statusBarColor
@@ -134,6 +158,13 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
     }
     //webView的加载
     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
         var count = self.getWebCookie(urlStr: self.webViewUrl)
         if self.isUMSMessageType == .IsUMSMessageType {
@@ -156,7 +187,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
         }
         
         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
             urlRequest.setValue(WebActionOC.share()?.getCookieValue((WebActionOC.share()?.encryptAES(count, key: self.appid))!, host: host) as String?, forHTTPHeaderField: "Cookie")
             print("----urlRequest")
@@ -253,6 +284,9 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
     
     @objc func backPrevious(){
         
+        if (self.isTabBarVC == IsTabBarVC.isTabBarVC) {
+            return
+        }
         if #available(iOS 11.0, *){
             let cookieStore = webView.configuration.websiteDataStore.httpCookieStore
             cookieStore.getAllCookies { (cookie) in
@@ -269,14 +303,12 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
                 }
             }
             
-        } else {
-            if let cookiesList = HTTPCookieStorage.shared.cookies {
-                for item in cookiesList {
-                    HTTPCookieStorage.shared.deleteCookie(item)
-                }
+        }
+        if let cookiesList = HTTPCookieStorage.shared.cookies {
+            for item in cookiesList {
+                HTTPCookieStorage.shared.deleteCookie(item)
             }
         }
-        
         SuspensionView.share().getsuspensionBtn()?.isHidden = false
         BDVoiceWakeUp.share().startWakeup()
 //        webView.removeObserver(self, forKeyPath: "estimatedProgress", context: nil)

MobilePortal/MobilePortal/codeObfuscation.h

 #ifndef Demo_codeObfuscation_h
 #define Demo_codeObfuscation_h
-//confuse string at Thu Mar  6 15:16:54 CST 2025
-#define BaseViewController vzcdeNdiBypvXBBF
-#define myTableView MEovhrrFLVhBsLcM
-#define setCacheAccountInfo keAiCvvqqhLbmElZ
-#define setClassWebUrlAccountInfo MSAiSFBjwKnAwLbD
-#define setWebUrlAction JfBJeAKcvRccAExn
-#define SinglePointWeChatVC LpTkxxlmPmJVLMsb
-#define onLogin kZGRDyGdcjeyugxr
-#define getLoginTypeHttpAction fmTvdGRQOwtazGtO
-#define loginTypeHttpGetCmdTypeAction fASEfSNadGgTgAVP
-#define getScopeListHttpCmd XALbemscXqhhqPyK
-#define selectSinglePointTypeAction QqUettLVISoptSzz
-#define getLoginHttpPostCmdCmd ZLQPxqWxAessgbXO
-#define httpLoginHttpPostResultResponse OhgRAyGQQjxsgXIl
-#define getNewVersionUpdateHttpCmd hUWNnALwZggrlpeO
-#define getLoginDeviceInformationHttpCmd iAVrGJXicqfNZvhh
-#define getMyInformationHttpGetCmd pVPGbdKtpNgsifsD
-#define getVerifyTokenHttpPostCmdAction MWNmdrmyjWbhKCiY
-#define httpVerifyTokenHttpResultResponse ikACdEsQxwXytHGz
-#define loginGetUserInfo XzwLHHqYNCyIsrKe
-#define httpSinglePointinfoHttpResultResponse rnOjcHxMNOtyWHBf
-#define getWeChatXinfoHttpPostCmd TCpJWuNrVzOEKLAh
-#define getWeChatBindingHttpPostCmd TXWufoxkugrBvIkE
-#define httpWeChatXinfoHttpResultResponse jNszgSNorMhMCUge
-#define SinglePointWeChatHttp WlRBVUlVcQNiPRSp
-#define judgmentTokenExpired(resultBlock:@escaping RXSVxfGwFyOgxlwT
-#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping vQAGpYQklYgAEyes
-#define getRefreshTokenHttpPostCmd(resultBlock:@escaping drjBCAWNHpPGeWDl
-#define func RcFNitmGxmICaphx
-#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping GargDikpCEVeJiJP
-#define httpDeviceInformationHttpResultResponse(result: spusHScgEAwlwHkx
-#define LoginViewController lmBxbxvbTVimwKCL
-#define WeChatBindingViewController yCUYJsToxzjtPJCW
-#define SinglePointViewController oRysElmElqExoiGs
-#define MineViewController KMeMzhMdmutAbxEY
-#define getSelectCompanyHttpCmd FIGqYfWYESKEDjOi
-#define httpSelectCompanyHttpResultResponse ysAtMgeGITeqLeha
-#define SelectCompanyViewController FCFDFUPRYmHDsPbF
-#define MineMoreViewController EsVsjBtMUJlYkuKY
-#define WebSwiftViewController vWfDqVFydyDRVAeu
-#define webView PXpCpkqkuhlrfVHz
-#define webViewUrl MHzBycySbeSBlkST
-#define appid YbgZltfhUBNAZtHr
-#define webActionTitle CImrRIwdkztoMAEw
-#define setwebView iZPLlPBzCqncMonp
-#define backPrevious aTXxMKvUqwjdedhB
-#define WebActionOC eIZxrNENWpqJFSCU
-#define getUrl jqJVNodnvhLceMPq
-#define getWebCookie GjAfHsgrgPJYiLtH
-#define encryptAES CWqHWiKGKeiojTSi
-#define decryptAES UIglfqvRbWKiodIP
-#define ChangePassWordViewController oJIVKlfeyGerTwJH
-#define oldTextView DYDvDGwVrusftQlS
-#define newTextView PKHcOKtPfXxFPIUl
-#define confirmPassTextView MLJUwhrEwMoNMpMz
-#define actionChangePassWord oMuAZrEVrFchHGki
-#define getChangePasswordHttpCmd gIxVmwUkZtVspnJM
-#define httpChangePasswordHttpResultResponse zFYCSkvfChgaFSiw
-#define getSinglePointPasswordHttpPostCmd joOSckSHMWSHEEcO
-#define httpSinglePointPasswordHttpResultResponse yDwZOAYJMEXgELnO
-#define loginTypeHttpGetCmdTypeAction DgJaidgTuRvWePrm
-#define MineMoreViewController WiAQDxfnnEBtzqLm
-#define getMyApplicationListHttpCmd mbuaGWxVQigLvBcf
-#define httpMyApplicationListHttpResultResponse ONJXglflDJMiOOXT
-#define getAllApplicationHttpListCmd koYTAuPDHDlCznBE
-#define httpMoreApplicationsTwoHttpResultResponse NEdkJvcpatYXoRTQ
-#define changeBlockAction FqEQtZjFxRCBwIcD
-#define getHttpCollcetionViewModellArray QpenrlFYhhfsTfOt
-#define getHttpCollcetionViewModellTwoArray EVNoMcynmeVxCdJt
-#define getHttpMineMoreCollectionViewCellModel xHNguTYVSNAWpkDF
-#define getSaveApplicationsHttpCmd lGpTjGlhnroSwVwL
-#define httpSaveApplicationListHttpResultResponse IAohxDeGMFMQVPwt
-#define httpSelectCompanyHttpResultResponse fdyPOBcVEDXFJvOf
-#define gotoCompanyListVC JXvGGwfBQtLWlHhY
-#define SelectCompanyViewController zyJCRizrTtmsGTdg
-#define actionCompanyHttpGCD HOIqUxNIAlhQAWLN
-#define actiondepartmentHttpGCD YXrZQXLPRVtTOVvU
-#define myApplicationAction MJbWDMiUbGPsbOUi
-#define downloadOpenApp fYSrjnAdGOuzWlmA
-#define oftenApplicationType tltValSZnyBaLaNy
-#define HTHttpConfig tYVPfoIdYGmCaVXG
-#define kServiceAddressURL1 peMPnmIzngvInAMZ
-#define imageURL1 EvfhZagNQDrDHLwJ
-#define kServiceAddressURL qxArRxkNEbIJxlLF
-#define imageURL PeEuQsKmWCBPLnDF
-#define kServiceAddressURL2 AbHLHdyqKADAkNTb
-#define imageURL2 MYtSnUXSFMRYNgZL
-#define HomeViewController UOzIGVkCAOUmtlRN
-#define actionHttpGCD jXoylYTyuTyesySk
-#define getHttpHomeClassListCmd dWFSvzVSqldEJryZ
-#define httpHttpHomeClassListResultResponse WbZNXsgpdZfZfUgY
-#define getUpcomingCountHttpPostCmd fnDBBvTkXdKEtBZZ
-#define httpUpcomingCountHttpResultResponse HqXZlTcQVygVwtdv
-#define getMessageNunberShowHttpPostCmd bVbLyaEuiqpSPYPK
-#define httpMessageNumberShowHttpResultResponse uerswBJhSIqygzfX
+//confuse string at Thu Apr  3 17:07:24 CST 2025
+#define BaseViewController HnsTaRMNHztQGXlp
+#define myTableView hCjdliSlOPWnYuNR
+#define setCacheAccountInfo lNyQpnBmkNhCkZqW
+#define setClassWebUrlAccountInfo JylufpizgNOntnFP
+#define setWebUrlAction uEANVuStmhYSvpPj
+#define SinglePointWeChatVC vwOXgsHUYfkLPlsY
+#define onLogin LeZhPJJELzgTdIba
+#define getLoginTypeHttpAction PqhOnSLZzbXhsVbx
+#define loginTypeHttpGetCmdTypeAction JJylWFagVozMOlxU
+#define getScopeListHttpCmd vgNoggHkLNSXtMpU
+#define selectSinglePointTypeAction kYfxdGWTzeyEjDZD
+#define getLoginHttpPostCmdCmd PMhNOZEmACqcPgPm
+#define httpLoginHttpPostResultResponse BaIAbNxSwwVpgxYo
+#define getNewVersionUpdateHttpCmd HJaipISVLaoWqyLb
+#define getLoginDeviceInformationHttpCmd mtrRFPpxlqxIBlmy
+#define getMyInformationHttpGetCmd FwkfDPRkZwcCdLVF
+#define getVerifyTokenHttpPostCmdAction JvUxtoABgUtZCmbf
+#define httpVerifyTokenHttpResultResponse ZLaxOMRVrqjJFXXu
+#define loginGetUserInfo KUolGUpXlMcVAAKI
+#define httpSinglePointinfoHttpResultResponse RQHATGnqZAyZndJg
+#define getWeChatXinfoHttpPostCmd WPTfzGkHpdkqEYNt
+#define getWeChatBindingHttpPostCmd JAgEYRKDSNIkDKKz
+#define httpWeChatXinfoHttpResultResponse jGASVJrataYayuDv
+#define SinglePointWeChatHttp QaTfsiWyWlugOkfV
+#define judgmentTokenExpired(resultBlock:@escaping LBTiDHcKnxxRaDlk
+#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping KVjNtNIuHpXiQxAy
+#define getRefreshTokenHttpPostCmd(resultBlock:@escaping rwXbohwfsszflzRY
+#define func TQLSZGozpCGzRDgk
+#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping qDUplNSHeYmxaXoZ
+#define httpDeviceInformationHttpResultResponse(result: KEilGpDigJRglFgk
+#define LoginViewController uyFriBJrBNBrxBwd
+#define WeChatBindingViewController vzPsRqYZkqyezDpb
+#define SinglePointViewController LTGjskJqUghsgZTS
+#define MineViewController vwdqsbYzXMQGYhBY
+#define getSelectCompanyHttpCmd aOjDXNPASqvjnACI
+#define httpSelectCompanyHttpResultResponse iuIKliTygFWNOSvX
+#define SelectCompanyViewController ODiXlmcgByBGWuJs
+#define MineMoreViewController jVPLAdtJudVyinIp
+#define WebSwiftViewController LoymTpdHjLYOzdlF
+#define webView EOQTsDBMvGTgjAxy
+#define webViewUrl wGKpTYuHunCdTkyM
+#define appid UENeAqxezxPmwsdq
+#define webActionTitle TCwBwazRVzsBYXcq
+#define setwebView TKCGAvTpRzmJnYjM
+#define backPrevious MawdQKbChOyKGtpP
+#define WebActionOC MPzYiopEFBchDplR
+#define getUrl QbwhAkJIAiBsJKJl
+#define getWebCookie RcKNohGmFVrENvIN
+#define encryptAES dlsDefrLPxUgTvEi
+#define decryptAES PbNkMJmcLDNAEuiQ
+#define ChangePassWordViewController lqUxLqWmVOKCwmXt
+#define oldTextView elsmyOnFeUFAtMzu
+#define newTextView dCWaOOlibOBAHTmU
+#define confirmPassTextView cVKjFvVihSdbeHHh
+#define actionChangePassWord fxqOirYlzuxWKNaR
+#define getChangePasswordHttpCmd TImzGdXFbiBLbESu
+#define httpChangePasswordHttpResultResponse ahVQjIwHAzqTvzIZ
+#define getSinglePointPasswordHttpPostCmd BVdEXmWUZXGJAKYi
+#define httpSinglePointPasswordHttpResultResponse eBfxeRGptMZTpWBo
+#define loginTypeHttpGetCmdTypeAction TVDhleUHlSDrfQOL
+#define MineMoreViewController bFdCOZMbbWRxfGjy
+#define getMyApplicationListHttpCmd umeSzxksABHQorMQ
+#define httpMyApplicationListHttpResultResponse ncDxSWZMSFvPiTby
+#define getAllApplicationHttpListCmd WXgEsKAsAQafGCkp
+#define httpMoreApplicationsTwoHttpResultResponse RckhJkBcjKsLKwSD
+#define changeBlockAction qaNGOCtpYFACnamv
+#define getHttpCollcetionViewModellArray KVLNyVLqZDQhesaX
+#define getHttpCollcetionViewModellTwoArray bKcJLJLqPYbXEbdp
+#define getHttpMineMoreCollectionViewCellModel AsWMpAwsEduNsBFM
+#define getSaveApplicationsHttpCmd zgavdkDywxXFwLVp
+#define httpSaveApplicationListHttpResultResponse BOgyLQLbaDsHCtpE
+#define httpSelectCompanyHttpResultResponse mKKCvVhvElwcaAIu
+#define gotoCompanyListVC uVMVTKmaIIvMDIUK
+#define SelectCompanyViewController PyoEQHesIftTcmnq
+#define actionCompanyHttpGCD gIzGDbsFqoWeKtem
+#define actiondepartmentHttpGCD ZTEpDXTsQHbFZMGx
+#define myApplicationAction rcFCvhsqjAJanSfF
+#define downloadOpenApp HTVqvIWJZWnddKgx
+#define oftenApplicationType DQASVgQpkdsBBCEG
+#define HTHttpConfig opuVIGIPGpeihmID
+#define kServiceAddressURL1 zVRSscvuqxtPNtXN
+#define imageURL1 RUNzLIDspvvHkxsl
+#define kServiceAddressURL YTCjXRAbzMPXYbpH
+#define imageURL fbpMSOUilwcVwEkv
+#define kServiceAddressURL2 FNqfreFWrmKzuMRH
+#define imageURL2 nARMoFowKNnWrJDg
+#define HomeViewController TqtwBCrxUcTmpMTU
+#define actionHttpGCD PBZOdEoMhKeiKHuJ
+#define getHttpHomeClassListCmd bydJYDCXBMNgvQMJ
+#define httpHttpHomeClassListResultResponse YkZLtNxGOwGQTgvC
+#define getUpcomingCountHttpPostCmd eKnScBxzsJhWPZWO
+#define httpUpcomingCountHttpResultResponse UaudbSoXBurJdSCy
+#define getMessageNunberShowHttpPostCmd SjnQXiyHuMlsETUF
+#define httpMessageNumberShowHttpResultResponse pHeDxocJVqpftfOh
 #endif