代码提交

MobilePortal/MobilePortal.xcodeproj/project.pbxproj

@@ -502,6 +502,8 @@
 		B593D19C25187B2900BDB722 /* WeChatTypeHttpPostCmd+Response.m in Sources */ = {isa = PBXBuildFile; fileRef = B593D19B25187B2900BDB722 /* WeChatTypeHttpPostCmd+Response.m */; };
 		B59715B02463E95B00E5D7D5 /* UpcomingCountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59715AF2463E95B00E5D7D5 /* UpcomingCountModel.swift */; };
 		B59715B52465269900E5D7D5 /* iflyMSC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B59715B42465269900E5D7D5 /* iflyMSC.framework */; };
+		B59B2FE32B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.m in Sources */ = {isa = PBXBuildFile; fileRef = B59B2FDE2B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.m */; };
+		B59B2FE42B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.m in Sources */ = {isa = PBXBuildFile; fileRef = B59B2FE22B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.m */; };
 		B59C319326CA10440059B911 /* QRCodeCallBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59C319226CA10440059B911 /* QRCodeCallBackViewController.swift */; };
 		B5A97FBD257E274B007B1AF8 /* IDMWeChatBindingHttpPostCmd.m in Sources */ = {isa = PBXBuildFile; fileRef = B5A97FBC257E274B007B1AF8 /* IDMWeChatBindingHttpPostCmd.m */; };
 		B5A97FC0257E2767007B1AF8 /* IDMWeChatBindingHttpPostCmd+Response.m in Sources */ = {isa = PBXBuildFile; fileRef = B5A97FBF257E2767007B1AF8 /* IDMWeChatBindingHttpPostCmd+Response.m */; };
