update

Example/Podfile.lock

 PODS:
-  - AFNetworking (3.1.0):
-    - AFNetworking/NSURLSession (= 3.1.0)
-    - AFNetworking/Reachability (= 3.1.0)
-    - AFNetworking/Security (= 3.1.0)
-    - AFNetworking/Serialization (= 3.1.0)
-    - AFNetworking/UIKit (= 3.1.0)
-  - AFNetworking/NSURLSession (3.1.0):
+  - AFNetworking (4.0.1):
+    - AFNetworking/NSURLSession (= 4.0.1)
+    - AFNetworking/Reachability (= 4.0.1)
+    - AFNetworking/Security (= 4.0.1)
+    - AFNetworking/Serialization (= 4.0.1)
+    - AFNetworking/UIKit (= 4.0.1)
+  - AFNetworking/NSURLSession (4.0.1):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (3.1.0)
-  - AFNetworking/Security (3.1.0)
-  - AFNetworking/Serialization (3.1.0)
-  - AFNetworking/UIKit (3.1.0):
+  - AFNetworking/Reachability (4.0.1)
+  - AFNetworking/Security (4.0.1)
+  - AFNetworking/Serialization (4.0.1)
+  - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
   - Alamofire (4.7.0)
   - AlipaySDK-iOS (15.6.8)
@@ -87,49 +87,56 @@ PODS:
     - lottie-ios (= 2.5.2)
     - MBProgressHUD (= 0.9.2)
   - GMJSONModel (1.7.4)
-  - GMKit (1.2.7):
-    - GMKit/Category (= 1.2.7)
-    - GMKit/Color (= 1.2.7)
-    - GMKit/Constant (= 1.2.7)
-    - GMKit/FDFullscreenPopGesture (= 1.2.7)
-    - GMKit/Kit (= 1.2.7)
-    - GMKit/Protocol (= 1.2.7)
+  - GMKit (1.2.8):
+    - GMKit/Category (= 1.2.8)
+    - GMKit/Color (= 1.2.8)
+    - GMKit/Constant (= 1.2.8)
+    - GMKit/FDFullscreenPopGesture (= 1.2.8)
+    - GMKit/Kit (= 1.2.8)
+    - GMKit/Protocol (= 1.2.8)
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMKit/Category (1.2.7):
-    - GMKit/Color (= 1.2.7)
-    - GMKit/Constant (= 1.2.7)
-    - GMKit/Protocol (= 1.2.7)
+  - GMKit/Category (1.2.8):
+    - GMKit/Color (= 1.2.8)
+    - GMKit/Constant (= 1.2.8)
+    - GMKit/Protocol (= 1.2.8)
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMKit/Color (1.2.7):
+  - GMKit/Color (1.2.8):
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMKit/Constant (1.2.7):
+  - GMKit/Constant (1.2.8):
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMKit/FDFullscreenPopGesture (1.2.7):
+  - GMKit/FDFullscreenPopGesture (1.2.8):
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMKit/Kit (1.2.7):
-    - GMKit/Category (= 1.2.7)
-    - GMKit/Color (= 1.2.7)
-    - GMKit/Constant (= 1.2.7)
-    - GMKit/Protocol (= 1.2.7)
+  - GMKit/Kit (1.2.8):
+    - GMKit/Category (= 1.2.8)
+    - GMKit/Color (= 1.2.8)
+    - GMKit/Constant (= 1.2.8)
+    - GMKit/Protocol (= 1.2.8)
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMKit/Protocol (1.2.7):
+  - GMKit/Protocol (1.2.8):
+    - GMPhobos
     - Masonry
     - SDWebImage
     - SnapKit
-  - GMNetService (1.0.2):
-    - AFNetworking (= 3.1.0)
+  - GMNetService (1.0.3):
+    - AFNetworking
   - GMNetworking (4.0.7):
     - Alamofire (= 4.7.0)
   - GMPhobos (2.0.7):
@@ -160,7 +167,7 @@ PODS:
   - MagicalRecord/Core (2.3.2)
   - Masonry (1.1.0)
   - MBProgressHUD (0.9.2)
-  - MJExtension (3.2.1)
+  - MJExtension (3.2.2)
   - MJRefresh (3.4.3)
   - NIMSDK (7.5.0)
   - PLMediaStreamingKit (3.0.0):
