Merge branch 'zx/faceTest' into 'master'

Zx/face test

See merge request !18

Example/GMAILab.xcodeproj/project.pbxproj

@@ -338,6 +338,7 @@
 				"${BUILT_PRODUCTS_DIR}/GMRouter/GMRouter.framework",
 				"${BUILT_PRODUCTS_DIR}/GMUtil/GMUtil.framework",
 				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
@@ -377,6 +378,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRouter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMUtil.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
@@ -387,7 +389,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NMC.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NMCBasicModuleFramework.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLMediaStreamingKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",

Example/Podfile.lock

@@ -153,6 +153,7 @@ PODS:
     - Weibo_SDK (= 3.2.7)
   - GMUtil (3.1.0)
   - GPUImage (0.1.7)
+  - HappyDNS (0.3.17)
   - lottie-ios (2.5.2)
   - MagicalRecord (2.3.2):
     - MagicalRecord/Core (= 2.3.2)
@@ -168,7 +169,8 @@ PODS:
   - PLPlayerKit (3.4.3):
     - PLPlayerKit/iphoneos (= 3.4.3)
   - PLPlayerKit/iphoneos (3.4.3)
-  - Qiniu (7.2.6)
+  - Qiniu (7.4.2):
+    - HappyDNS (~> 0.3.17)
   - SDWebImage (5.8.4):
     - SDWebImage/Core (= 5.8.4)
   - SDWebImage/Core (5.8.4)
@@ -215,6 +217,7 @@ SPEC REPOS:
     - DouyinOpenSDK
     - EVReflection
     - GPUImage
+    - HappyDNS
     - lottie-ios
     - MagicalRecord
     - Masonry
@@ -263,6 +266,7 @@ SPEC CHECKSUMS:
   GMShareSDK: 5a0fc06881021f0055841675bf748c01143acc2d
   GMUtil: 194a8831e4311762c4b1ac1278281b456157f4ec
   GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d
+  HappyDNS: 848ef73e24f2b0e2752064223ce2dc0dd88900ea
   lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -272,7 +276,7 @@ SPEC CHECKSUMS:
   NIMSDK: a43eb9b8bf83ddb0338c51ae2d756b683edc0cb8
   PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
   PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
-  Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
+  Qiniu: 0e2887592ffb0f23f86b920470d2301933d51f11
   SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9
   SnapKit: a42d492c16e80209130a3379f73596c3454b7694
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMBasicInfoCardView.m

@@ -70,7 +70,7 @@
         if (response.isSuccess) {
             NSDictionary *dic = (NSDictionary *)response.data;
             BOOL hasRecord = [dic.allKeys containsObject:@"has_record"] ? [dic[@"has_record"] boolValue] : NO;
-            if (!cardView.isDispatch && [dic.allKeys containsObject:@"counsellor_type"] && dic[@"counsellor_type"] != NULL) {
+            if (!cardView.isDispatch && [dic.allKeys containsObject:@"counsellor_type"] && dic[@"counsellor_type"] != NULL && ![dic[@"counsellor_type"] isEqual:[NSNull null]]) {
                 cardView.type = [dic[@"counsellor_type"] integerValue];
             }
             [cardView updateConstraintsWithHasRecord:hasRecord];

GMAILab/Classes/ToFace/ToFaceOrder/View/GMSureOrderPopView.m

@@ -11,7 +11,9 @@
 #import "GMStarWithContentObject.h"
 #import "GMToFaceNetworking.h"
 #import <GMBase/GMBaseTool.h>
-
+#import "GMBookReachStoreConsultView.h"
+#import "GMBookConsultViewModel.h"
+#import "GMBookConsultInfoModel.h"
 
 @interface GMSureOrderPopView ()
 @property (nonatomic, strong) GMLabel *topLabel;
@@ -249,6 +251,19 @@
                         weakSelf.completeCallBack(2, evaluateStr, starNum);
                     }
                 }
+                
+                // 弹授权弹窗（视频面诊评价弹窗关闭后/视频面诊结束之后（通话时长小于30s，不弹弹窗））
+                [GMBookConsultViewModel bookConsultInfoWithWithRecordId:self.infoModel.consultationRecordId successBlock:^(id responseObject) {
+                    GMResponseOC *response = (GMResponseOC *)responseObject;
+                    NSDictionary *data = response.data;
+                    GMBookConsultInfoModel *info = [[GMBookConsultInfoModel alloc] initWithDictionary:data error:NULL];
+                    info.recordId = self.infoModel.consultationRecordId;
+                    if (data.allKeys.count > 0) {
+                        [GMBookReachStoreConsultView showBookConsultPopViewWithObject:info];
+                    }
+                } failBlock:^(NSString *message) {
+                    
+                }];
             };
             view.showComplaint = NO;
             view.recordId = self.infoModel.consultationRecordId;

GMAILab/Classes/ToFace/ToFaceOrder/ViewController/GMTofaceOrderDetailViewController.m

@@ -13,6 +13,7 @@
 #import "GMEndConsultView.h"
 #import "RequestHeader.h"
 #import "GMToFaceNetworking.h"