@@ -1436,6 +1438,11 @@
 		B593D19D25187B4D00BDB722 /* WeChatTypeHttpResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeChatTypeHttpResult.h; sourceTree = "<group>"; };
 		B59715AF2463E95B00E5D7D5 /* UpcomingCountModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpcomingCountModel.swift; sourceTree = "<group>"; };
 		B59715B42465269900E5D7D5 /* iflyMSC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = iflyMSC.framework; sourceTree = "<group>"; };
+		B59B2FDE2B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerServicePowerHttpPostCmd.m; sourceTree = "<group>"; };
+		B59B2FDF2B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CustomerServicePowerHttpPostCmd+Response.h"; sourceTree = "<group>"; };
+		B59B2FE02B57CFC800B0BA1F /* CustomerServiceHttpResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerServiceHttpResult.h; sourceTree = "<group>"; };
+		B59B2FE12B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerServicePowerHttpPostCmd.h; sourceTree = "<group>"; };
+		B59B2FE22B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CustomerServicePowerHttpPostCmd+Response.m"; sourceTree = "<group>"; };
 		B59C319226CA10440059B911 /* QRCodeCallBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeCallBackViewController.swift; sourceTree = "<group>"; };
 		B5A97FBB257E274B007B1AF8 /* IDMWeChatBindingHttpPostCmd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDMWeChatBindingHttpPostCmd.h; sourceTree = "<group>"; };
 		B5A97FBC257E274B007B1AF8 /* IDMWeChatBindingHttpPostCmd.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IDMWeChatBindingHttpPostCmd.m; sourceTree = "<group>"; };
@@ -2103,6 +2110,7 @@
 		176654F92366DE5E00FCD5F3 /* HttpNew */ = {
 			isa = PBXGroup;
 			children = (
+				B59B2FDD2B57CFC800B0BA1F /* CustomerService */,
 				B525BEEE284F44AB0030844D /* ApplicationByBelong */,
 				B525BED8284F237D0030844D /* UnReadNumber */,
 				B5161DAF277311670007073E /* ApplicationDetails */,
@@ -3858,6 +3866,18 @@
 			path = API;
 			sourceTree = "<group>";
 		};
+		B59B2FDD2B57CFC800B0BA1F /* CustomerService */ = {
+			isa = PBXGroup;
+			children = (
+				B59B2FDE2B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.m */,
+				B59B2FDF2B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.h */,
+				B59B2FE12B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.h */,
+				B59B2FE22B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.m */,
+				B59B2FE02B57CFC800B0BA1F /* CustomerServiceHttpResult.h */,
+			);
+			path = CustomerService;
+			sourceTree = "<group>";
+		};
 		B5A97FB8257E270C007B1AF8 /* IDMWeChatBinding */ = {
 			isa = PBXGroup;
 			children = (
@@ -4690,6 +4710,7 @@
 				1787F69E231F56430087B20E /* SelectDepartmentListModel.swift in Sources */,
 				B5F96712256273ED0060B892 /* UpcomingListVC+NewHttp.swift in Sources */,
 				B5554EE4244010E50025F0F4 /* DialogueListModel.swift in Sources */,
+				B59B2FE32B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd.m in Sources */,
 				B505EEE524E1156D00DE6357 /* WeChatBindingViewController+LoginView.swift in Sources */,
 				174580C6231FAA81008976CC /* ServiceViewController+initCollectionView.swift in Sources */,
 				B55C250524F75B4B002EC667 /* SinglePointLoginHttpPostCmd+Response.m in Sources */,
@@ -4962,6 +4983,7 @@
 				B57312BE243AD13C003B07FC /* SetUpViewController.swift in Sources */,
 				B5EC440F246B8B2C005A0AC3 /* LXFPopUpTool.m in Sources */,
 				B5C2FE712457CB2200F03A94 /* AutonmousMoreViewController.swift in Sources */,
+				B59B2FE42B57CFC800B0BA1F /* CustomerServicePowerHttpPostCmd+Response.m in Sources */,
 				174580B5231FA6C5008976CC /* SetCompanyDepartmentTableViewCell.swift in Sources */,
 				B5EC4398246A870E005A0AC3 /* HGCategoryView.m in Sources */,
 				B53F6DFA255CCD130000468B /* UpcomingNewListPostCmd.m in Sources */,
@@ -5284,7 +5306,7 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.1;
+				CURRENT_PROJECT_VERSION = 3.3;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5304,7 +5326,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 2.1;
+				MARKETING_VERSION = 3.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -5364,9 +5386,9 @@
 					"-weak_framework",
 					"\"UserNotifications\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd_new_dis5;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTest_new_dis3;
 				SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
@@ -5385,7 +5407,7 @@
 				CODE_SIGN_ENTITLEMENTS = MobilePortal/MobilePortal.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Pharmaceutical Co., Ltd.";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2.1;
+				CURRENT_PROJECT_VERSION = 3.3;
 				DEVELOPMENT_TEAM = 7FYU37G7W6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5405,7 +5427,7 @@
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/BDVoice/BDSClientLib",
 					"$(PROJECT_DIR)/MobilePortal/Thirdparty/WXApiManager/WeChatSDK",
 				);
-				MARKETING_VERSION = 2.1;
+				MARKETING_VERSION = 3.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -5464,9 +5486,9 @@
 					"-weak_framework",
 					"\"UserNotifications\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd_new_dis5;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTest_new_dis3;
 				SWIFT_OBJC_BRIDGING_HEADER = "MobilePortal/MobilePortal-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -5585,9 +5607,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/ServiceExtension",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd.ServiceExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest.ServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd.ServiceExtension_dis3;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTestServiceExtension_dis3;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -5615,9 +5637,9 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/ServiceExtension",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalPrd.ServiceExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.shangyao.MobilePortalTest.ServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalPrd.ServiceExtension_dis3;
+				PROVISIONING_PROFILE_SPECIFIER = com.shangyao.MobilePortalTestServiceExtension_dis3;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "ServiceExtension/ServiceExtension-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

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

@@ -440,8 +440,8 @@
             timestampString = "651493562.330161"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "314"
-            endingLineNumber = "314"
+            startingLineNumber = "345"
+            endingLineNumber = "345"
             landmarkName = "addCellModel(array:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1185,8 +1185,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "163"
             endingLineNumber = "163"
-            landmarkName = "setwebView(strUrl:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1201,8 +1201,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "198"
             endingLineNumber = "198"
-            landmarkName = "setHTTPCookie(count:host:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1217,8 +1217,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "207"
             endingLineNumber = "207"
-            landmarkName = "setHTTPCookie(count:host:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1233,8 +1233,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "160"
             endingLineNumber = "160"
-            landmarkName = "setwebView(strUrl:)"
-            landmarkType = "7">
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

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 {
@@ -45,7 +45,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate,WXApiDelegate  {
         AccountInfo.sharedInstance().UMS_messageJSON = ""
         AccountInfo.sharedInstance().messageId = ""
         AccountInfo.sharedInstance().UMS_messageType = ""
+        
+        if (AccountInfo.sharedInstance().webViewUrl == nil) {
             AccountInfo.sharedInstance().webViewUrl = ""
+        }
+        AccountInfo.sharedInstance().CustomerServicePower = ""
 //        AccountInfo.sharedInstance().UMS_messageDetaUrl = "https://employeedev.shaphar.com/mobile-portal/messagedetail/1174"
 //        AccountInfo.sharedInstance().UserId = "199476"
 //        网络框架

MobilePortal/MobilePortal/Base/BaseViewController+ClassAction.swift

@@ -116,7 +116,12 @@ extension BaseViewController {
             } else {
                 strUrl = strUrl + "?userId="
             }
-            let url = 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))
+            let dic:NSMutableDictionary = NSMutableDictionary()
+            let type:NSMutableDictionary = NSMutableDictionary()
+            type["type"] = judgmentStrNil(str: AccountInfo.sharedInstance().CustomerServicePower)
+            dic["user_labels"] = type
+
+            let url = 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)) + "&customField="+judgmentStrNil(str: dicValueString(dic as! [String : Any]))
             
             
 //            self.actionGotoWebGotoWeb(webViewUrl: url, isHomePushType: .NOIsHomePushType, previousPageShowTitleType: .YesShowTitleType)