@@ -170,9 +177,9 @@ PODS:
     - PLPlayerKit/iphoneos (= 3.4.3)
   - PLPlayerKit/iphoneos (3.4.3)
   - Qiniu (7.2.6)
-  - SDWebImage (5.8.1):
-    - SDWebImage/Core (= 5.8.1)
-  - SDWebImage/Core (5.8.1)
+  - SDWebImage (5.8.3):
+    - SDWebImage/Core (= 5.8.3)
+  - SDWebImage/Core (5.8.3)
   - SnapKit (4.0.0)
   - TMCache (2.1.0)
   - "UITableView+FDTemplateLayoutCell (1.4)"
@@ -238,7 +245,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
+  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
   AlipaySDK-iOS: 703a55774a37f412410ab04af96c011b91ec58cb
   BDOpenSDKKit: 3fb530ce73f85a7d6ee69e7fd3d9158444c5bd09
@@ -254,8 +261,8 @@ SPEC CHECKSUMS:
   GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
   GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f
   GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
-  GMKit: 410f4a2da98698ffe2e1e97043ea8f97ab8adb17
-  GMNetService: 7c69e7981b4fac29657fad5fc86a0c453196b862
+  GMKit: bfb96afc614ed15404c5893f864e83cedaf7c839
+  GMNetService: 78d729467b99b6ce9814d51efa4dcfa3ddebafe3
   GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2
   GMPhobos: ae8ecc3c1fc4e94e0fa4fd093da46e4f6bce580e
   GMRefresh: 11497a660eb14b1fda443bfe682910e0cc6031f4
@@ -267,13 +274,13 @@ SPEC CHECKSUMS:
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
-  MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
+  MJExtension: d9b9c74cbdeb724c1e9ecbb157b318276e62e876
   MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
   NIMSDK: a43eb9b8bf83ddb0338c51ae2d756b683edc0cb8
   PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
   PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
   Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
-  SDWebImage: e3eae2eda88578db0685a0c88597fdadd9433f05
+  SDWebImage: 112503ec94a5a2a41869503844a15e8d8f1ead5c
   SnapKit: a42d492c16e80209130a3379f73596c3454b7694
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
   "UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030

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