+
 @import GMBaseWeb;
 @import GMHud;
 @interface GMTofaceOrderDetailViewController () <GMJSBridgeProtocol>

GMAILab/Classes/ToFace/WorkingTable/Model/GMBookConsultInfoModel.h

+//
+//  GMBookConsultInfoModel.h
+//  GMAILab
+//
+//  Created by Jessica on 2020/7/21.
+//
+
+#import <GMBase/GMObject.h>
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GMBookConsultInfoModel : GMObject
+@property (nonatomic, assign) NSInteger userId;
+@property (nonatomic, copy) NSString *prompt;
+@property (nonatomic, copy) NSString *imgUrl;
+@property (nonatomic, copy) NSString *subTitle;
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *telephone;
+@property (nonatomic, copy) NSString *recordId;
+@property (nonatomic, assign) BOOL hasPhone;
+@property (nonatomic, assign) NSInteger leadPhoneRequestId;
+
+@end
+
+NS_ASSUME_NONNULL_END

GMAILab/Classes/ToFace/WorkingTable/Model/GMBookConsultInfoModel.m

+//
+//  GMBookConsultInfoModel.m
+//  GMAILab
+//
+//  Created by Jessica on 2020/7/21.
+//
+
+#import "GMBookConsultInfoModel.h"
+
+@implementation GMBookConsultInfoModel
+
+@end

GMAILab/Classes/ToFace/WorkingTable/View/GMBookReachStoreConsultView.h

+//
+//  GMBookReachStoreConsultView.h
+//  AFNetworking
+//
+//  Created by Jessica on 2020/7/20.
+//
+
+#import <GMKit/GMPopupBgView.h>
+#import "GMBookConsultInfoModel.h"
+
+@import GMBase;
+@import GMHud;
+@import GMRouter;
+
+@interface GMBookReachStoreConsultView : GMPopupBgView
++ (void)showBookConsultPopViewWithObject:(GMBookConsultInfoModel *)model;
+
+@end
+

GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportResultController.m

@@ -11,7 +11,7 @@
 #import "RequestHeader.h"
 #import "GMAIUploadImagesManager.h"
 //#import "GMUploadImagesManager.h"
-#import <GMbase/GMBaseTool.h>
+#import <GMBase/GMBaseTool.h>
 
 @import GMBaseWeb;
 @import GMHud;

GMAILab/Classes/ToFace/WorkingTable/ViewModel/GMBookConsultViewModel.h

+//
+//  GMBookConsultViewModel.h
+//  AFNetworking
+//
+//  Created by Jessica on 2020/7/20.
+//
+
+//#import <GMBase/GMBase.h>
+//#import "GMNetworking/GMNetworking-Swift.h"
+//#import "RequestHeader.h"
+@import GMNetworking;
+@import GMBase;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GMBookConsultViewModel : WMFetchDataViewModel
+// 获取弹窗
++ (void)bookConsultInfoWithWithRecordId:(NSString *)recordId successBlock:(HttpSuccessBlock)successBlock failBlock:(HttpFailedBlock)failBlock;
++ (void)bookConsultWithRecordId:(NSString *)recordId requestId:(NSInteger)requestId successBlock:(HttpSuccessBlock)successBlock failBlock:(HttpFailedBlock)failBlock;
+@end
+
+NS_ASSUME_NONNULL_END

GMAILab/Classes/ToFace/WorkingTable/ViewModel/GMBookConsultViewModel.m

+//
+//  GMBookConsultViewModel.m
+//  AFNetworking
+//
+//  Created by Jessica on 2020/7/20.
+//
+
+#import "GMBookConsultViewModel.h"
+
+@implementation GMBookConsultViewModel
++ (void)bookConsultInfoWithWithRecordId:(NSString *)recordId successBlock:(HttpSuccessBlock)successBlock failBlock:(HttpFailedBlock)failBlock {
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [params setObject:SafeString(recordId) forKey:@"record_id"];
+    [GMNetworking requestOCWithApi:@"/api/consultation_counsel/conuslt_user_appointment" method:GMHTTPMethodGet parameters:params completion:^(GMResponseOC *responseObject) {
+        if (responseObject.isSuccess) {
+            successBlock(responseObject);
+        } else {
+            failBlock(responseObject.message);
+        }
+    }];
+}
+
++ (void)bookConsultWithRecordId:(NSString *)recordId requestId:(NSInteger)requestId successBlock:(HttpSuccessBlock)successBlock failBlock:(HttpFailedBlock)failBlock {
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [params setObject:SafeString(recordId) forKey:@"record_id"];
+    [params setObject:@(requestId) forKey:@"request_id"];
+    [params setObject:SafeString([PhobosUtil currentTime]) forKey:@"appointment_time"];
+    [GMNetworking requestOCWithApi:@"/api/sales_lead/consult_appointment" method:GMHTTPMethodPost parameters:params completion:^(GMResponseOC *responseObject) {
+        if (responseObject.isSuccess) {
+            successBlock(responseObject);
+        } else {
+            failBlock(responseObject.message);
+        }
+    }];
+}
+@end