MobilePortal/MobilePortal/HttpNew/CustomerService/CustomerServiceHttpResult.h

+//
+//  CustomerServiceHttpResult.h
+//  MobilePortal
+//
+//  Created by xie on 2024/1/17.
+//  Copyright © 2024 yin chen. All rights reserved.
+//
+
+#import "SNHttpRequestResult.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CustomerServiceHttpResult : SNHttpRequestResult
+- (NSMutableArray *)getCustomerServiceHttpResult;
+@end
+
+NS_ASSUME_NONNULL_END

MobilePortal/MobilePortal/HttpNew/CustomerService/CustomerServicePowerHttpPostCmd+Response.h

+//
+//  CustomerServicePowerHttpPostCmd+Response.h
+//  MobilePortal
+//
+//  Created by xie on 2024/1/17.
+//  Copyright © 2024 yin chen. All rights reserved.
+//
+
+#import "CustomerServicePowerHttpPostCmd.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CustomerServicePowerHttpPostCmd (Response)
+
+@end
+
+NS_ASSUME_NONNULL_END

MobilePortal/MobilePortal/HttpNew/CustomerService/CustomerServicePowerHttpPostCmd+Response.m

+//
+//  CustomerServicePowerHttpPostCmd+Response.m
+//  MobilePortal
+//
+//  Created by xie on 2024/1/17.
+//  Copyright © 2024 yin chen. All rights reserved.
+//
+
+#import "CustomerServicePowerHttpPostCmd+Response.h"
+#import "CustomerServicePowerHttpPostCmd.h"
+#import "CustomerServiceHttpResult.h"
+
+
+@protocol CustomerServiceHttpResultData;
+@interface CustomerServiceHttpResultData : JSONModel
+@property NSString<Optional>*code;
+@property NSString<Optional>*msg;
+@property NSMutableArray *data;
+@end
+@implementation CustomerServiceHttpResultData
+@synthesize description;
+@end
+
+@interface CustomerServiceHttpResult()
+@property CustomerServiceHttpResultData *data;
+@end
+@implementation CustomerServicePowerHttpPostCmd (Response)
+- (void)onRequestSuccess:(id)request code:(NSInteger)code{
+    
+    [self.result setResultState:kRequestResultSuccess];
+    NSDictionary *dic = (NSDictionary *)request;
+    CustomerServiceHttpResult *result = [[CustomerServiceHttpResult alloc]init];
+    result = (CustomerServiceHttpResult *)self.result;
+    if (code>199&&code<299) {
+        [self.result setResultState:kRequestResultSuccess];
+        NSError *error;
+        result.data = [[CustomerServiceHttpResultData alloc]initWithDictionary:dic error:(NSError **)&error];
+        if(error){
+            [self onRequestFailed:error];
+            return;
+        }
+    }else{
+        NSString *memo = [dic objectForKey:@"error_description"];
+        [self.result setResultState:kRequestResultFail];
+        [self.result setErrMsg:memo];
+        NSLog(@"code :%ld errormsg:%@",(long)code,memo);
+    }
+}
+- (void)onRequestFailed:(NSError *)error{
+    NSLog(@"Error===%@",error);
+    [self.result setErrMsg:[error localizedDescription]];
+    [self.result setResultState:kRequestResultFail];
+}
+@end
+@implementation CustomerServiceHttpResult
+- (NSMutableArray *)getCustomerServiceHttpResult{
+    
+    NSMutableArray *httpArray = [NSMutableArray array];
+    if ([self.data.code isEqualToString:@"200"]) {
+        httpArray = [NSMutableArray array];
+        NSLog(@"%@",[self.data.data componentsJoinedByString:@","]);
+        [AccountInfo sharedInstance].CustomerServicePower = [self.data.data componentsJoinedByString:@","];
+    } else {
+        [httpArray addObject:self.data.msg];
+    }
+    return httpArray;
+}
+@end

