添加资讯web页面

MobilePortal/MobilePortal.xcodeproj/project.pbxproj

@@ -510,9 +510,6 @@
 		B5A97FC5257F5891007B1AF8 /* IDMWeChatBindingHttpPostCmdTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A97FC4257F5891007B1AF8 /* IDMWeChatBindingHttpPostCmdTest.swift */; };
 		B5A980862580CB15007B1AF8 /* SinglePointWeChatVC+IdmWeChat.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A980852580CB14007B1AF8 /* SinglePointWeChatVC+IdmWeChat.swift */; };
 		B5A980882580D301007B1AF8 /* WeChatBindingVC+IdmHttp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A980872580D301007B1AF8 /* WeChatBindingVC+IdmHttp.swift */; };
-		B5AD2BC228325980006BA9CF /* ScanKitFrameWork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5AD2BC028325980006BA9CF /* ScanKitFrameWork.framework */; };
-		B5AD2BC328325980006BA9CF /* ScanKitFrameWorkBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B5AD2BC128325980006BA9CF /* ScanKitFrameWorkBundle.bundle */; };
-		B5AD2BE0283259AD006BA9CF /* ScanKitFrameWork.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B5AD2BC028325980006BA9CF /* ScanKitFrameWork.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5B7AFC124F35523007E3E3E /* SinglePointWeChatVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B7AFC024F35523007E3E3E /* SinglePointWeChatVC.swift */; };
 		B5B7AFC324F35547007E3E3E /* SinglePointWeChatVC+LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B7AFC224F35547007E3E3E /* SinglePointWeChatVC+LoginView.swift */; };
 		B5B7AFC524F35562007E3E3E /* SinglePointWeChatVC+Http.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B7AFC424F35562007E3E3E /* SinglePointWeChatVC+Http.swift */; };
@@ -663,7 +660,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B5AD2BE0283259AD006BA9CF /* ScanKitFrameWork.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1452,8 +1448,6 @@
 		B5A97FC4257F5891007B1AF8 /* IDMWeChatBindingHttpPostCmdTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IDMWeChatBindingHttpPostCmdTest.swift; sourceTree = "<group>"; };
 		B5A980852580CB14007B1AF8 /* SinglePointWeChatVC+IdmWeChat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SinglePointWeChatVC+IdmWeChat.swift"; sourceTree = "<group>"; wrapsLines = 1; };
 		B5A980872580D301007B1AF8 /* WeChatBindingVC+IdmHttp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WeChatBindingVC+IdmHttp.swift"; sourceTree = "<group>"; wrapsLines = 1; };
-		B5AD2BC028325980006BA9CF /* ScanKitFrameWork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ScanKitFrameWork.framework; sourceTree = "<group>"; };
-		B5AD2BC128325980006BA9CF /* ScanKitFrameWorkBundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ScanKitFrameWorkBundle.bundle; sourceTree = "<group>"; };
 		B5B7AFC024F35523007E3E3E /* SinglePointWeChatVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SinglePointWeChatVC.swift; sourceTree = "<group>"; wrapsLines = 1; };
 		B5B7AFC224F35547007E3E3E /* SinglePointWeChatVC+LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SinglePointWeChatVC+LoginView.swift"; sourceTree = "<group>"; wrapsLines = 1; };
 		B5B7AFC424F35562007E3E3E /* SinglePointWeChatVC+Http.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SinglePointWeChatVC+Http.swift"; sourceTree = "<group>"; wrapsLines = 1; };
@@ -1631,7 +1625,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				179EF499231E68270085BCDB /* CoreTelephony.framework in Frameworks */,
-				B5AD2BC228325980006BA9CF /* ScanKitFrameWork.framework in Frameworks */,
 				B59715B52465269900E5D7D5 /* iflyMSC.framework in Frameworks */,
 				179EF48F231E67F60085BCDB /* SystemConfiguration.framework in Frameworks */,
 				B5D5353224346D6B00CA1E07 /* GLKit.framework in Frameworks */,