@@ -50,7 +50,7 @@
     [self.collectView performBatchUpdates:^{
         [weakSelf.collectView layoutIfNeeded];
     } completion:^(BOOL finished) {
-        if (finished) {
+        if (finished && dataArray.count > 0) {
             NSIndexPath *firstIndexPath = [NSIndexPath indexPathForItem: 0 inSection:0];
             [self.collectView scrollToItemAtIndexPath:firstIndexPath atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
             _layout.currentIndex = 0;

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

@@ -15,6 +15,8 @@
 @property (nonatomic, strong) GMToFaceOrderInfoModel *infoModel;
 /// 面诊订单列表页可以关闭界面，面诊结束弹起的界面不可以
 @property (nonatomic, assign) BOOL isCloseBtnHidden;
+@property (nonatomic, assign) BOOL isNotShowStarView; // 接通<=30s不弹评价弹窗
+
 /**
  * 确认订单完成（评价或者投诉也操作过），回传给h5，更改订单列表该订单的状态
  * 目前只有面诊订单列表才用到此回调

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

@@ -224,32 +224,37 @@
 }
 #pragma mark - 星级评价弹框
 - (void)starMethod {
+
     //是面诊师直接弹评价弹框
     __weak typeof(self) weakSelf = self;
     [[GMToFaceNetworking shareInstance] excuteToFaceEvaluateItemDiagnosis_id:self.infoModel.consultationRecordId SuccessBlock:^(id response) {
-        GMStarWithContentObject *starContentModel = [[GMStarWithContentObject alloc] initWithDictionary:response error:nil];
-        GMEndConsultView *view = [[GMEndConsultView alloc] initWithType:(GMEndConsultViewTypeGrayStar) starNum:0];
-        [weakSelf hide];
-        //投诉弹框右上角的×的点击,原因是订单列表会用到这个值，目的是回传给h5改订单列表的状态
-        view.hideFinish = ^{
-            if (weakSelf.completeCallBack) {
-                weakSelf.completeCallBack(0, @"", 0);
-            }
-        };
-        //星级评价,原因是订单列表会用到这个值，目的是回传给h5改订单列表的状态
-        view.evaluateFinish = ^(NSInteger type, NSInteger starNum, NSString * _Nonnull evaluateStr) {
-            [self hide];
-            if (type == 0) {
-                //type = 0 是填写评价，所以只有这种情况才是需要回传给h5
+        if (self.isNotShowStarView) {
+            [weakSelf hide];
+        } else {
+            GMStarWithContentObject *starContentModel = [[GMStarWithContentObject alloc] initWithDictionary:response error:nil];
+            GMEndConsultView *view = [[GMEndConsultView alloc] initWithType:(GMEndConsultViewTypeGrayStar) starNum:0];
+            [weakSelf hide];
+            //投诉弹框右上角的×的点击,原因是订单列表会用到这个值，目的是回传给h5改订单列表的状态
+            view.hideFinish = ^{
                 if (weakSelf.completeCallBack) {
-                    weakSelf.completeCallBack(2, evaluateStr, starNum);
+                    weakSelf.completeCallBack(0, @"", 0);
                 }
-            }
-        };
-        view.showComplaint = NO;
-        view.recordId = self.infoModel.consultationRecordId;
-        view.starContentArray = starContentModel.evaluates;
-        [[GMBaseTool getCurrentViewController].view addSubview:view];
+            };
+            //星级评价,原因是订单列表会用到这个值，目的是回传给h5改订单列表的状态
+            view.evaluateFinish = ^(NSInteger type, NSInteger starNum, NSString * _Nonnull evaluateStr) {
+                [self hide];
+                if (type == 0) {
+                    //type = 0 是填写评价，所以只有这种情况才是需要回传给h5
+                    if (weakSelf.completeCallBack) {
+                        weakSelf.completeCallBack(2, evaluateStr, starNum);
+                    }
+                }
+            };
+            view.showComplaint = NO;
+            view.recordId = self.infoModel.consultationRecordId;
+            view.starContentArray = starContentModel.evaluates;
+            [[GMBaseTool getCurrentViewController].view addSubview:view];
+        }
     } failureBlock:^(NSInteger errorCode, NSString *message) {
         [self hide];
     }];

GMAILab/Classes/ToFace/ToFaceOrder/ViewModel/GMToFacePayViewModel.m

@@ -33,10 +33,12 @@
 - (void)excuteToFacePayCompleteBlock:(HttpSuccessBlock)successBlock failedBlock:(HttpFailedBlock)failedBlock {
     if (self.payType == GMToFacePayTypeAlipay && ![[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"alipay://"]]) {
         [[GMBaseTool getCurrentViewController] toast:@"请安装支付宝"];
+        failedBlock(@"");
         return;
     }
     if (self.payType == GMToFacePayTypeWechat && ![WXApi isWXAppInstalled]) {
         [[GMBaseTool getCurrentViewController] toast:@"请安装微信"];
+        failedBlock(@"");
         return;
     }
     NSString *channel;

GMAILab/Classes/ToFace/VideoTelephone/manager/GMRtcManager.m

@@ -38,9 +38,9 @@ static id _manager;
 {
     self = [super init];
     if (self) {
-        
         _rtcEngine = [TTTRtcEngineKit sharedEngineWithAppId:TTTAppID delegate:nil];
         [_rtcEngine setSignalTimeout:30];
+        [_rtcEngine setPreferAudioCodec:TTTRtc_AudioCodec_ISAC_WB bitrate:32 channels:1];
         _me = [[GMTTTUser alloc] initWith:0];
         _localProfile = TTTRtc_VideoProfile_Default;
         _cdnProfile = TTTRtc_VideoProfile_Default;

GMAILab/Classes/ToFace/VideoTelephone/manager/GMUserVideoTelephoneLogin.m

@@ -273,6 +273,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
         GMToFaceOrderInfoModel *infoModel = [[GMToFaceOrderInfoModel alloc] initWithDictionary:response error:nil];
         infoModel.consultationRecordId = TTManager.consultationRecordId;
         GMSureOrderPopView *popView = [[GMSureOrderPopView alloc] init];
+        popView.isNotShowStarView = TTManager.totalTime <= 30; // 视频面诊接通<=30s 不弹出评价弹窗
         popView.isCloseBtnHidden = YES;
         popView.infoModel = infoModel;
         [popView clickConfireBtnPhobo:counsellorType consultationType:consultationType doctorId:doctorId];