MobilePortal/MobilePortal/HttpNew/CustomerService/CustomerServicePowerHttpPostCmd.h

+//
+//  CustomerServicePowerHttpPostCmd.h
+//  MobilePortal
+//
+//  Created by xie on 2024/1/17.
+//  Copyright © 2024 yin chen. All rights reserved.
+//
+
+#import "SNHttpBasePostCmd.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CustomerServicePowerHttpPostCmd : SNHttpBasePostCmd
+
+-(instancetype)initWithVersion:(NSString *)version;
+@end
+extern NSString *const kHttpCustomerServicePowerHttpPostCmd_empid;
+extern NSString *const kHttpCustomerServicePowerHttpPostCmd_attr;
+
+NS_ASSUME_NONNULL_END

MobilePortal/MobilePortal/HttpNew/CustomerService/CustomerServicePowerHttpPostCmd.m

+//
+//  CustomerServicePowerHttpPostCmd.m
+//  MobilePortal
+//
+//  Created by xie on 2024/1/17.
+//  Copyright © 2024 yin chen. All rights reserved.
+//
+
+#import "CustomerServicePowerHttpPostCmd.h"
+#import "CustomerServiceHttpResult.h"
+
+static NSString *kActionUrl1 = @"/ZhiNengKeFuController/isPermissions";
+
+@implementation CustomerServicePowerHttpPostCmd
+-(instancetype)initWithVersion:(NSString *)version{
+    if ([version isEqualToString:PHttpVersion_v1]) {
+        return [[CustomerServicePowerHttpPostCmd alloc]initWithAuthorizationState:AuthorizationNull];
+    }else{
+        NSAssert(NO, @"Invalid version");
+    }
+    return nil;
+}
+
+- (instancetype)initWithAuthorizationState:(AuthorizationState)state{
+    self = [super initWithAuthorizationState:state];
+    if (self != nil) {
+        self.result = [[CustomerServiceHttpResult alloc]init];
+    }
+    return self;
+}
+
+- (NSString *)getActionUrl{
+    return kActionUrl1;
+}
+@end
+NSString *const kHttpCustomerServicePowerHttpPostCmd_empid = @"empid";
+NSString *const kHttpCustomerServicePowerHttpPostCmd_attr = @"attr";

MobilePortal/MobilePortal/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>上药移动</string>
+	<string>上药移动测试</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

MobilePortal/MobilePortal/MobilePortal-Bridging-Header.h

@@ -249,3 +249,5 @@
 //获取对应系统分类 应用
 #import "ApplicationByBelongHttpGetCmd.h"
 #import "ApplicationByBelongHttpResult.h"
+#import "CustomerServicePowerHttpPostCmd.h"
+#import "CustomerServiceHttpResult.h"

MobilePortal/MobilePortal/Model/AccountInfo.swift

@@ -97,8 +97,20 @@ private let AccountInfo_UnReadNumber:String="AccountInfo_UnReadNumber"
 
 private let AccountInfo_webViewUrl:String="AccountInfo_webViewUrl"
 