@@ -3893,8 +3886,6 @@
 		B5AD2BBF28325980006BA9CF /* ScanKit */ = {
 			isa = PBXGroup;
 			children = (
-				B5AD2BC028325980006BA9CF /* ScanKitFrameWork.framework */,
-				B5AD2BC128325980006BA9CF /* ScanKitFrameWorkBundle.bundle */,
 			);
 			path = ScanKit;
 			sourceTree = "<group>";
@@ -4410,7 +4401,6 @@
 				17458071231F9D00008976CC /* MineInfoTableViewCell.xib in Resources */,
 				1787F6AF231F57760087B20E /* MBProgressHUD.bundle in Resources */,
 				179EF4AC231E6EEC0085BCDB /* meta_vad_16k.jet in Resources */,
-				B5AD2BC328325980006BA9CF /* ScanKitFrameWorkBundle.bundle in Resources */,
 				B57312DE243C82DE003B07FC /* CustomerTableViewCell.xib in Resources */,
 				B529504A2473B4A90001A4B9 /* voice_play_animation_4.png in Resources */,
 				174580C7231FAA81008976CC /* ServiceCollectionViewCell.xib in Resources */,
@@ -5306,13 +5296,12 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.4;
+				CURRENT_PROJECT_VERSION = 3.4;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/MobilePortal/Thirdparty/ScanKit",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/MobilePortal/PrefixHeader.pch";
 				INFOPLIST_FILE = MobilePortal/Info.plist;
@@ -5326,7 +5315,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 2.4;
+				MARKETING_VERSION = 3.4;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -5407,13 +5396,12 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.4;
+				CURRENT_PROJECT_VERSION = 3.4;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/MobilePortal/Thirdparty/ScanKit",
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/MobilePortal/PrefixHeader.pch";
 				INFOPLIST_FILE = MobilePortal/Info.plist;
@@ -5427,7 +5415,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 2.4;
+				MARKETING_VERSION = 3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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

@@ -739,15 +739,15 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "AEA6C03B-20DF-4D5B-A59D-FE8036791202"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift"
             timestampString = "651764072.746172"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "212"
-            endingLineNumber = "212"
+            startingLineNumber = "215"
+            endingLineNumber = "215"
             landmarkName = "webView(_:createWebViewWith:for:windowFeatures:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -763,13 +763,13 @@
             timestampString = "651764072.746362"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "143"
-            endingLineNumber = "143"
+            startingLineNumber = "146"
+            endingLineNumber = "146"
             landmarkName = "webView(_:didFail:withError:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8579"
+                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - e4f524b5061a8624"
                   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 = "122"
-                  endingLineNumber = "122"
-                  offsetFromSymbolStart = "480">
+                  startingLineNumber = "143"
+                  endingLineNumber = "143"
+                  offsetFromSymbolStart = "522">
                </Location>
                <Location
-                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - 4475a31735ebb9aa"
+                  uuid = "9D90046A-9ADF-4884-BC26-1C680A71C079 - 4475a31735ebbaf7"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -794,9 +794,9 @@
                   urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController+WKDelegate.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "122"
-                  endingLineNumber = "122"
-                  offsetFromSymbolStart = "20">
+                  startingLineNumber = "143"
+                  endingLineNumber = "143"
+                  offsetFromSymbolStart = "45">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -1176,31 +1176,31 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "6312BB34-7BAD-47BC-853C-AA0C88000C32"
+            uuid = "8126E197-AD95-4B49-A44F-689352F5B00C"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "163"
-            endingLineNumber = "163"
-            landmarkName = "setwebView(strUrl:)"
+            startingLineNumber = "199"
+            endingLineNumber = "199"
+            landmarkName = "setHTTPCookie(count:host:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "8126E197-AD95-4B49-A44F-689352F5B00C"
+            uuid = "4A5C14D5-C541-462D-B3ED-7CE013B99E16"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "198"
-            endingLineNumber = "198"
+            startingLineNumber = "208"
+            endingLineNumber = "208"
             landmarkName = "setHTTPCookie(count:host:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1208,45 +1208,125 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "4A5C14D5-C541-462D-B3ED-7CE013B99E16"
+            uuid = "2B565E8D-CD6B-4933-841C-9FFD7042C0FC"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "207"
-            endingLineNumber = "207"
-            landmarkName = "setHTTPCookie(count:host:)"
+            startingLineNumber = "161"
+            endingLineNumber = "161"
+            landmarkName = "setwebView(strUrl:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "2B565E8D-CD6B-4933-841C-9FFD7042C0FC - 529b496f2aee1c82"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "MobilePortal.WebSwiftViewController.setwebView(strUrl: Swift.String) -&gt; ()"
+                  moduleName = "MobilePortal"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "160"
+                  endingLineNumber = "160"
+                  offsetFromSymbolStart = "4468">
+               </Location>
+               <Location
+                  uuid = "2B565E8D-CD6B-4933-841C-9FFD7042C0FC - 529b496f2aee1c82"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "MobilePortal.WebSwiftViewController.setwebView(strUrl: Swift.String) -&gt; ()"
+                  moduleName = "MobilePortal"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/caiyang/GitProject/SH_OrderLifeCycleU/SH_OrderLifeCycleU/MobilePortal/MobilePortal/VC/Web/WebSwiftViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "160"
+                  endingLineNumber = "160"
+                  offsetFromSymbolStart = "7933">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "581F048B-F524-497F-8B82-B5701E72F830"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7300E22D-2C51-48BD-B703-14AC0E6E1DC1"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "MobilePortal/VC/Web/WebSwiftTwoViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "34"
+            endingLineNumber = "34"
+            landmarkName = "addWebView()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "2B565E8D-CD6B-4933-841C-9FFD7042C0FC"
+            uuid = "2DD5190B-48E5-462A-B329-514D5597639A"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "MobilePortal/VC/Web/WebSwiftTwoViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "40"
+            endingLineNumber = "40"
+            landmarkName = "addWebView()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "14DC4AA4-384B-4616-87F7-59B7F717AE30"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "160"
-            endingLineNumber = "160"
+            startingLineNumber = "174"
+            endingLineNumber = "174"
             landmarkName = "setwebView(strUrl:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "581F048B-F524-497F-8B82-B5701E72F830"
-            shouldBeEnabled = "Yes"
+            uuid = "B364DA77-95D2-4A48-8D90-646D9420EBB8"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            scope = "1"
-            stopOnStyle = "0">
+            filePath = "MobilePortal/VC/Web/WebSwiftViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "132"
+            endingLineNumber = "132"
+            landmarkName = "setStatusBarBackgroundColor()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

MobilePortal/MobilePortal/AppDelegate.swift

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

MobilePortal/MobilePortal/Base/BaseEnumFunc.swift

@@ -8,6 +8,14 @@
 
 import UIKit
 
+/// 是否是TabBar页面
+enum IsTabBarVC: String{
+    ///TabBar 页面
+    case isTabBarVC
+    /// 非TabBar页面
+    case noIsTabBarVC
+}
+
 /// 应用的服务范围
 enum IsUMSMessageType: String{
     /// 消息统一平台

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Headers/HmsBitMap.h

-//
-//
-//  Copyright (c) Huawei Technologies Co., Ltd. 2020-2028. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
-#import "HmsScanFormat.h"
-#import <AVFoundation/AVFoundation.h>
-
-@interface HmsBitMap : NSObject
-/*
-get result from the UIImage
-*/
-+(NSDictionary *)bitMapForImage:(UIImage *)image withOptions:(HmsScanOptions *)options;
-
-
-/*
-get multiple result from the UIImage
-*/
-+ (NSArray *)multiDecodeBitMapForImage:(UIImage *)image withOptions:(HmsScanOptions *)options;
-
-/*
- get result from the sampleBuffer
-*/
-+(NSDictionary *)bitMapForSampleBuffer:(CMSampleBufferRef)sampleBuffer withOptions:(HmsScanOptions *)options;
-
-/*
- get multiple result from the sampleBuffer
-*/
-+(NSArray *)multiDecodeBitMapForSampleBuffer:(CMSampleBufferRef)sampleBuffer withOptions:(HmsScanOptions *)options;
-
-@end

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Headers/HmsCustomScanViewController.h

-//
-//
-//  Copyright (c) Huawei Technologies Co., Ltd. 2020-2028. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "HmsScanFormat.h"
-
-@class HmsCustomScanViewController;
-@protocol CustomizedScanDelegate <NSObject>
-@optional
-/*CustomizedScan Delegate
- Data returned by code scanning
-*/
-- (void)customizedScanDelegateForResult:(NSDictionary *)resultDic;
-
-@end
-
-@interface HmsCustomScanViewController : UIViewController
-@property (nonatomic, weak) id <CustomizedScanDelegate> customizedScanDelegate;
-
-/*
- set scan format
-*/
--(instancetype)initCustomizedScanWithFormatType:(HmsScanOptions *)scanOptions;
-
-/*
- hide back button bool, (ture: show; false: hide) defaults to show
- */
-@property (nonatomic) BOOL backButtonHidden;
-
-/*
- Identification area
- */
-@property (nonatomic) CGRect cutArea;
-
-/*
- Bool, (ture:continue scanning; false:end scanning and viewController can be back), defaults to end scanning
- */
-@property (nonatomic) BOOL continuouslyScan;
-
-/*
- back action
- */
--(void)backAction;
-
-@end

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Headers/HmsDefaultScanViewController.h

-//
-//
-//  Copyright (c) Huawei Technologies Co., Ltd. 2020-2028. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "HmsScanFormat.h"
-
-@protocol DefaultScanDelegate <NSObject>
-@optional
-/*DefaultScan Delegate
-  Data returned by code scanning
- */
-- (void)defaultScanDelegateForDicResult:(NSDictionary *)resultDic;
-
-/*DefaultScan Delegate
-  Data returned by album pictures
- */
-- (void)defaultScanImagePickerDelegateForImage:(UIImage *)image;
-
-@end
-
-@interface HmsDefaultScanViewController : UIViewController
-@property (nonatomic, weak) id <DefaultScanDelegate> defaultScanDelegate;
-
-/*
- set scan format
-*/
--(instancetype)initDefaultScanWithFormatType:(HmsScanOptions *)scanOptions;
-
-@end

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Headers/HmsMultiFormatWriter.h

-//
-//
-//  Copyright (c) Huawei Technologies Co., Ltd. 2020-2028. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "HmsScanFormat.h"
-
-@interface HmsMultiFormatWriter : NSObject
-
-/*Error
-   * Thrown when a barcode was successfully detected and decoded, but
-   * was not returned because its checksum feature failed.
-   code  = 1000,
-
-   * Thrown when a barcode was successfully detected, but some aspect of
-   * the content did not conform to the barcode's format rules. This could have
-   * been due to a mis-detection.
-   code  = 1001,
-
-   * Thrown when a barcode was not found in the image. It might have been
-   * partially detected but could not be confirmed.
-   code  = 1002,
-
-   * Thrown when an exception occurs during Reed-Solomon decoding, such as when
-   * there are too many errors to correct.
-   code  = 1003,
-
-   * This general error is thrown when something goes wrong during decoding of a barcode.
-   * This includes, but is not limited to, failing checksums / error correction algorithms, being
-   * unable to locate finder timing patterns, and so on.
-   code   = 1004,
-
-   * Covers the range of error which may occur when encoding a barcode using the Writer framework.
-   code  = 1005,
-*/
-+ (UIImage *)createCodeWithString:(NSString*)str size:(CGSize)size CodeFomart:(HMSScanFormatTypeCode)format error:(NSError **)error;
-
-@end

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Headers/HmsScanFormat.h

-//
-//
-//  Copyright (c) Huawei Technologies Co., Ltd. 2020-2028. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef NS_ENUM(int, HMSScanFormatTypeCode) {
-    AZTEC         = 1 << 0,
-    CODABAR       = 1 << 1,
-    CODE_39       = 1 << 2,
-    CODE_93       = 1 << 3,
-    CODE_128      = 1 << 4,
-    DATA_MATRIX   = 1 << 5,
-    EAN_8         = 1 << 6,
-    EAN_13        = 1 << 7,
-    ITF           = 1 << 8,
-    PDF_417       = 1 << 9,
-    QR_CODE       = 1 << 10,
-    UPC_A         = 1 << 11,
-    UPC_E         = 1 << 12,
-    ALL           = (1<<13)-1
-};
-
-@interface HmsScanOptions : NSObject
-
-@property (nonatomic, assign) unsigned int scanFormatType;
-@property (nonatomic, assign) BOOL photoMode;
-
-- (instancetype)initWithScanFormatType:(unsigned int)type;
-- (instancetype)initWithScanFormatType:(unsigned int)type Photo:(BOOL)photo;
-
-@end

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Headers/ScanKitFrameWork.h

-//
-//
-//  Copyright (c) Huawei Technologies Co., Ltd. 2020-2028. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "HmsDefaultScanViewController.h"
-#import "HmsCustomScanViewController.h"
-#import "HmsBitMap.h"
-#import "HmsMultiFormatWriter.h"
-#import "HmsScanFormat.h"
-
-
-//! Project version number for ScanKitFrameWork.
-FOUNDATION_EXPORT double ScanKitFrameWorkVersionNumber;
-
-//! Project version string for ScanKitFrameWork.
-FOUNDATION_EXPORT const unsigned char ScanKitFrameWorkVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ScanKitFrameWork/PublicHeader.h>
-
-

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/LICENSE

-1. Introduction
-1.1 The HUAWEI ScanKit Kit for iOS (referred to in the License Agreement as the "SDK") is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Huawei in relation to your use of the SDK.
-1.2 "HUAWEI ScanKit Kit" means a software development kit allows your apps to easily leverage Huawei's long-term proven expertise in machine learning to support diverse artificial intelligence (AI) applications throughout a wide range of industries. Introduction of HUAWEI ScanKit Kit can be found at the following URL: https://developer.huawei.com/consumer/en/hms/huawei-mlkit, as updated from time to time.
-1.3"Huawei" means Huawei Device Co., Ltd, a Chinese multinational technology company with principal place of business at Songshan Lake Science and Technology Industrial Zone, Dongguan, Guangdong, China, 523808.
-1.4 "iOS" means a mobile operating system created and developed by Apple Inc.
-2. Accepting this License Agreement
-2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement.
-2.2 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK.
-2.3 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
-3. SDK License from Huawei
-3.1 Subject to the terms of the License Agreement, Huawei grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for iOS. 3.2 You may not use this SDK to develop applications for other platforms (including Android) or to develop another SDK. You are of course free to develop applications for other platforms, including Android, provided that this SDK is not used for that purpose.
-3.3 You agree that Huawei or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Huawei reserves all rights not expressly granted to you.
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. You may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.
-3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.
-3.6 You agree that the form and nature of the SDK that Huawei provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Huawei may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Huawei's sole discretion, without prior notice to you.
-3.7 Nothing in the License Agreement gives you a right to use any of Huawei's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
-3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
-4. Use of the SDK by You
-4.1 Huawei agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
-4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
-4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Huawei Account information, your application may only use that information to access the user's Huawei Account when, and for the limited purposes for which, the user has given you permission to do so.
-4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Huawei or any mobile communications carrier.
-4.5 You agree that you are solely responsible for (and that Huawei has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through iOS and/or applications for iOS, and for the consequences of your actions (including any loss or damage which Huawei may suffer) by doing so.
-4.6 You agree that you are solely responsible for (and that Huawei has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Huawei or any third party may suffer) of any such breach.
-5. Your Developer Credentials
-5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Huawei or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
-6. Privacy and Information
-6.1 In order to continually innovate and improve the SDK, Huawei may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
-6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Huawei's Privacy Policy.
-7. Third Party Applications
-7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Huawei is not responsible for those applications, data, content, or resources. You understand that such third party applications through which you may access data, content or resources are the sole responsibility of the person and that Huawei is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
-7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
-7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties.
-8. Using Huawei APIs in the SDK
-8.1 Huawei APIs in the SDK
-8.1.1 If you use any API to retrieve data from Huawei, you acknowledge that the data may be protected by intellectual property rights which are owned by Huawei or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
-8.1.2 If you use any API to retrieve a user's data from Huawei, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
-9. Terminating this License Agreement
-9.1 The License Agreement will continue to apply until terminated by either you or Huawei as set out below.
-9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
-9.3 Huawei may at any time, terminate the License Agreement with you if: (A) you have breached any provision of the License Agreement; or (B) Huawei is required to do so by law; or (C) the partner with whom Huawei offered certain parts of SDK (such as APIs) to you has terminated its relationship with Huawei or ceased to offer certain parts of the SDK to you; or (D) Huawei decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Huawei is, in Huawei's sole discretion, no longer commercially viable.
-9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Huawei have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
-10. DISCLAIMER OF WARRANTIES
-10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM HUAWEI.
-10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
-10.3 HUAWEI FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-11. LIMITATION OF LIABILITY
-11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT HUAWEI, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT HUAWEI OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
-12. Indemnification
-12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Huawei, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement.
-13. Changes to the License Agreement
-13.1 Huawei may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Huawei will make a new version of the License Agreement available on the website where the SDK is made available.
-14. General Legal Terms
-14.1 The License Agreement constitutes the whole legal agreement between you and Huawei and governs your use of the SDK (excluding any services which Huawei may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Huawei in relation to the SDK.
-14.2 You agree that if Huawei does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Huawei has the benefit of under any applicable law), this will not be taken to be a formal waiver of Huawei's rights and that those rights or remedies will still be available to Huawei.
-14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable.
-14.4 You acknowledge and agree that each member of the group of companies of which Huawei is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement.
-14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
-14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Huawei without the prior written approval of the other party. Neither you nor Huawei shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party.
-14.7 The License Agreement, and your relationship with Huawei under the License Agreement, shall be governed by the laws of the People's Republic of China. You and Huawei agree to submit to the exclusive jurisdiction of the courts located within Shenzhen, Guangdong Province to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Huawei shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/Modules/module.modulemap

-framework module ScanKitFrameWork {
-  umbrella header "ScanKitFrameWork.h"
-
-  export *
-  module * { export * }
-}

MobilePortal/MobilePortal/Thirdparty/ScanKit/ScanKitFrameWork.framework/README.md

-# ScanKit iOS SDK
-
-ScanKit  Huawei code scanning service（Scan Kit）Provide convenient barcode and QR code scanning, parsing, generation capabilities, help you quickly build the scanning function in the application.
-
-Thanks to Huawei's ability to accumulate in the field of computer vision, Scan Kit can realize the detection and automatic amplification of long-distance code or small code. At the same time, it makes targeted identification optimization for common complex code scanning scenes (such as reflection, dark light, stain, blur, cylinder), so as to improve the success rate of code scanning and user experience.
-
-## SDK Access
-
-### Add SDK
-
-1. Open a command line window and 'cd' to the location of the Xcode project.
-2. Create a 'Podfile' file. If it already exists, skip this step.
-```
-cd project-directory 
-pod init
-```
-3. Add the pod of SDK to podfile. The currently supported services are shown in the following table.
-```
-pod 'ScanKitFrameWork', '~> 1.0.1.300'
-```
-|service|collocation method|
-|----|-----|
-|Certification services|pod ‘ScanKitFrameWork’|
-
-4. install pod，Then open it .xcworkspace file add view the project。
-```
-pod install
-```
-
-## LICENSE
-
-see[Huawei License file](./LICENSE)
-

MobilePortal/MobilePortal/VC/Advisory/AdvisoryViewController.storyboard

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -64,7 +62,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="LJR-wM-KyR" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="8" y="112"/>
+            <point key="canvasLocation" x="-593" y="63"/>
         </scene>
     </scenes>
     <resources>

MobilePortal/MobilePortal/VC/QRCode/QRCodeSwiftView.m

@@ -16,7 +16,7 @@
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <CoreLocation/CoreLocation.h>
 #import "UIView+Additions.h"
-#import <ScanKitFrameWork/ScanKitFrameWork.h>
+//#import <ScanKitFrameWork/ScanKitFrameWork.h>
 @interface QRCodeSwiftView ()<AVCaptureMetadataOutputObjectsDelegate,AVCaptureVideoDataOutputSampleBufferDelegate>{
     int num;
     BOOL upOrdown;
@@ -27,7 +27,7 @@
 @property (strong,nonatomic)AVCaptureDeviceInput * input;
 //@property (strong,nonatomic)AVCaptureMetadataOutput * output;
 @property (strong,nonatomic)AVCaptureVideoDataOutput * output;
-@property (strong,nonatomic)HmsScanOptions *options;
+//@property (strong,nonatomic)HmsScanOptions *options;
 @property (strong,nonatomic)AVCaptureSession * session;
 @property (strong,nonatomic)AVCaptureVideoPreviewLayer * preview;
 @property (nonatomic, strong) UIImageView * line;
@@ -204,7 +204,7 @@
     _preview.frame =self.layer.bounds;
     [self.layer insertSublayer:_preview atIndex:0];
 //    _options = [[HmsScanOptions alloc] initWithScanFormatType:ALL];
-    _options = [[HmsScanOptions alloc] initWithScanFormatType:ALL];
+//    _options = [[HmsScanOptions alloc] initWithScanFormatType:ALL];
 //    typedef NS_ENUM(int, HMSScanFormatTypeCode) {
 //        AZTEC         = 1 << 0,
 //        CODABAR       = 1 << 1,
@@ -236,16 +236,16 @@
     // QR_CODE | DATA_MATRIX表示只扫描QR和DataMatrix的码
 //    HmsScanOptions *options = [[HmsScanOptions alloc] initWithScanFormatType:ALL];
     // 获取单码结果
-    NSDictionary *sampleBufferDic = [HmsBitMap bitMapForSampleBuffer:sampleBuffer withOptions:_options];
-    
-    if (sampleBufferDic && [sampleBufferDic objectForKey:@"parserDic"] && ![[sampleBufferDic objectForKey:@"parserDic"] isEqual:[NSNull null]]) {
-        NSLog(@"dic==%@",sampleBufferDic);
-        NSLog(@"parserDic==%@",[sampleBufferDic objectForKey:@"parserDic"]);
-        NSDictionary *parserDic = [sampleBufferDic objectForKey:@"parserDic"];
-        [_session stopRunning];
-        [timer setFireDate:[NSDate distantFuture]];
-        [self.delegate getQRCodeSwiftViewValue:[parserDic objectForKey:@"result"]];
-    }
+//    NSDictionary *sampleBufferDic = [HmsBitMap bitMapForSampleBuffer:sampleBuffer withOptions:_options];
+//
+//    if (sampleBufferDic && [sampleBufferDic objectForKey:@"parserDic"] && ![[sampleBufferDic objectForKey:@"parserDic"] isEqual:[NSNull null]]) {
+//        NSLog(@"dic==%@",sampleBufferDic);
+//        NSLog(@"parserDic==%@",[sampleBufferDic objectForKey:@"parserDic"]);
+//        NSDictionary *parserDic = [sampleBufferDic objectForKey:@"parserDic"];
+//        [_session stopRunning];
+//        [timer setFireDate:[NSDate distantFuture]];
+//        [self.delegate getQRCodeSwiftViewValue:[parserDic objectForKey:@"result"]];
+//    }
     
 }
 - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:(NSArray *)metadataObjects fromConnection:(AVCaptureConnection *)connection

MobilePortal/MobilePortal/VC/RootTabBarVC/RootTabBarViewController.swift

@@ -67,11 +67,18 @@ class RootTabBarViewController: UITabBarController,UITabBarControllerDelegate {
         return self.getNavigationWithVc(vc: homevc, title: "首页", img1: "tabbar_one_nor", selectImg:"tabbar_one_select")
     }
     func gainAdvisory()->UINavigationController{
-        let vc:AdvisoryRootViewController=AdvisoryRootViewController()
-        
+//        let vc:AdvisoryRootViewController=AdvisoryRootViewController()
+        let vc:WebSwiftViewController = WebSwiftViewController()
+//        let vc:WebSwiftTwoViewController = WebSwiftTwoViewController()
+        vc.isShowTitleType = IsShowTitleType.NoShowTitleType
+        vc.newType = NewType.OrdinaryNewsType
+        vc.appid = ""
+        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")
     }
-    
     func gainService()->UINavigationController{
 //        let vc:ServiceViewController=ServiceViewController()
         let vc:UpcomingViewController = UpcomingViewController()

MobilePortal/MobilePortal/VC/Web/WebSwiftTwoViewController.swift

@@ -30,18 +30,24 @@ class WebSwiftTwoViewController: BaseViewController {
         // Do any additional setup after loading the view.
     }
     func addWebView(){
-        if #available(iOS 11.0, *) {
-            webView.frame = CGRect(x:0, y: getStatusBarH(), width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()+HEIGHT_BOTTOM_MARGIN()-getStatusBarH() )
+        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() )
+            //            setStatusBarBackgroundColor()
         }else{
-            webView.frame = CGRect(x:0, y: 0, width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()+HEIGHT_BOTTOM_MARGIN())
+            self.navigationController?.setNavigationBarHidden(false, animated: true)
+            self.wr_setNavBarBackgroundAlpha(1)
+            self.wr_setNavBarShadowImageHidden(false)
+            if #available(iOS 11.0, *) {
+                webView.frame = CGRect(x:0, y: getStatusBarH(), width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()+HEIGHT_BOTTOM_MARGIN()-getStatusBarH() )
+                //                WKWebsiteDataStore.default().httpCookieStore
+            }else{
+                webView.frame = CGRect(x:0, y: 0, width:SCREEN_WHIDTH() , height:SCREEN_HEIGHT()+HEIGHT_BOTTOM_MARGIN())
+            }
         }
-        let count = self.getWebCookie(urlStr: self.webViewUrl)
         let url2:NSURL = NSURL.init(string: WebActionOC.share().getUrl(self.webViewUrl))!
         let urlRequest:NSMutableURLRequest = NSMutableURLRequest.init(url: url2 as URL)
-//        urlRequest.setValue(WebActionOC.share()?.getCookieValue((WebActionOC.share()?.encryptAES(count, key: self.appid))!, andWebView: webView) as String?, forHTTPHeaderField: "Cookie")
-        
-        self.view.addSubview(webView)
-//        webView.load((urlRequest as NSMutableURLRequest) as URLRequest, mimeType: )
         webView.loadRequest(urlRequest as URLRequest)
         
         

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

@@ -8,21 +8,21 @@
 
 import Foundation
 import UIKit
-import ScanKitFrameWork
+//import ScanKitFrameWork
 
 extension WebSwiftViewController {
     
-    func gotoQRVC() {
-        self.hmsCustomScanViewController = HmsCustomScanViewController()
-        self.hmsCustomScanViewController.customizedScanDelegate = self
-        self.hmsCustomScanViewController.backButtonHidden = false
-        self.hmsCustomScanViewController.continuouslyScan = true
-        self.pushViewController(viewController: self.hmsCustomScanViewController, animated: true)
-        
-    }
+//    func gotoQRVC() {
+//        self.hmsCustomScanViewController = HmsCustomScanViewController()
+//        self.hmsCustomScanViewController.customizedScanDelegate = self
+//        self.hmsCustomScanViewController.backButtonHidden = false
+//        self.hmsCustomScanViewController.continuouslyScan = true
+//        self.pushViewController(viewController: self.hmsCustomScanViewController, animated: true)
+//
+//    }
     
-    func customizedScanDelegate(forResult resultDic: [AnyHashable : Any]!) {
-        print(resultDic)
-    }
+//    func customizedScanDelegate(forResult resultDic: [AnyHashable : Any]!) {
+//        print(resultDic)
+//    }
     
 }

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

@@ -11,6 +11,9 @@ import UIKit
 extension WebSwiftViewController {
     @available(iOS 8.0, *)
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        if self.isTabBarVC == IsTabBarVC.isTabBarVC {
+            return
+        }
         if self.title == nil || self.title?.count == 0 {
             self.title = webView.title
             if webView.title?.count == 0 {

MobilePortal/MobilePortal/VC/Web/WebSwiftViewController.swift

@@ -8,10 +8,11 @@
 
 import UIKit
 //import GGWkCookie
-import ScanKitFrameWork
-
-class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelegate,WKScriptMessageHandler,CustomizedScanDelegate {
+//import ScanKitFrameWork
+//CustomizedScanDelegate
+class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelegate,WKScriptMessageHandler {
     var newType:NewType = .OrdinaryNewsType
+    var isTabBarVC:IsTabBarVC = .noIsTabBarVC
     var isShowTitleType:IsShowTitleType = .YesShowTitleType
     var isHomePushType:IsHomePushType = .YesIsHomePushType
     var webViewUrl:String?
@@ -29,7 +30,7 @@ class WebSwiftViewController: BaseViewController,WKUIDelegate,WKNavigationDelega
     
     var webCookieArray = NSArray()
     
-    var hmsCustomScanViewController = HmsCustomScanViewController()
+//    var hmsCustomScanViewController = HmsCustomScanViewController()
     var documentController = UIDocumentInteractionController()
     
     ///js调用原生方法名

MobilePortal/MobilePortal/codeObfuscation.h

 #ifndef Demo_codeObfuscation_h
 #define Demo_codeObfuscation_h
-//confuse string at Mon Dec  9 10:41:09 CST 2024
-#define BaseViewController ILwCQfrgtvsKKZPB
-#define myTableView GcuZAgOvNXHCDZwc
-#define setCacheAccountInfo CtQyqEWaCyLgyysv
-#define setClassWebUrlAccountInfo mzSQcqdzsoXOvLtZ
-#define setWebUrlAction DrtGrdyjDDwZUYsP
-#define SinglePointWeChatVC VAHXbRmxCaExylqy
-#define onLogin wDRRFjcNdJDFeEmJ
-#define getLoginTypeHttpAction DaNbwPpOOACOEJvb
-#define loginTypeHttpGetCmdTypeAction LuhmFoJXtSVpOztX
-#define getScopeListHttpCmd VNMELGpYtAyvPVIo
-#define selectSinglePointTypeAction OrdkEUqIuQIYcSXw
-#define getLoginHttpPostCmdCmd jzRhbVHTxgRYcjoR
-#define httpLoginHttpPostResultResponse dqSaaCNYEkkiPvlE
-#define getNewVersionUpdateHttpCmd OXXsPpUCPeefRAXY
-#define getLoginDeviceInformationHttpCmd oJmruVubzIofshEa
-#define getMyInformationHttpGetCmd AngvmCVxEBDxHKKg
-#define getVerifyTokenHttpPostCmdAction lSmesTUzSkQVKPhm
-#define httpVerifyTokenHttpResultResponse CcbDwsknsYRqrRiA
-#define loginGetUserInfo PPgKrBqsJxqVwkiW
-#define httpSinglePointinfoHttpResultResponse aUdIEZwEMbqebRDY
-#define getWeChatXinfoHttpPostCmd LwcBopfQvHPGIzpc
-#define getWeChatBindingHttpPostCmd ktLChsAYQOxvDZVW
-#define httpWeChatXinfoHttpResultResponse GrcNwBBFoXNPapHz
-#define SinglePointWeChatHttp ecelcCoRKDrfVEZV
-#define judgmentTokenExpired(resultBlock:@escaping dOAPpqEIRvqBowit
-#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping VIThTdJoHqwbopGb
-#define getRefreshTokenHttpPostCmd(resultBlock:@escaping mCwKssRblCKCuSxY
-#define func aUTZXeVPShdeUnPL
-#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping nHtFnnerHMucMcwf
-#define httpDeviceInformationHttpResultResponse(result: TFPoecYrOMqFdtsd
-#define LoginViewController KALpNQazLOKvrorR
-#define WeChatBindingViewController KgqbzgOtjgrKxLWU
-#define SinglePointViewController IWrTumjQJWKEspoY
-#define MineViewController mnfgkKlhDtGrBqpz
-#define getSelectCompanyHttpCmd jXTETCnPFJqOesmz
-#define httpSelectCompanyHttpResultResponse IggftnjaSrIYfJwz
-#define SelectCompanyViewController mYGLAHKlxbHjlcWO
-#define MineMoreViewController PgrNKAwzlNsoDgme
-#define WebSwiftViewController WSpyzTKeBdreKNDA
-#define webView ZzERnOsKbXwytQhg
-#define webViewUrl nrCESTIEXgjocUrx
-#define appid iDooyZgktHfjLKHy
-#define webActionTitle GzyveEEknVxycZJY
-#define setwebView WOlNQuFQZTeHUUMN
-#define backPrevious cEppfblbLBmGZDGv
-#define WebActionOC DZpoadkeuxvKUjfx
-#define getUrl ccKSAthkfqhwxAfV
-#define getWebCookie LzMbYLlGHrYIIUPW
-#define encryptAES XTmdonfMHhdsBrTc
-#define decryptAES uQpsGSGcZiWTtulv
-#define ChangePassWordViewController vaIuMBfqJTxcvDsq
-#define oldTextView vavUazoXDiTBLnXb
-#define newTextView THdOcdUfurpmlYqf
-#define confirmPassTextView TyJgLrMceHbAHMpp
-#define actionChangePassWord DOyMxYOsBpMHsjco
-#define getChangePasswordHttpCmd xrIHqbygAslLWrsI
-#define httpChangePasswordHttpResultResponse JhIlUBeGAVOLUldD
-#define getSinglePointPasswordHttpPostCmd qyZyBBnvWrOSaQEy
-#define httpSinglePointPasswordHttpResultResponse mrTYQcwaamTgxXSy
-#define loginTypeHttpGetCmdTypeAction jQjtFbaZuOvCBXBn
-#define MineMoreViewController NvIzcbhhFPLwMvjw
-#define getMyApplicationListHttpCmd dwXbUhpchLSMmkOd
-#define httpMyApplicationListHttpResultResponse uKqrpTvpEnuHKCVO
-#define getAllApplicationHttpListCmd GEbCdbjMnoWoooTt
-#define httpMoreApplicationsTwoHttpResultResponse ElkteqOUUxebDoZo
-#define changeBlockAction ZZplvEGYoGfWodNl
-#define getHttpCollcetionViewModellArray lDDXHbjzaTjTdBZo
-#define getHttpCollcetionViewModellTwoArray rMsWepGIjBPuzZbj
-#define getHttpMineMoreCollectionViewCellModel xDvgrtGhZgYGQISK
-#define getSaveApplicationsHttpCmd IbZGVOYMMpNzEnfA
-#define httpSaveApplicationListHttpResultResponse MKzXWpxdTrGhTDZS
-#define httpSelectCompanyHttpResultResponse IKSgWcZbiXRkdhna
-#define gotoCompanyListVC qQpUcthTlAUzwMAd
-#define SelectCompanyViewController bAyDEDsuxdzyJvoG
-#define actionCompanyHttpGCD cFpzzbFTZTMiNZga
-#define actiondepartmentHttpGCD UyMSUrwpKhiyuuTv
-#define myApplicationAction OlsFwHbLOPvlbRwI
-#define downloadOpenApp tWeiHXYuvRSDPjdw
-#define oftenApplicationType gCzNCnhBlxVPdBVj
-#define HTHttpConfig pkJTVvYPgoNhCObD
-#define kServiceAddressURL1 bVpAyIaobQPpznOZ
-#define imageURL1 VoxYrdLHyQWIdlld
-#define kServiceAddressURL NGngjZMmPNMWXUlS
-#define imageURL leQRQeSPpUrXOdio
-#define kServiceAddressURL2 guSnqlieoZSAlGEk
-#define imageURL2 DTnVpfBjgQkWoJqJ
-#define HomeViewController PjaGSOsTIABalhFa
-#define actionHttpGCD GHPgYxQoOHvxnLDd
-#define getHttpHomeClassListCmd TiNawKYAJDNrWCCt
-#define httpHttpHomeClassListResultResponse loRLhVvbPWscAxqN
-#define getUpcomingCountHttpPostCmd OlqvVCiIuYJldhsK
-#define httpUpcomingCountHttpResultResponse MxltVYtnOsguJTrz
-#define getMessageNunberShowHttpPostCmd TKwXOoQkMXRJCPiQ
-#define httpMessageNumberShowHttpResultResponse XEuxYIpmSGUMRRZy
+//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
 #endif