+private let  AccountInfo_CustomerServicePower:String="AccountInfo_CustomerServicePower"
+
 @objcMembers class AccountInfo: NSObject {
     
+    var CustomerServicePower:String?{
+            set{
+                let userData:UserDefaults=UserDefaults.standard
+                userData.set(newValue, forKey: AccountInfo_CustomerServicePower)
+            }
+            get{
+                let userData:UserDefaults=UserDefaults.standard
+                return userData.object(forKey: AccountInfo_CustomerServicePower) as? String
+            }
+        }
     var webViewUrl:String?{
         set{
             let userData:UserDefaults=UserDefaults.standard

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

@@ -9,6 +9,37 @@
 import UIKit
 
 extension HomeViewController {
+    //MARK：获取只能客户权限
+        func CustomerServicePowerHttpPostCmdAction()  {
+            let cmd:HttpCommand = CustomerServicePowerHttpPostCmd.init(version: PHttpVersion_v1)
+            let block:httpBlock = {[weak self] (result:RequestResult!,useInfo:Any!)->() in
+                if result != nil {
+                    self?.funcCustomerServiceHttpResultResponse(result: result)
+                }else{
+                    print("空的")
+                }
+            }
+            let dic:NSMutableDictionary = NSMutableDictionary()
+            let dicid:NSMutableDictionary = NSMutableDictionary()
+            dicid[kHttpCustomerServicePowerHttpPostCmd_empid] = AccountInfo.sharedInstance().UserId
+            dic[kHttpCustomerServicePowerHttpPostCmd_attr] = dicid
+            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()
+        }
+        func funcCustomerServiceHttpResultResponse(result:RequestResult){
+            let r:CustomerServiceHttpResult = result as! CustomerServiceHttpResult
+            if r.isOk() {
+                let array:NSMutableArray = r.getCustomerServiceHttpResult()
+                print(AccountInfo.sharedInstance().CustomerServicePower)
+            } else{
+                
+            }
+        }
+    
     //MARK：获取对应服务
     func getApplicationByBelongAction(applicationName:String)  {
         showHintView()

MobilePortal/MobilePortal/VC/Home/HomeViewController.swift

@@ -122,7 +122,7 @@ class HomeViewController: BaseViewController,UIPopoverPresentationControllerDele
         addInitTableView()
         addHeaderFooter()
         actionHttpGCD()
-        
+        CustomerServicePowerHttpPostCmdAction()
 //        setStatusBarBackgroundColor()
 //        self.title = "首页"
         // Do any additional setup after loading the view.

MobilePortal/MobilePortal/VC/Upcoming/ListView/Cell/UpcomingListTableViewCell.swift

@@ -111,7 +111,7 @@ class UpcomingListTableViewCell: BaseTableViewCell {
         self.retractUnfoldType = xinfo.retractUnfoldType
         self.retractUnfoldBlack = xinfo.retractUnfoldBlack
         bagView.frame = CGRect(x:13.33, y: 0, width:SCREEN_WHIDTH()-26.66 , height:self.height-10 )
-        titleLabel.frame = CGRect(x:bagView.originX+15.33, y: 13, width: getTexWidth(textStr: xinfo.title!, font: UIFont.test_systemFont(ofSize: 14), height: 13), height:13 )
+        titleLabel.frame = CGRect(x:bagView.originX+15.33, y: 13, width: getTexWidth(textStr: xinfo.title!, font: UIFont.test_systemFont(ofSize: 14), height: 13), height:15 )
         titleLabel.text = xinfo.title
         subLabel.frame = CGRect(x:titleLabel.originX, y: titleLabel.originY+titleLabel.height+10, width: bagView.width-100, height:13 )
         subLabel.text = xinfo.subTitle

MobilePortal/MobilePortal/codeObfuscation.h

 #ifndef Demo_codeObfuscation_h
 #define Demo_codeObfuscation_h
-//confuse string at Thu Nov  9 09:46:58 CST 2023
-#define BaseViewController txBeMIyazIbdaAgT
-#define myTableView kBObyyvGWiDHBUHV
-#define setCacheAccountInfo VEJRHehAqwUlWCLC
-#define setClassWebUrlAccountInfo ypZOjCHzbfWuEkjR
-#define setWebUrlAction TJQBGxXTXnXSaMLY
-#define SinglePointWeChatVC UoLpsAkhGOxJrmMj
-#define onLogin UjokpKxYyjgVuzee
-#define getLoginTypeHttpAction JhOqJlfVoWZsdFNb
-#define loginTypeHttpGetCmdTypeAction RFBxfYlvwqTSsVvm
-#define getScopeListHttpCmd NhPQBBxbjqZunkbl
-#define selectSinglePointTypeAction YtvtWTFGkrVtFfHP
-#define getLoginHttpPostCmdCmd LEhFyZmGNFMaSVdl
-#define httpLoginHttpPostResultResponse DxwVnXWuTASWbbif
-#define getNewVersionUpdateHttpCmd UscIrnsbLvSiPlFs
-#define getLoginDeviceInformationHttpCmd TczQRRIWPUqGowhs
-#define getMyInformationHttpGetCmd LuqCSVrOfymUnwJi
-#define getVerifyTokenHttpPostCmdAction nbjaSWuwHVznWEgj
-#define httpVerifyTokenHttpResultResponse uFFRwqOPekMTSJOf
-#define loginGetUserInfo UMnhSZyAeINGNoME
-#define httpSinglePointinfoHttpResultResponse OczbCwKWIjgcViqa
-#define getWeChatXinfoHttpPostCmd rSHouFXKzJNkYfQS
-#define getWeChatBindingHttpPostCmd tfNjDOdHsHxfOlDX
-#define httpWeChatXinfoHttpResultResponse QwUtwnrImuGhUDNa
-#define SinglePointWeChatHttp IzEjFOwfKCuCLZym
-#define judgmentTokenExpired(resultBlock:@escaping QUNgsfsEBRINeRjj
-#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping kERyveAVhndksTbQ
-#define getRefreshTokenHttpPostCmd(resultBlock:@escaping kjzqbDhjgnqbRtyC
-#define func PrvOyTIyqkyvxzZH
-#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping mghQtxSKoNJvqdyX
-#define httpDeviceInformationHttpResultResponse(result: fMUXTQOEFkyGugoV
-#define LoginViewController ZtVmDEwKFKkUsZHk
-#define WeChatBindingViewController JvWWPPrTLqzDExWj
-#define SinglePointViewController KSKKMUcQfAOkMVPH
-#define MineViewController TefNAAukyRHjGgoC
-#define getSelectCompanyHttpCmd keAcjXvIesnlRmEU
-#define httpSelectCompanyHttpResultResponse TKNEwDYQOItZvWEX
-#define SelectCompanyViewController MPSdkVpJcniWnQbg
-#define MineMoreViewController xVIYIcBohwgVyazk
-#define WebSwiftViewController DNgBspSNbPBTHkmc
-#define webView blRTCKktUbcVwoDl
-#define webViewUrl qlhACRvbioYIWcxr
-#define appid yJpKryZPAdlRRfOt
-#define webActionTitle OQGmNaoBDybhNOAG
-#define setwebView IHeyngEjZIrNxLlB
-#define backPrevious ZYIBaUuSzUTPqHvG
-#define WebActionOC vnnTxSSEliKtBJjH
-#define getUrl AUmDXTbTdxydpDTs
-#define getWebCookie kalGoGgIPDNcRBpI
-#define encryptAES huBaPzyIkfQjPuOs
-#define decryptAES UjVAwXEuvjaZXiaM
-#define ChangePassWordViewController XeAjqWmICseLlncP
-#define oldTextView PNhKbQBYsiECYAud
-#define newTextView ArBfcvWCJrdpEHOJ
-#define confirmPassTextView zdDtdcCJnNOopTkI
-#define actionChangePassWord bWyoQpbsikDkeecY
-#define getChangePasswordHttpCmd ZsqaDcuwUkrlxXqD
-#define httpChangePasswordHttpResultResponse gblpOJvQnWkVJodn
-#define getSinglePointPasswordHttpPostCmd CHUyKMLYInXHwYwf
-#define httpSinglePointPasswordHttpResultResponse RCKMxVxZfOLLPXPS
-#define loginTypeHttpGetCmdTypeAction BbgGQYdUfpfWsdFq
-#define MineMoreViewController YvonFRiqdTQNjpgJ
-#define getMyApplicationListHttpCmd kcynySWDCsEfmqIc
-#define httpMyApplicationListHttpResultResponse osLxxVGYQcexUBMF
-#define getAllApplicationHttpListCmd CbAxQDhdjPTtKcNh
-#define httpMoreApplicationsTwoHttpResultResponse OhUZDZUgWQBWqtvv
-#define changeBlockAction gQZptwbCahCLGXSz
-#define getHttpCollcetionViewModellArray ILDOKGLAWuTyvZDt
-#define getHttpCollcetionViewModellTwoArray YNtcOKSLDZondamH
-#define getHttpMineMoreCollectionViewCellModel SidjXivlhToYZAMJ
-#define getSaveApplicationsHttpCmd jZMbUdjXuIeGSEro
-#define httpSaveApplicationListHttpResultResponse xuvrmKmyIVGwIJPh
-#define httpSelectCompanyHttpResultResponse SuDqTfGpMQbwtPAf
-#define gotoCompanyListVC knkdQkvrEXaZqurV
-#define SelectCompanyViewController JuisHhQTBIZMsETl
-#define actionCompanyHttpGCD SkWhEknPPmGCxAhY
-#define actiondepartmentHttpGCD mYYOjPgxYANHGbAS
-#define myApplicationAction qVsykTBrYgNNwbzf
-#define downloadOpenApp OIThWdeLRrWcfbFl
-#define oftenApplicationType ieHbhCDtrfDQVJjw
-#define HTHttpConfig ZAPeAhClWSxOHagF
-#define kServiceAddressURL1 kmSCfSnZYIIosirS
-#define imageURL1 QDnDnYxcjCoNjbyh
-#define kServiceAddressURL AykTEWMIcNaZwVzi
-#define imageURL QHKWHyXfIYlViJEb
-#define kServiceAddressURL2 MvdwytLVgzMSQWXG
-#define imageURL2 jdeTngrTEnEdlWpJ
-#define HomeViewController QMkXxtvuXlmSmJke
-#define actionHttpGCD xhvHnOdIDFMoLyXu
-#define getHttpHomeClassListCmd hyKinjkQiSVdifVG
-#define httpHttpHomeClassListResultResponse cbuagpaIUloHTHRZ
-#define getUpcomingCountHttpPostCmd jfgNcrxzZrsSacOT
-#define httpUpcomingCountHttpResultResponse dVGFSwIcFjqpccHy
-#define getMessageNunberShowHttpPostCmd dtaxZaTXNzTEakib
-#define httpMessageNumberShowHttpResultResponse DnoAMKEczQpyPkfj
+//confuse string at Wed Jan 24 17:37:19 CST 2024
+#define BaseViewController scUczMsmrNPgZPOG
+#define myTableView kCcKFJGrcxyKnKdW
+#define setCacheAccountInfo WvznAOnIbZIPZyqH
+#define setClassWebUrlAccountInfo zFEpnsmKVQHQeAdU
+#define setWebUrlAction AKcgGJEsQvujJfjW
+#define SinglePointWeChatVC sstksncEeUcWnjmP
+#define onLogin BdKHAPJfrySdnvuD
+#define getLoginTypeHttpAction XVZnyBTVoRWKihBu
+#define loginTypeHttpGetCmdTypeAction UvVSSIzXjXQlotqb
+#define getScopeListHttpCmd OnDkxDQmmbvNtYaY
+#define selectSinglePointTypeAction HHbcTxGDCQTKTzXl
+#define getLoginHttpPostCmdCmd bjKIFJnHKBmrScvM
+#define httpLoginHttpPostResultResponse FRXQpcckDHpVnrCd
+#define getNewVersionUpdateHttpCmd qELmQVBaLCbXxNDn
+#define getLoginDeviceInformationHttpCmd xXjibzFvCwZTqRqF
+#define getMyInformationHttpGetCmd KgBLqMHzYhBIOiJJ
+#define getVerifyTokenHttpPostCmdAction oHrDlHTHCUiDkNNU
+#define httpVerifyTokenHttpResultResponse rsdgWWxrBKDAiVMv
+#define loginGetUserInfo YnedQUmwDzbgPCQH
+#define httpSinglePointinfoHttpResultResponse gRPeUFlsHAKKdIUq
+#define getWeChatXinfoHttpPostCmd yAThAvrNfZLtBcmT
+#define getWeChatBindingHttpPostCmd RjQEJDHnTIBvaTSt
+#define httpWeChatXinfoHttpResultResponse UGmEOuDtxnLlWkVu
+#define SinglePointWeChatHttp QmxDfwUwofbkKRKD
+#define judgmentTokenExpired(resultBlock:@escaping DURneoegNPuAcTgn
+#define httpVerificationTokenHttpResultResponse(result:RequestResult,resultBlock:@escaping UXlgsVMjeAsHSEgH
+#define getRefreshTokenHttpPostCmd(resultBlock:@escaping GdzxPFXryiMAZjOA
+#define func KwGYmNsDbImzRErT
+#define getLoginDeviceInformationHttpCmd(resultBlock:@escaping NEkqbyRalVYEZkCd
+#define httpDeviceInformationHttpResultResponse(result: BZNysyFKzmAXkKzF
+#define LoginViewController RhelgKGFdJBSxZgU
+#define WeChatBindingViewController DEBLdFfujWCpxVNV
+#define SinglePointViewController IGnvplJYDEmFhqxU
+#define MineViewController kqVKMEbqugiUawoj
+#define getSelectCompanyHttpCmd SgKFPpzdydLUjPOU
+#define httpSelectCompanyHttpResultResponse mUlJflTXYqagNePQ
+#define SelectCompanyViewController khxWqZKKqIHpURxk
+#define MineMoreViewController sTRqltAzlgmvjhgq
+#define WebSwiftViewController rvEIspGqItVybCDx
+#define webView WVRFTZTDaDeRtalW
+#define webViewUrl zoyHKmjmkWFeOWtm
+#define appid qUrOHuIoxLbTGBzX
+#define webActionTitle DSbbjPsYrbQjMIMS
+#define setwebView PsydMdhAIelCjybV
+#define backPrevious dRnNfwUwvoGJLwDp
+#define WebActionOC xoeUNjMlYbVPacBE
+#define getUrl BMzMAZNkXPtsBPHk
+#define getWebCookie BZHLAGxTYGHqkECu
+#define encryptAES xnKuAUIGeClqrHTM
+#define decryptAES uQuxPmiUVmVoZoKX
+#define ChangePassWordViewController qSkKaftLQiWEAfqG
+#define oldTextView EgLzHeJxUEAUSIDp
+#define newTextView SDaCcHsIQfXNRqat
+#define confirmPassTextView GskTMMDVcqmuOfEH
+#define actionChangePassWord QauGRHuHLwEbBIdd
+#define getChangePasswordHttpCmd VDSkAqgTORZYmncl
+#define httpChangePasswordHttpResultResponse dnqeDpjjeSjmBTUx
+#define getSinglePointPasswordHttpPostCmd FKIlggNDLLkvKkTN
+#define httpSinglePointPasswordHttpResultResponse LpMFxugDkKEyGCgA
+#define loginTypeHttpGetCmdTypeAction ZwcRxtBBzwriFkYd
+#define MineMoreViewController NLgzALEuoZeTWndY
+#define getMyApplicationListHttpCmd BUDtDvAWyIfuhdud
+#define httpMyApplicationListHttpResultResponse zLKKnoOMEGSTbhxL
+#define getAllApplicationHttpListCmd uQBkvWISWVtWXuQy
+#define httpMoreApplicationsTwoHttpResultResponse NXQDDEPWlvCMspgR
+#define changeBlockAction fnuqkEEJELDsNuwm
+#define getHttpCollcetionViewModellArray yeEdLdkXxaQfnTXp
+#define getHttpCollcetionViewModellTwoArray TXCugSbNldZofCak
+#define getHttpMineMoreCollectionViewCellModel RLmVpiYFIXbrhCdf
+#define getSaveApplicationsHttpCmd IOmxjncuoysewRjI
+#define httpSaveApplicationListHttpResultResponse XqRuKIDlMLYdrhdj
+#define httpSelectCompanyHttpResultResponse OBTEruNMXJxrqFwV
+#define gotoCompanyListVC wcaTjcuqCNywxfBQ
+#define SelectCompanyViewController mQdUlsUOyVocHyiY
+#define actionCompanyHttpGCD KwUyvAOrymoqHhZc
+#define actiondepartmentHttpGCD YNTeqeNVzjYXWUDO
+#define myApplicationAction JHijHxYgtLMoumTx
+#define downloadOpenApp peBAABdfwftqZRhe
+#define oftenApplicationType ZrAdQcCxtwplBdgm
+#define HTHttpConfig kvRpqMWLoJamguRB
+#define kServiceAddressURL1 WjKDzacotyMMRWda
+#define imageURL1 QgCviQrmferMzrJr
+#define kServiceAddressURL GbOqylbDbbyzvjGk
+#define imageURL kPunkaBAxKjySOhD
+#define kServiceAddressURL2 GJNjyNMpuPnnIjgY
+#define imageURL2 srNbKRGnjxddWhKZ
+#define HomeViewController SkjeSxUNFquEntEG
+#define actionHttpGCD mlcPQdgLDhjIFxsQ
+#define getHttpHomeClassListCmd dNSmJHSBxpmmfcDl
+#define httpHttpHomeClassListResultResponse BTgHsjASFbshpzcX
+#define getUpcomingCountHttpPostCmd iBukMucozIrtKfoN
+#define httpUpcomingCountHttpResultResponse oxRuqQXnhlzhBrko
+#define getMessageNunberShowHttpPostCmd VVRDzMSBpJpqNCQx
+#define httpMessageNumberShowHttpResultResponse hyKhyBIXwBricKgO
 #endif

MobilePortal/ServiceExtension/NotificationService.swift

@@ -20,7 +20,7 @@ class NotificationService: UNNotificationServiceExtension {
         // c0eb5d604f19e9d58af5f8de  正式
         
         
-        JPushNotificationExtensionService.jpushSetAppkey("c0eb5d604f19e9d58af5f8de")
+        JPushNotificationExtensionService.jpushSetAppkey("444b4a4c86a09bd2e27367fe")
         JPushNotificationExtensionService.jpushReceive(request) {
             print("apns upload success")
             contentHandler(request.content)