需求提交

GMAILab/Classes/ToFace/ToFaceDoctorList/Model/GMConsultantInfoModel.h

@@ -5,6 +5,7 @@
 //  Created by zhouLiang on 2020/3/9.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 @protocol GMHospitalInfoModel @end
 @interface GMHospitalInfoModel : GMObject

GMAILab/Classes/ToFace/ToFaceDoctorList/Model/GMToFaceDoctorListModel.h

@@ -5,6 +5,7 @@
 //  Created by zhouLiang on 2020/2/20.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 @protocol GMToFaceTabs @end
 @interface GMToFaceTabs : GMObject

GMAILab/Classes/ToFace/ToFaceDoctorList/VIewModel/GMToFaceDoctorListViewModel.m

@@ -7,7 +7,7 @@
 //
 
 #import "GMToFaceDoctorListViewModel.h"
-
+#import "GMToFaceNetworking.h"
 @interface GMToFaceDoctorListViewModel ()<WMFetchDataModelProtocol> {
     NSMutableDictionary *_deduplicationDic;
     NSString *_deduplicationKey;
@@ -25,7 +25,7 @@
 
 - (void)excuteToFaceTabsDoctorsSuccessBlock:(HttpSuccessBlock)successBlock
                                   failBlock:(HttpFailedBlock)failBlock {
-    [[GMInterfaceNetwork shareInstance] excuteToFaceTabsDoctorsTabsId:self.tabId page:self.page SuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceTabsDoctorsTabsId:self.tabId page:self.page SuccessBlock:^(id response) {
         GMToFaceTabsDoctorListModel *model = [[GMToFaceTabsDoctorListModel alloc] initWithDictionary:response error:NULL];
         if (self.page == 1) {
             [self.dataArray removeAllObjects];

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

@@ -5,6 +5,7 @@
 //  Created by yefengming on 2020/2/19.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+#import <GMKit/GMPopupBgView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

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

@@ -7,9 +7,10 @@
 //
 
 #import "GMBasicInfoCardView.h"
-#import "GMDetailWebViewController.h"
-#import "Gengmei-Swift.h"
-#import "GMCommentPopupView.h"
+#import <WebKit/WebKit.h>
+//#import "GMDetailWebViewController.h"
+//#import "Gengmei-Swift.h"
+//#import "GMCommentPopupView.h"
 #import "GMUserVideoTelephoneLogin.h"
 #import "GMVideoWaitingView.h"
 #import "GMDoctorInfoPopupView.h"
@@ -18,6 +19,10 @@
 #import "GMToFacePayPrepareModel.h"
 #import "GMToFaceOrderViewController.h"
 #import "GMToFacePayPopView.h"
+#import "RequestHeader.h"
+#import <GMBase/GMBaseTool.h>
+#import <GMBaseWeb/GMBaseWeb-Swift.h>
+#import <GMBaseWeb/GMWebutil.h>
 
 #define counsellorAllHeight (573 + UIView.safeAreaInsetsBottom)
 #define counsellorHalfHeight (366 + UIView.safeAreaInsetsBottom)
@@ -54,6 +59,13 @@
     [self containerRectCorner:self.container];
 }
 
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
 + (void)showWithCorrectFrameView:(GMBasicInfoCardView *)cardView resultBlock:(nonnull void (^)(void))resultBlock {
     [GMNetworking requestOCWithApi:API_CONSULTATION__COUNSEL_CUSTOMER method:GMHTTPMethodGet parameters:@{@"counsellor_id": SafeString(cardView.counsellorId), @"doctor_id": SafeString(cardView.doctorId)} completion:^(GMResponseOC * response) {
         if (response.isSuccess) {
@@ -63,10 +75,10 @@
                 cardView.type = [dic[@"counsellor_type"] integerValue];
             }
             [cardView updateConstraintsWithHasRecord:hasRecord];
-            [AppDelegate.visibleController.view addSubview:cardView];
+            [[GMBaseTool getCurrentViewController].view addSubview:cardView];
         } else {
             [cardView updateConstraintsWithHasRecord:NO];
-            [AppDelegate.visibleController.view addSubview:cardView];
+            [[GMBaseTool getCurrentViewController].view addSubview:cardView];
         }
         if (resultBlock) {
             resultBlock();
@@ -106,14 +118,14 @@
 
 - (void)setDoctorId:(NSString *)doctorId {
     _doctorId = doctorId;
-    self.webCompent.fullUrl = [NSString stringWithFormat:@"%@/phantom/treatment/user/typing_info_v4/%@?counsellor_id=%@&record_type=1",GMServerDomains.apiHost, SafeString(doctorId), SafeString(self.counsellorId)];
+    self.webCompent.fullUrl = [NSString stringWithFormat:@"%@/phantom/treatment/user/typing_info_v4/%@?counsellor_id=%@&record_type=1",[GMWebutil getCurrentApiHost], SafeString(doctorId), SafeString(self.counsellorId)];
     [self.webCompent webviewLoad:self];
 }
 
 - (void)setIsDispatch:(BOOL)isDispatch {
     _isDispatch = isDispatch;
     if (self.isDispatch) {
-        self.webCompent.fullUrl = [NSString  stringWithFormat:@"%@/phantom/treatment/user/typing_info_v4?record_type=2",GMServerDomains.apiHost];
+        self.webCompent.fullUrl = [NSString  stringWithFormat:@"%@/phantom/treatment/user/typing_info_v4?record_type=2",[GMWebutil getCurrentApiHost]];
         [self.webCompent webviewLoad:self];
     }
 }
@@ -135,9 +147,9 @@
             GMDoctorInfoPopupView *popupView = [[GMDoctorInfoPopupView alloc] init];
             popupView.tabName = @"医生推荐";
             popupView.model = model;
-            [AppDelegate.visibleController.view addSubview:popupView];
+            [[GMBaseTool getCurrentViewController].view addSubview:popupView];
         } else {
-            [AppDelegate.visibleController toast:response.message];
+            [[GMBaseTool getCurrentViewController] toast:response.message];
         }
     }];
 }
@@ -157,9 +169,9 @@
 -(void)globalDataLoaded:(NSDictionary *)data {
     int consultation_type = [data[@"consultation_type"] intValue];
     int counsellor_type = [data[@"counsellor_type"] intValue];
-    NSDictionary *dict = @{@"page_name":AppDelegate.visibleController.pageName,
+    NSDictionary *dict = @{@"page_name":[GMBaseTool getCurrentViewController].pageName,
                            @"popup_name":@"basic_info",
-                           @"referrer_link":AppDelegate.visibleController.referrerLink ? : @[],
+                           @"referrer_link":[GMBaseTool getCurrentViewController].referrerLink ? : @[],
                            @"consultation_type":@(consultation_type),
                            @"counsellor_type":@(counsellor_type),
                            @"tab_name":SafeString(self.tabName),
@@ -252,7 +264,7 @@
         popView.CloseView = ^{
             [weakSelf hide];
         };
-        [[AppDelegate shareInstance].window addSubview:popView];
+        [[GMBaseTool mainWindow]  addSubview:popView];
         //进到付款页面先隐藏view，等到付款成功的回调来了之后再显示
         self.alpha = 0.f;
     }else {
@@ -265,7 +277,7 @@
             //支付成功发起面诊
             [weakSelf videoDiagnose];
         };
-        [AppDelegate.visibleController pushViewController:controller animated:YES completion:nil];
+        [[GMBaseTool getCurrentViewController] pushViewController:controller animated:YES completion:nil];
     }
 }
 - (BOOL)showAlertIfNotAllowed {
@@ -281,12 +293,13 @@
         [alert addAction:[UIAlertAction actionWithTitle:otherButton style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
             [GMLocationManager jumpToSettings];
         }]];
-        [AppDelegate.visibleController presentViewController:alert animated:YES completion:NULL];
+        [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:NULL];
         return YES;
     }
     return NO;
 }
 
+
 - (void)cancelDispatch {
     [GMNetworking requestOCWithApi:API_CONSULTATION_CANCEL_DISPATCH method:GMHTTPMethodPost parameters:nil completion:^(GMResponseOC * _Nonnull response) {
         
@@ -314,7 +327,7 @@
                 [weakSelf hide];
             });
         } else {
-            [AppDelegate.visibleController toast:response.message];
+            [[GMBaseTool getCurrentViewController] toast:response.message];
         }
     }];
 }
@@ -376,7 +389,7 @@
         }
         [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
     }]];
-    [AppDelegate.visibleController presentViewController:alert animated:YES completion:nil];
+    [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:nil];
 }
 
 - (void)showCameraAlert {
@@ -391,7 +404,7 @@
         [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
     }]];
     
-    [AppDelegate.visibleController presentViewController:alert animated:YES completion:nil];
+    [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:nil];
 }
 #pragma mark - 权限获取埋点（只有两个权限全部为点同一状态才算YES，并且必须两个都音视频都授权才进行埋点）
 - (void)audioAndVideoJurisdiction:(BOOL)isOpen {
@@ -426,7 +439,7 @@
         };
     }
     if (!_waitingView.superview) {
-        [AppDelegate.visibleController.view addSubview:_waitingView];
+        [[GMBaseTool getCurrentViewController].view addSubview:_waitingView];
         [_waitingView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.mas_equalTo(0);
         }];

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMDoctorInfoPopupView.h

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 #import "GMConsultantInfoModel.h"
+#import "GMLibraryHeader.h"
 
 @protocol GMDoctorInfoPopupViewDelegate <NSObject>
 

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMFaceListPageControl.h

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
+#import <GMKit/GMView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMToFaceCommonEmptyView.h

+//
+//  GMToFaceCommonEmptyView.h
+//  GMAILab
+//
+//  Created by 卢悦明 on 2020/5/9.
+//
+
+#import <UIKit/UIKit.h>
+#import "GMLibraryHeader.h"
+
+typedef NS_ENUM(NSInteger, GMToFaceCommonEmptyViewType) {
+    GMToFaceCommonEmptyViewTypeEmpty,//无数据
+    GMToFaceCommonEmptyViewTypeError//错误页面
+};
+@protocol GMToFaceCommonEmptyViewDelegate <NSObject>
+- (void)emptyViewDidClickReload;
+@end
+
+@interface GMToFaceCommonEmptyView : UIView
+/** 占位图 */
+@property (nonatomic, strong) GMImageView *emptyImg;
+/** 占位文字 */
+@property (nonatomic, strong) GMLabel *emptyLabel;
+/** 图片h宽高 */
+@property (nonatomic, assign) CGSize emptyImgSize;
+
+@property (nonatomic, assign) GMToFaceCommonEmptyViewType type;
+
+@property (nonatomic, weak) id<GMToFaceCommonEmptyViewDelegate>delegate;
+
+- (void)hide;
+@end
+
+

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

+//
+//  GMToFaceCommonEmptyView.m
+//  GMAILab
+//
+//  Created by 卢悦明 on 2020/5/9.
+//
+
+#import "GMToFaceCommonEmptyView.h"
+
+@interface GMToFaceCommonEmptyView ()
+@property (nonatomic, strong) GMButton *tapBtn;
+
+@end
+
+@implementation GMToFaceCommonEmptyView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self setup];
+    }
+    return self;
+}
+
+- (void)setup {
+    self.backgroundColor = UIColor.whiteColor;
+
+    _emptyImg = [GMImageView new];
+    _emptyImg.contentMode = UIViewContentModeScaleAspectFit;
+    _emptyImg.image = [UIImage imageNamed:@"empty"];
+    [self addSubview:_emptyImg];
+    [_emptyImg mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(0);
+        make.centerY.mas_equalTo(-20);
+        make.size.mas_equalTo(CGSizeMake(175, 199));
+    }];
+    // 349/396
+    _emptyLabel = [GMLabel labelWithTextColor:UIColor.bodyText fontSize:15];
+    _emptyLabel.preferredMaxLayoutWidth = 300;
+    _emptyLabel.textAlignment = NSTextAlignmentCenter;
+    _emptyLabel.text = @"此处太寂寥，社区等你撩";
+    _emptyLabel.numberOfLines = 0;
+    [self addSubview:_emptyLabel];
+    [_emptyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(_emptyImg.mas_bottom).offset(-30);
+        make.centerX.mas_equalTo(0);
+    }];
+    [self addSubview:self.tapBtn];
+    [self.tapBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(self);
+        make.width.mas_equalTo(150);
+        make.height.mas_equalTo(33);
+        make.top.mas_equalTo(_emptyImg.mas_bottom).offset(15);
+    }];
+}
+- (void)setEmptyImgSize:(CGSize)emptyImgSize {
+    _emptyImgSize = emptyImgSize;
+    [_emptyImg mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(emptyImgSize);
+    }];
+}
+- (void)hide {
+    self.hidden = YES;
+}
+- (void)setType:(GMToFaceCommonEmptyViewType)type {
+    self.hidden = NO;
+    switch (type) {
+        case GMToFaceCommonEmptyViewTypeEmpty:{
+            self.tapBtn.hidden = YES;
+            self.emptyImg.image = [UIImage imageNamed:@"empty"];
+            self.emptyLabel.text = @"此处太寂寥，社区等你撩";
+//            self.emptyImgSize = CGSizeMake(175, 199);
+            break;
+        }
+        case GMToFaceCommonEmptyViewTypeError:{
+            self.tapBtn.hidden = NO;
+            self.emptyImg.image = [UIImage imageNamed:@"network_failed"];
+            self.emptyLabel.text = @"原谅我一看到美人就不淡定";
+        }
+        default:
+            break;
+    }
+}
+- (void)reloadBtnTap {
+    self.hidden = YES;
+    if ([self.delegate respondsToSelector:@selector(emptyViewDidClickReload)]) {
+        [self.delegate emptyViewDidClickReload];
+    }
+}
+- (GMButton *)tapBtn {
+    if (!_tapBtn) {
+        _tapBtn = [GMButton buttonWithCustomType:GMButtonTypeRedSemicircleGradient];
+        _tapBtn.hidden = YES;
+        [_tapBtn setTitle:@"重新加载" forState:UIControlStateNormal];
+        _tapBtn.titleLabel.font = [UIFont gmFont:16];
+        [_tapBtn setTitleColor:UIColor.bodyText forState:UIControlStateNormal];
+        [_tapBtn addTarget:self action:@selector(reloadBtnTap) forControlEvents:UIControlEventTouchUpInside];
+        
+    }
+    return _tapBtn;
+}
+@end

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

@@ -7,7 +7,9 @@
 //
 
 #import "GMToFaceDoctorBlockInfoView.h"
-#import "UIView+GMGradient.h"
+#import "GMLibraryHeader.h"
+//#import "UIView+GMGradient.h"
+
 @interface GMToFaceDoctorBlockInfoView ()
 @property (nonatomic, strong) GMLabel *titleLabel;
 @end
@@ -30,9 +32,10 @@
         make.height.mas_equalTo(46);
     }];
     //渐变色
-    [self setGradientBackgroundWithColors:@[GMColorFF7096,GMColorFF5963] locations:nil startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
+    [self setGradientBackgroundWithColors:@[RGBCOLOR_HEX(0xFF7096),RGBCOLOR_HEX(0xFF5963)] locations:nil startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
     self.alpha = 0.7;
 }
+
 - (void)setBlockInfo:(NSString *)blockInfo {
     self.titleLabel.text = SafeString(blockInfo);
     self.hidden = ![SafeString(blockInfo) isNonEmpty];

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMToFaceDoctorListHeaderFlowLayout.h

@@ -5,7 +5,7 @@
 //  Created by Jessica on 2020/3/28.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
-
+#import "GMLibraryHeader.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GMToFaceDoctorListHeaderFlowLayout : UICollectionViewFlowLayout

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

@@ -10,7 +10,10 @@
 #import "GMBasicInfoCardView.h"
 #import "GMDoctorInfoPopupView.h"
 #import "GMConsultantInfoModel.h"
-
+#import "GMToFaceNetworking.h"
+#import "GMLibraryHeader.h"
+#import "RequestHeader.h"
+#import <GMBase/GMBaseTool.h>
 @interface GMToFaceDoctorListHorNewCell ()<GMDoctorInfoPopupViewDelegate>
 /** 形象照 */
 @property (nonatomic, strong) UIImageView *personalIcon;
@@ -114,15 +117,15 @@
         NSRange range = [str rangeOfString:@"/"];
         [attribute addAttributes:@{NSFontAttributeName: [UIFont gmBoldFont:10]} range:NSMakeRange(range.location, str.length - range.location)];
         [attribute addAttributes:@{NSFontAttributeName: [UIFont gmBoldFont:12]} range:NSMakeRange(0, 1)];
-        [attribute addAttributes:@{NSForegroundColorAttributeName: ALColorFFFFFF} range:NSMakeRange(range.location, str.length - range.location)];
+        [attribute addAttributes:@{NSForegroundColorAttributeName: RGBCOLOR_HEX(0xFFFFFF) } range:NSMakeRange(range.location, str.length - range.location)];
         self.priceLabel.attributedText = attribute;
     }
     self.exposure = doctorsModel.exposure;
 }
 
 - (void)clickUserIconMethod {
-    AppDelegate.visibleController.tabName = @"医生推荐";
-    [Phobos track:@"on_click_card" attributes:@{ @"page_name":AppDelegate.visibleController.pageName,
+    [GMBaseTool getCurrentViewController].tabName = @"医生推荐";
+    [Phobos track:@"on_click_card" attributes:@{ @"page_name":[GMBaseTool getCurrentViewController].pageName,
                                                  @"tab_name":@"医生推荐",
                                                  @"position":@(self.indexPath.item),
                                                  @"card_id":SafeString(self.doctorsModel.counsellorId),
@@ -138,8 +141,8 @@
     }];
 }
 - (void)clickBottomBtnMethod {
-    AppDelegate.visibleController.tabName = @"医生推荐";
-    [Phobos track:@"on_click_card" attributes:@{ @"page_name":AppDelegate.visibleController.pageName,
+    [GMBaseTool getCurrentViewController].tabName = @"医生推荐";
+    [Phobos track:@"on_click_card" attributes:@{ @"page_name":[GMBaseTool getCurrentViewController].pageName,
                                                  @"tab_name":@"医生推荐",
                                                  @"position":@(self.indexPath.item),
                                                  @"card_id":SafeString(self.doctorsModel.counsellorId),
@@ -157,13 +160,13 @@
 - (void)counsellorFillInfoView {
     //填写信息卡片
     __weak __typeof(self)weakSelf = self;
-    [[GMInterfaceNetwork shareInstance] excuteToFaceBlockInfoSuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceBlockInfoSuccessBlock:^(id response) {
         NSDictionary *dict = response[@"block_info"];
         NSString *alert = dict[@"alert"];
         if (![alert isNonEmpty]) {
             //请求用户填面诊信息的弹框
             GMBasicInfoCardView *cardView = [GMBasicInfoCardView new];
-            cardView.referer = AppDelegate.visibleController.pageName;
+            cardView.referer = [GMBaseTool getCurrentViewController].pageName;
             cardView.counsellorId = weakSelf.doctorsModel.counsellorId;
             cardView.doctorId = weakSelf.doctorsModel.doctorId;
             cardView.tabName = @"医生推荐";
@@ -197,10 +200,10 @@
             };
             popupView.delegate = weakSelf;
             popupView.model = model;
-            [AppDelegate.visibleController.view addSubview:popupView];
+            [[GMBaseTool getCurrentViewController].view addSubview:popupView];
             weakSelf.personalIcon.userInteractionEnabled = YES;
         } else {
-            [AppDelegate.visibleController toast:response.message];
+            [[GMBaseTool getCurrentViewController] toast:response.message];
             weakSelf.personalIcon.userInteractionEnabled = YES;
         }
     }];
@@ -208,7 +211,7 @@
 
 #pragma mark - 医生头像
 - (void)docIconClickMethod {
-    AppDelegate.visibleController.tabName = @"医生推荐";
+    [GMBaseTool getCurrentViewController].tabName = @"医生推荐";
     self.personalIcon.userInteractionEnabled = NO;
     // 若该医生为在线可面诊状态，则拉起基本信息卡，若为面诊中/不在线状态，跳转医生详情页/或者弹出面诊师卡片
     if ( self.doctorsModel.status == 2) { // 在线状态
@@ -292,7 +295,7 @@
 }
 - (GMLabel *)priceLabel {
     if (!_priceLabel) {
-        _priceLabel = [GMLabel labelWithTextColor:GMColorFF8C8D fontSize:16];
+        _priceLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0xFF8C8D) fontSize:16];
         _priceLabel.font = [UIFont gmBoldFont:16];
     }
     return _priceLabel;

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

@@ -7,6 +7,8 @@
 //
 
 #import "GMToFaceDoctorListModel.h"
+#import <GMKit/GMView.h>
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GMToFaceDoctorListNewHeaderView : GMView

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

@@ -9,7 +9,7 @@
 #import "GMToFaceDoctorListNewHeaderView.h"
 #import "GMToFaceDoctorListHeaderFlowLayout.h"
 #import "GMToFaceDoctorListHorNewCell.h"
-#import "GMWeakProxy.h"
+#import "GMTelephoneProxy.h"
 #import "GMFaceListPageControl.h"
 
 #define MaxCount 500
@@ -30,7 +30,7 @@
 }
 
 - (void)setUI {
-    self.backgroundColor = GMColorF7F6FA;
+    self.backgroundColor = RGBCOLOR_HEX(0xF7F6FA);
     [self addSubview:self.collectView];
     [self addSubview:self.pageControl];
 
@@ -81,7 +81,7 @@
 }
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
 //    GMToFaceRecommendsDoctors *model = self.dataArray[indexPath.row];
-//    AppDelegate.visibleController.tabName = @"医生推荐";
+//    [GMBaseTool getCurrentViewController].tabName = @"医生推荐";
 //    //跳到医生主页
 //    [[GMRouter sharedInstance] pushScheme:model.gm_url];
 }
@@ -114,7 +114,7 @@
         [self invalidateTimer];
     }
 
-    self.timer = [NSTimer timerWithTimeInterval:10 target:[GMWeakProxy proxyWithTarget:self] selector:@selector(nextPage) userInfo:nil repeats:YES];
+    self.timer = [NSTimer timerWithTimeInterval:10 target:[GMTelephoneProxy proxyWithTarget:self] selector:@selector(nextPage) userInfo:nil repeats:YES];
     [[NSRunLoop mainRunLoop] addTimer:self.timer forMode:NSDefaultRunLoopMode];
 }
 
@@ -161,7 +161,7 @@
     if (!_collectView) {
         _collectView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:self.layout];
         _collectView.showsHorizontalScrollIndicator = NO;
-        _collectView.backgroundColor = GMColorF7F6FA;
+        _collectView.backgroundColor = RGBCOLOR_HEX(0xF7F6FA);
         _collectView.decelerationRate = UIScrollViewDecelerationRateFast;
         _collectView.delegate = self;
         _collectView.dataSource = self;
@@ -173,8 +173,8 @@
     if (!_pageControl) {
         _pageControl = [[GMFaceListPageControl alloc] init];
         _pageControl.numberOfPages = 0;
-        _pageControl.tintColor = GMColorD8D8D8;
-        _pageControl.currentTintColor = GMColor7DC6CC;
+        _pageControl.tintColor = RGBCOLOR_HEX(0xD8D8D8);
+        _pageControl.currentTintColor = RGBCOLOR_HEX(0x7DC6CC);
     }
     return _pageControl;
 }

GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMToFaceDoctorListVerCell.h

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 #import "GMToFaceDoctorListViewModel.h"
+#import "GMLibraryHeader.h"
 @interface GMToFaceDoctorInfoView : GMView
 
 - (void)showWithLikeRate:(NSString *)likeRate connectRate:(NSString *)connectRate consultPeopleNumber:(NSString *)consultPeopleNumber showType:(NSInteger)showType;

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMToFaceDoctorListVerCell.h"
+
 @interface GMToFaceDoctorInfoView()
 /** 好评率 */
 @property (nonatomic, copy) NSString *likeRate;
@@ -107,7 +108,7 @@
             
             _icon.image = [UIImage imageNamed:@"to_face_like_rate"];
             _label.text = [NSString stringWithFormat:@"好评%@", likeRate];
-            _icon1.backgroundColor = GMColor44D7B6;
+            _icon1.backgroundColor = RGBCOLOR_HEX(0x44D7B6);
             _icon1.layer.cornerRadius = 2;
             _icon1.layer.masksToBounds = YES;
             _icon1.image = [UIImage imageNamed:@""];
@@ -140,7 +141,7 @@
             if (connectRate.isNonEmpty) {
                 [self addSubview:self.icon1];
                 [self addSubview:self.label1];
-                _icon1.backgroundColor = GMColor44D7B6;
+                _icon1.backgroundColor = RGBCOLOR_HEX(0x44D7B6);
                 _icon1.layer.cornerRadius = 2;
                 _icon1.layer.masksToBounds = YES;
                 _icon1.image = [UIImage imageNamed:@""];
@@ -331,7 +332,7 @@
         NSRange range = [str rangeOfString:@"/"];
         range = NSMakeRange(range.location, str.length - range.location);
         NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:str];
-        [attribute addAttributes:@{NSForegroundColorAttributeName : ALColor8E8E8E} range:range];
+        [attribute addAttributes:@{NSForegroundColorAttributeName : RGBCOLOR_HEX(0x8E8E8E) } range:range];
         [attribute addAttributes:@{NSFontAttributeName : [UIFont gmFont:12]} range:range];
         self.priceLabel.attributedText = attribute;
     }
@@ -361,9 +362,9 @@
 #pragma mark - 医生身份
 - (void)doctorIdentity {
     if (self.doctorsModel.type == 1) { // 医生
-        _docTitleView.layer.borderColor = GMColor65B4FF.CGColor;
+        _docTitleView.layer.borderColor = RGBCOLOR_HEX(0x65B4FF).CGColor;
     } else if (self.doctorsModel.type == 2) {
-        _docTitleView.layer.borderColor = GMColor51CDC7.CGColor;
+        _docTitleView.layer.borderColor = RGBCOLOR_HEX(0x51CDC7).CGColor;
     }
     [self.docTitleView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         if (idx == 0) {
@@ -377,9 +378,9 @@
             GMLabel *label = (GMLabel *)obj;
             label.text = SafeString(self.doctorsModel.title);
             if (self.doctorsModel.type == 1) { // 医生
-                label.textColor = GMColor65B4FF;
+                label.textColor = RGBCOLOR_HEX(0x65B4FF);
             }else if (self.doctorsModel.type == 2) { // 面诊师
-                label.textColor = GMColor51CDC7;
+                label.textColor = RGBCOLOR_HEX(0x51CDC7);
             }
         }
     }];
@@ -423,7 +424,7 @@
         _docTitleView = [[UIView alloc] init];
         _docTitleView.layer.cornerRadius = 7.5f;
         _docTitleView.layer.masksToBounds = YES;
-        _docTitleView.layer.borderColor = GMColor65B4FF.CGColor;
+        _docTitleView.layer.borderColor = RGBCOLOR_HEX(0x65B4FF).CGColor;
         _docTitleView.layer.borderWidth = ONE_PIXEL;
         UIImageView *corView = [[UIImageView alloc] init];
         corView.layer.cornerRadius = 7.5f;
@@ -434,7 +435,7 @@
             make.size.mas_equalTo(CGSizeMake(15, 15));
             make.centerY.mas_equalTo(0);
         }];
-        GMLabel *label = [GMLabel labelWithTextColor:GMColor65B4FF fontSize:10];
+        GMLabel *label = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x65B4FF) fontSize:10];
         [_docTitleView addSubview:label];
         [label mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerY.mas_equalTo(0);
@@ -454,7 +455,7 @@
 
 - (GMLabel *)docNameLabel {
     if (!_docNameLabel) {
-        _docNameLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:14];
+        _docNameLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:14];
         _docNameLabel.font = [UIFont gmFont:14];
     }
     return _docNameLabel;
@@ -462,7 +463,7 @@
 
 - (GMLabel *)docWorkTimeLabel {
     if (!_docWorkTimeLabel) {
-        _docWorkTimeLabel = [GMLabel labelWithTextColor:ALColor8E8E8E fontSize:12];
+        _docWorkTimeLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x8E8E8E)  fontSize:12];
     }
     return _docWorkTimeLabel;
 }
@@ -477,7 +478,7 @@
             make.left.mas_equalTo(0);
             make.centerY.equalTo(_positionView.mas_centerY);
         }];
-        GMLabel *label = [GMLabel labelWithTextColor:ALColor8E8E8E fontSize:10];
+        GMLabel *label = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x8E8E8E)  fontSize:10];
         [_positionView addSubview:label];
         [label mas_makeConstraints:^(MASConstraintMaker *make) {
            make.left.equalTo(icon.mas_right).offset(2);
@@ -488,7 +489,7 @@
 }
 - (GMLabel *)goodAtLabel {
     if (!_goodAtLabel) {
-        _goodAtLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:12];
+        _goodAtLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:12];
         _goodAtLabel.font = [UIFont gmFont:12];
         _goodAtLabel.numberOfLines = 2;
     }
@@ -496,7 +497,7 @@
 }
 - (GMLabel *)priceLabel {
     if (!_priceLabel) {
-        _priceLabel = [GMLabel labelWithTextColor:GMColorFF8C8D fontSize:16];
+        _priceLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0xFF8C8D) fontSize:16];
         _priceLabel.font = [UIFont gmBoldFont:16];
     }
     return _priceLabel;

GMAILab/Classes/ToFace/ToFaceDoctorList/ViewController/GMToFaceContainerViewController.h

@@ -6,11 +6,11 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
-#import "GMPagingViewController.h"
+#import "GMFacePagingViewController.h"
 #import "GMToFaceDoctorListViewModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
-@interface GMToFaceContainerViewController : GMPagingViewController
+@interface GMToFaceContainerViewController : GMFacePagingViewController
 @property (nonatomic, strong) GMToFaceDoctorListViewModel *viewModel;
 @end
 

GMAILab/Classes/ToFace/ToFaceDoctorList/ViewController/GMToFaceContainerViewController.m

@@ -15,6 +15,9 @@
 #import "GMToFaceDoctorBlockInfoView.h"
 #import "GMBasicInfoCardView.h"
 #import "GMToFaceDoctorListNewHeaderView.h"
+#import "GMToFaceNetworking.h"
+#import "GMLibraryHeader.h"
+#import "UIResponder+transmission.h"
 
 @interface GMToFaceContainerViewController ()<GMInfinitelViewDelegate, UIScrollViewDelegate>
 /** 头部视图 */
@@ -73,7 +76,7 @@
     self.navigationBar.isShowShadow = NO;
     self.fd_interactivePopDisabled = YES;
     self.navigationBar.title = @"更美视频面诊";
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDoctorListMethod) name:LOGIN_SUCCESS_NOTIFICATION object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDoctorListMethod) name:@"login_success_notification" object:nil];
     
 }
 - (void)backAction:(OCNavigationBarButton *)button {
@@ -95,13 +98,13 @@
 }
 - (void)reSetSegmentView {
     self.segmentView.isShowShadow = NO;
-    self.segmentView.backgroundColor = GMColorF7F6FA;
-    self.segmentView.indicatorColor = GMColorFF8C8D;
+    self.segmentView.backgroundColor = RGBCOLOR_HEX(0xF7F6FA);
+    self.segmentView.indicatorColor = RGBCOLOR_HEX(0xFF8C8D);
     self.segmentView.height = 74.f;
     self.segmentView.titleTextAttributes = @{NSFontAttributeName:[UIFont gmBoldFont:15],
-                                             NSForegroundColorAttributeName:GMColor696969};
+                                             NSForegroundColorAttributeName:RGBCOLOR_HEX(0x696969)};
     self.segmentView.selectedTitleTextAttributes = @{NSFontAttributeName:[UIFont gmBoldFont:16],
-                                                     NSForegroundColorAttributeName:GMColor2A2828};
+                                                     NSForegroundColorAttributeName:RGBCOLOR_HEX(0x2A2828)};
 }
 - (void)setupChildViews {
     CGFloat height = self.recommendDoctorListModel.recommendsCounsellors.count > 0 ? [GMToFaceDoctorListNewHeaderView viewHeight] : 0;
@@ -121,7 +124,7 @@
         [self showLoading:nil];
     }
     __weak typeof(self)weakSelf = self;
-    [[GMInterfaceNetwork shareInstance] excuteToFaceRecommendDoctorsSuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceRecommendDoctorsSuccessBlock:^(id response) {
         NSError *error = [[NSError alloc] init];
         weakSelf.recommendDoctorListModel = [[GMToFaceDoctorListModel alloc] initWithDictionary:response error:&error];
         [weakSelf loadHome];
@@ -250,7 +253,7 @@
 - (void)bottomBtnClick {
     [Phobos track:@"on_click_button" attributes:@{@"page_name":self.pageName,@"button_name":@"video_interview_now"}];
     __weak __typeof(self)weakSelf = self;
-    [[GMInterfaceNetwork shareInstance] excuteToFaceBlockInfoSuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceBlockInfoSuccessBlock:^(id response) {
         NSDictionary *dict = response[@"block_info"];
         NSString *alert = dict[@"alert"];
         if (![alert isNonEmpty]) {

GMAILab/Classes/ToFace/ToFaceDoctorList/ViewController/GMToFaceDoctorListController.h

@@ -8,12 +8,14 @@
 
 #import "JXPagerView.h"
 #import "GMToFaceDoctorListViewModel.h"
+@import GMBase;
+
 
 @interface GMToFaceDoctorListController : WMBaseViewController<JXPagerViewListViewDelegate>
-@property (nonatomic, strong) GMToFaceDoctorListViewModel *viewModel;
+@property (nonatomic, strong) GMToFaceDoctorListViewModel   * _Nullable viewModel;
 @property (nonatomic, assign) CGFloat topViewHeight;
-@property (nonatomic, copy, nullable) void(^scrollCallback)(UIScrollView *scrollView);
+@property (nonatomic, copy, nullable) void(^scrollCallback)(UIScrollView * _Nullable scrollView);
 /** 获取封禁信息的回调 */
-@property (nonatomic, copy, nullable) void(^blockInfoCallback)(NSString *blockInfo);
+@property (nonatomic, copy, nullable) void(^blockInfoCallback)(NSString  * _Nullable blockInfo);
 - (void)requestData;
 @end

GMAILab/Classes/ToFace/ToFaceDoctorList/ViewController/GMToFaceDoctorListController.m

@@ -8,17 +8,22 @@
 
 #import "GMToFaceDoctorListController.h"
 #import "GMToFaceDoctorListVerCell.h"
-#import <GMRefreshFooter.h>
 #import "GMToFaceDoctorListModel.h"
-#import "GMCommonEmptyView.h"
+#import "GMToFaceCommonEmptyView.h"
 #import "GMBasicInfoCardView.h"
 #import "UIView+GMGradient.h"
 #import "GMDoctorInfoPopupView.h"
-@interface GMToFaceDoctorListController ()<UICollectionViewDelegate, UICollectionViewDataSource, GMCommonEmptyViewDelegate>
+#import "RequestHeader.h"
+#import "GMToFaceNetworking.h"
+#import "GMLibraryHeader.h"
+#import <GMBase/GMBaseTool.h>
+
+
+@interface GMToFaceDoctorListController ()<UICollectionViewDelegate, UICollectionViewDataSource, GMToFaceCommonEmptyViewDelegate>
 @property (nonatomic, strong) UICollectionViewFlowLayout *layout;
 @property (nonatomic, strong) UICollectionView *collectView;
 @property (nonatomic, strong) NSIndexPath *indexPath;
-@property (nonatomic, strong) GMCommonEmptyView *commonEmptyView;
+@property (nonatomic, strong) GMToFaceCommonEmptyView *commonEmptyView;
 @end
 
 @implementation GMToFaceDoctorListController
@@ -56,20 +61,20 @@
 }
 - (void)requestData {
     if (self.viewModel.page == 1) {
-        [AppDelegate.visibleController showLoading:nil];
+        [[GMBaseTool getCurrentViewController] showLoading:nil];
     }
     self.commonEmptyView.hidden = YES;
     [self.viewModel excuteToFaceTabsDoctorsSuccessBlock:^(id responseObject) {
-        [AppDelegate.visibleController hideLoading];
+        [[GMBaseTool getCurrentViewController] hideLoading];
         if (self.viewModel.dataArray.count == 0) {
-            self.commonEmptyView.type = GMCommonEmptyViewTypeEmpty;
+            self.commonEmptyView.type = GMToFaceCommonEmptyViewTypeEmpty;
         }
         [self.collectView.mj_footer endRefreshing];
         [self.collectView reloadData];
     } failBlock:^(NSString *message) {
-        [AppDelegate.visibleController hideLoading];
+        [[GMBaseTool getCurrentViewController] hideLoading];
         [self.collectView.mj_footer endRefreshing];
-        self.commonEmptyView.type = GMCommonEmptyViewTypeError;
+        self.commonEmptyView.type = GMToFaceCommonEmptyViewTypeError;
     }];
 }
 - (void)emptyViewDidClickReload {
@@ -119,11 +124,13 @@
                                                 @"transaction_type":@"-1",
                                                 @"counsellor_type":@(model.type)
     }];
-    AppDelegate.visibleController.tabName = SafeString(self.viewModel.tabName);
+    [GMBaseTool getCurrentViewController].tabName = SafeString(self.viewModel.tabName);
 }
 
 - (void)counsellorFillInfoView:(GMToFaceRecommendsDoctors *)model indexPath:(NSIndexPath *)indexPath{
-    if ([[GMLoginManager shareInstance] showLoginViewIfNeeded]) {
+    BOOL status = (BOOL)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_showLoginViewIfNeeded"];
+
+    if (status) {
         return;
     }
     if (self.indexPath == indexPath) {//目的是防止重复点击
@@ -132,7 +139,7 @@
     self.collectView.userInteractionEnabled = NO;
     self.indexPath = indexPath;
     __weak __typeof(self)weakSelf = self;
-    [[GMInterfaceNetwork shareInstance] excuteToFaceBlockInfoSuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceBlockInfoSuccessBlock:^(id response) {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             weakSelf.indexPath = nil;
         });        
@@ -179,9 +186,9 @@
                 }
             };
             popupView.model = model;
-            [AppDelegate.visibleController.view addSubview:popupView];
+            [[GMBaseTool getCurrentViewController].view addSubview:popupView];
         } else {
-            [AppDelegate.visibleController toast:response.message];
+            [[GMBaseTool getCurrentViewController] toast:response.message];
         }
         weakSelf.collectView.userInteractionEnabled = YES;
     }];
@@ -215,8 +222,8 @@
 - (UICollectionView *)collectView {
     if (!_collectView) {
         _collectView = [[UICollectionView alloc] initWithFrame:self.view.bounds collectionViewLayout:self.layout];        
-//        [_collectView setGradientBackgroundWithColors:@[ALColorFFFFFF,GMColorF7F6FA] locations:nil startPoint:CGPointMake(0, 0) endPoint:CGPointMake(0, 0.1)];
-        _collectView.backgroundColor = GMColorF7F6FA;
+//        [_collectView setGradientBackgroundWithColors:@[RGBCOLOR_HEX(0xFFFFFF) ,GMColorF7F6FA] locations:nil startPoint:CGPointMake(0, 0) endPoint:CGPointMake(0, 0.1)];
+        _collectView.backgroundColor = RGBCOLOR_HEX(0xF7F6FA);
         _collectView.delegate = self;
         _collectView.dataSource = self;
         _collectView.showsVerticalScrollIndicator = NO;
@@ -224,9 +231,9 @@
     }
     return _collectView;
 }
-- (GMCommonEmptyView *)commonEmptyView {
+- (GMToFaceCommonEmptyView *)commonEmptyView {
     if (!_commonEmptyView) {
-        _commonEmptyView = [[GMCommonEmptyView alloc] init];
+        _commonEmptyView = [[GMToFaceCommonEmptyView alloc] init];
         _commonEmptyView.delegate = self;
         _commonEmptyView.hidden = YES;
     }

GMAILab/Classes/ToFace/ToFaceOrder/Model/GMPayResultModel.h

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
+@import GMBase;
 
 @interface GMPayResultModel : GMObject
 

GMAILab/Classes/ToFace/ToFaceOrder/Model/GMToFaceOrderInfoModel.h

@@ -7,6 +7,7 @@
 //
 
 
+@import GMBase;
 
 @interface GMToFaceOrderInfoModel : GMObject
 

GMAILab/Classes/ToFace/ToFaceOrder/Model/GMToFacePayPrepareModel.h

@@ -5,6 +5,8 @@
 //  Created by zhouLiang on 2020/4/8.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
+
 @protocol GMToFacePayCounsellorInfoModel @end
 @interface GMToFacePayCounsellorInfoModel : GMObject
 @property (nonatomic, copy) NSString *id;

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMPayTypeView.h"
+#import "GMLibraryHeader.h"
 
 @interface GMPayTypeView ()
 @property (strong, nonatomic) UIImageView *payWayImage;
@@ -32,7 +33,7 @@
     [self.payWayImage sd_setImageWithURL:[NSURL URLWithString:typeModel.icon]];
     self.payDesc.text = typeModel.desc;
     self.payName.text = typeModel.title;
-    self.payDesc.textColor = typeModel.recommend?GMColorFF5963:GMColor999999;
+    self.payDesc.textColor = typeModel.recommend?RGBCOLOR_HEX(0xFF5963):RGBCOLOR_HEX(0x999999);
     self.recommendIcon.hidden = !typeModel.recommend;
 }
 - (void)setIsSelected:(BOOL)isSelected {
@@ -82,14 +83,14 @@
 }
 - (GMLabel *)payName {
     if (!_payName) {
-        _payName = [GMLabel labelWithTextColor:GMColor282828 fontSize:14];
+        _payName = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:14];
         _payName.text = @"支付宝支付";
     }
     return _payName;
 }
 - (GMLabel *)payDesc {
     if (!_payDesc) {
-        _payDesc = [GMLabel labelWithTextColor:GMColorFF5963 fontSize:12];
+        _payDesc = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0xFF5963) fontSize:12];
         _payDesc.text = @"推荐使用支付宝支付";
     }
     return _payDesc;

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

@@ -7,6 +7,8 @@
 //
 
 #import "GMToFaceOrderInfoModel.h"
+#import "GMLibraryHeader.h"
+
 
 @interface GMSureOrderPopView : GMPopupBgView
 /// 面诊 ID

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

@@ -9,6 +9,9 @@
 #import "GMSureOrderPopView.h"
 #import "GMEndConsultView.h"
 #import "GMStarWithContentObject.h"
+#import "GMToFaceNetworking.h"
+#import <GMBase/GMBaseTool.h>
+
 
 @interface GMSureOrderPopView ()
 @property (nonatomic, strong) GMLabel *topLabel;
@@ -133,6 +136,13 @@
     });
 }
 
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
 - (void)setInfoModel:(GMToFaceOrderInfoModel *)infoModel {
     _infoModel = infoModel;
     self.titleLabel.text = infoModel.counsellorType == 1 ? @"面诊医生 | ":@"面诊师 | ";
@@ -149,14 +159,14 @@
     NSRange priceRange = [priceStr rangeOfString:@"￥"];
     priceRange = NSMakeRange(priceRange.location, priceStr.length - priceRange.location);
     NSMutableAttributedString *priceAttribute = [[NSMutableAttributedString alloc] initWithString:priceStr];
-    [priceAttribute addAttributes:@{NSForegroundColorAttributeName : GMColorFF8C8D} range:priceRange];
+    [priceAttribute addAttributes:@{NSForegroundColorAttributeName : RGBCOLOR_HEX(0xFF8C8D)} range:priceRange];
     self.priceLabel.attributedText = priceAttribute;
     
     NSString *payStr = self.payLabel.text;
     NSRange payRange = [payStr rangeOfString:@"￥"];
     payRange = NSMakeRange(payRange.location, payStr.length - payRange.location);
     NSMutableAttributedString *payAttribute = [[NSMutableAttributedString alloc] initWithString:payStr];
-    [payAttribute addAttributes:@{NSForegroundColorAttributeName : GMColorFF8C8D} range:payRange];
+    [payAttribute addAttributes:@{NSForegroundColorAttributeName : RGBCOLOR_HEX(0xFF8C8D)} range:payRange];
     self.payLabel.attributedText = payAttribute;
 }
 #pragma mark - 确认订单弹框
@@ -166,11 +176,11 @@
     if (self.isSureOrder) {
         [self starMethod];
     }else {
-        [[GMInterfaceNetwork shareInstance] excuteToFaceSureOrder:self.infoModel.orderNo SuccessBlock:^(id response) {
+        [[GMToFaceNetworking shareInstance] excuteToFaceSureOrder:self.infoModel.orderNo SuccessBlock:^(id response) {
             self.isSureOrder = YES;
             [self starMethod];
         } failureBlock:^(NSInteger errorCode, NSString *message) {
-            [AppDelegate.visibleController toast:message];
+            [[GMBaseTool getCurrentViewController] toast:message];
             [self hide];
         }];
     }
@@ -194,7 +204,7 @@
     };
     view.recordId = self.infoModel.consultationRecordId;
     view.complaintType = GMComplaintTypeDoctor;
-    [AppDelegate.navigation.view addSubview:view];
+    [[GMBaseTool getCurrentViewController].view addSubview:view];
 }
 - (void)clickConfireBtnPhobo:(NSInteger)counsellorType consultationType:(NSInteger)consultationType doctorId:(NSString *)doctorId {
     _counsellorType = counsellorType;
@@ -216,7 +226,7 @@
 - (void)starMethod {
     //是面诊师直接弹评价弹框
     __weak typeof(self) weakSelf = self;
-    [[GMInterfaceNetwork shareInstance] excuteToFaceEvaluateItemDiagnosis_id:self.infoModel.consultationRecordId SuccessBlock:^(id response) {
+    [[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];
@@ -239,7 +249,7 @@
         view.showComplaint = NO;
         view.recordId = self.infoModel.consultationRecordId;
         view.starContentArray = starContentModel.evaluates;
-        [AppDelegate.navigation.view addSubview:view];
+        [[GMBaseTool getCurrentViewController].view addSubview:view];
     } failureBlock:^(NSInteger errorCode, NSString *message) {
         [self hide];
     }];
@@ -252,7 +262,7 @@
 }
 - (GMLabel *)topLabel {
     if (!_topLabel) {
-        _topLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:16];
+        _topLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:16];
         _topLabel.font = [UIFont gmBoldFont:16];
         _topLabel.text = @"请确认视频面诊信息";
     }
@@ -268,44 +278,44 @@
 }
 - (GMLabel *)titleLabel {
     if (!_titleLabel) {
-        _titleLabel = [GMLabel labelWithTextColor:ALColor282828 fontSize:12];
+        _titleLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828)  fontSize:12];
     }
     return _titleLabel;
 }
 - (GMLabel *)nameLabel {
     if (!_nameLabel) {
-        _nameLabel = [GMLabel labelWithTextColor:ALColor282828 fontSize:16];
+        _nameLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828)  fontSize:16];
         _nameLabel.font = [UIFont gmBoldFont:16];
     }
     return _nameLabel;
 }
 - (GMLabel *)startTimeLabel {
     if (!_startTimeLabel) {
-        _startTimeLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:12];
+        _startTimeLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:12];
     }
     return _startTimeLabel;
 }
 - (GMLabel *)endTimeLabel {
     if (!_endTimeLabel) {
-        _endTimeLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:12];
+        _endTimeLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:12];
     }
     return _endTimeLabel;
 }
 - (GMLabel *)durationLabel {
     if (!_durationLabel) {
-        _durationLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:12];
+        _durationLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:12];
     }
     return _durationLabel;
 }
 - (GMLabel *)priceLabel {
     if (!_priceLabel) {
-        _priceLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:12];
+        _priceLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:12];
     }
     return _priceLabel;
 }
 - (GMLabel *)payLabel {
     if (!_payLabel) {
-        _payLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:12];
+        _payLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:12];
     }
     return _payLabel;
 }
@@ -313,7 +323,7 @@
     if (!_sureBtn) {
         _sureBtn = [GMButton buttonWithType:(UIButtonTypeCustom)];
         _sureBtn.multiControlTimeInterva = 2.f;
-        [_sureBtn setBackgroundColor:GMColorFF8C8D forState:(UIControlStateNormal)];
+        [_sureBtn setBackgroundColor:RGBCOLOR_HEX(0xFF8C8D) forState:(UIControlStateNormal)];
         [_sureBtn setTitle:@"确认订单" forState:(UIControlStateNormal)];
         [_sureBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)];
         [_sureBtn addTarget:self action:@selector(sureBtnClick) forControlEvents:(UIControlEventTouchUpInside)];
@@ -331,7 +341,7 @@
         [_problemBtn.titleLabel setFont:[UIFont gmFont:13]];
         _problemBtn.enableAdaptive = YES;
         [_problemBtn setTitle:@"问题申诉>" forState:(UIControlStateNormal)];
-        [_problemBtn setTitleColor:GMColorFF8C8D forState:(UIControlStateNormal)];
+        [_problemBtn setTitleColor:RGBCOLOR_HEX(0xFF8C8D) forState:(UIControlStateNormal)];
     }
     return _problemBtn;
 }

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMToFaceOrderFooterView.h"
+@import GMBase;
 
 @interface GMToFaceOrderFooterView ()
 @property (nonatomic, strong) GMLabel *payNameLabel;
@@ -60,14 +61,14 @@
 }
 - (GMLabel *)payNameLabel {
     if (!_payNameLabel) {
-        _payNameLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:14];
+        _payNameLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:14];
         _payNameLabel.text = @"支付金额：";
     }
     return _payNameLabel;
 }
 - (GMLabel *)moneyLabel {
     if (!_moneyLabel) {
-        _moneyLabel = [GMLabel labelWithTextColor:GMColorFF8C8D fontSize:14];
+        _moneyLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0xFF8C8D) fontSize:14];
     }
     return _moneyLabel;
 }
@@ -75,7 +76,7 @@
     if (!_payBtn) {
         _payBtn = [GMButton buttonWithType:(UIButtonTypeCustom)];
         [_payBtn addTarget:self action:@selector(payBtnClick) forControlEvents:(UIControlEventTouchUpInside)];
-        [_payBtn setBackgroundColor:GMColorFF8C8D forState:(UIControlStateNormal)];
+        [_payBtn setBackgroundColor:RGBCOLOR_HEX(0xFF8C8D) forState:(UIControlStateNormal)];
         [_payBtn setTitle:@"立即支付" forState:(UIControlStateNormal)];
         [_payBtn.titleLabel setFont:[UIFont gmBoldFont:16]];
         _payBtn.layer.cornerRadius = 20.f;

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMToFaceOrderHeaderView.h"
+#import "GMLibraryHeader.h"
 
 @interface GMToFaceOrderHeaderView ()
 @property (nonatomic, strong) UIImageView *headerIcon;
@@ -35,7 +36,7 @@
     NSRange range = [self.payLabel.text rangeOfString:@"/"];
     range = NSMakeRange(range.location, self.payLabel.text.length - range.location);
     NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:self.payLabel.text];
-    [attribute addAttributes:@{NSForegroundColorAttributeName : ALColor999999} range:range];
+    [attribute addAttributes:@{NSForegroundColorAttributeName : RGBCOLOR_HEX(0x999999) } range:range];
     [attribute addAttributes:@{NSFontAttributeName : [UIFont gmFont:10]} range:NSMakeRange(0, 1)];
     self.payLabel.attributedText = attribute;
 }
@@ -87,26 +88,26 @@
 }
 - (GMLabel *)titleLabel {
     if (!_titleLabel) {
-        _titleLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:17];
+        _titleLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:17];
     }
     return _titleLabel;
 }
 - (GMLabel *)organizationLabel {
     if (!_organizationLabel) {
-        _organizationLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:13];
+        _organizationLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:13];
     }
     return _organizationLabel;
 }
 - (GMLabel *)moneyLabel {
     if (!_moneyLabel) {
-        _moneyLabel = [GMLabel labelWithTextColor:GMColor999999 fontSize:10];
+        _moneyLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:10];
         _moneyLabel.text = @"金额：";
     }
     return _moneyLabel;
 }
 - (GMLabel *)payLabel {
     if (!_payLabel) {
-        _payLabel = [GMLabel labelWithTextColor:GMColorFF5963 fontSize:16];
+        _payLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0xFF5963) fontSize:16];
     }
     return _payLabel;
 }

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

@@ -12,6 +12,10 @@
 #import "GMToFacePayViewModel.h"
 #import "GMPayResultModel.h"
 #import "GMThirdPartyDefine.h"
+#import "RequestHeader.h"
+#import "GMLibraryHeader.h"
+#import <GMBase/GMBaseTool.h>
+
 
 @interface GMToFacePayPopView ()
 @property (nonatomic, strong) GMLabel *titleLabel;
@@ -68,13 +72,13 @@
 }
 - (void)setNotification {
     //支付宝支付成功
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:ORDER_PAY_SUCCESS object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:@"order_pay_success" object:nil];
     //支付宝支付失败
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:ORDER_PAY_FAIL object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:@"order_pay_fail"  object:nil];
     //微信支付成功
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:kWechatPaySuccess object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:@"kWechatPaySuccess" object:nil];
     //微信支付失败
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:kWechatPayFail object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:@"kWechatPayFail" object:nil];
     //从后台回到前台
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(enterForground) name:UIApplicationWillEnterForegroundNotification object:nil];
 }
@@ -123,6 +127,13 @@
     //这个set方法只会走一次，所以放在这里不会有问题
     [self pvPhoboMethod];
 }
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
 - (void)selectPayTypeMethod:(UIGestureRecognizer *)gesture {
     __weak typeof(self) weakSelf = self;
     [self.orderModel.paymentChannels enumerateObjectsUsingBlock:^(GMToFacePayTypeModel *obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -141,15 +152,15 @@
     self.viewModel.paymentAmount = self.orderModel.paymentAmount;
     //目的是防止重复点击，所以必须要网络请求回来之后才可再次点击
     self.footerView.isCanClick = NO;
-    [AppDelegate.visibleController showLoading:nil];
+    [[GMBaseTool getCurrentViewController] showLoading:nil];
     __weak typeof(self) weakSelf = self;
     [self.viewModel excuteToFacePayCompleteBlock:^(id responseObject) {
         weakSelf.footerView.isCanClick = YES;
-        [AppDelegate.visibleController hideLoading];
+        [[GMBaseTool getCurrentViewController] hideLoading];
     } failedBlock:^(NSString *message) {
         //支付参数获取失败 则可以重新支付
-        [AppDelegate.visibleController toast:message];
-        [AppDelegate.visibleController hideLoading];
+        [[GMBaseTool getCurrentViewController] toast:message];
+        [[GMBaseTool getCurrentViewController] hideLoading];
         weakSelf.footerView.isCanClick = YES;
     }];
 }
@@ -179,20 +190,20 @@
         weakSelf.paiedIsFinish = NO;
         NSNumber *status = responseObject.data[@"order_status"];
         if ([status integerValue] == 2) {
-            [AppDelegate.visibleController toast:@"支付成功，不要走开，立即进入视频面诊连线"];
+            [[GMBaseTool getCurrentViewController] toast:@"支付成功，不要走开，立即进入视频面诊连线"];
             //回调到信息卡页面去做一些操作
             if (weakSelf.PaySuccessBlock) {
                 weakSelf.PaySuccessBlock();
                 [weakSelf hide];
             }
         }else {
-            [AppDelegate.visibleController toast:responseObject.message];
+            [[GMBaseTool getCurrentViewController] toast:responseObject.message];
         }
         
     } failBlock:^(NSString *message) {
         weakSelf.paiedIsFinish = NO;
         [GMHudModule hideLoading];
-        [AppDelegate.visibleController toast:message];
+        [[GMBaseTool getCurrentViewController] toast:message];
     }];
 }
 
@@ -200,10 +211,10 @@
 - (void)orderPayFail:(NSNotification *)noti{
     self.paiedIsFail = YES;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [AppDelegate.visibleController showWarning:@"支付失败"];
+        [[GMBaseTool getCurrentViewController] showWarning:@"支付失败"];
         self.paiedIsFail = NO;
     });
-    [AppDelegate.visibleController hideLoading];
+    [[GMBaseTool getCurrentViewController] hideLoading];
     self.footerView.isCanClick = YES;
 }
 #pragma mark - notification
@@ -233,19 +244,19 @@
             [GMHudModule hideLoading];
             NSNumber *status = responseObject.data[@"order_status"];
             if ([status integerValue] == 2) {
-                [AppDelegate.visibleController toast:@"支付成功，不要走开，立即进入视频面诊连线"];
+                [[GMBaseTool getCurrentViewController] toast:@"支付成功，不要走开，立即进入视频面诊连线"];
                 //回调到信息卡页面去做一些操作
                 if (weakSelf.PaySuccessBlock) {
                     weakSelf.PaySuccessBlock();
                     [weakSelf hide];
                 }
             }else {
-                [AppDelegate.visibleController toast:responseObject.message];
+                [[GMBaseTool getCurrentViewController] toast:responseObject.message];
             }
             
         } failBlock:^(NSString *message) {
             [GMHudModule hideLoading];
-            [AppDelegate.visibleController toast:message];
+            [[GMBaseTool getCurrentViewController] toast:message];
         }];
     });
 }
@@ -273,7 +284,7 @@
 }
 - (GMLabel *)titleLabel {
     if (!_titleLabel) {
-        _titleLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:22.5];
+        _titleLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:22.5];
         _titleLabel.font = [UIFont gmBoldFont:22.5];
         _titleLabel.text = @"请选择支付方式";
     }

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMToFacePaySectionHeaderView.h"
+@import GMKit;
 
 @interface GMToFacePaySectionHeaderView ()
 @property (nonatomic, strong) UIView *labelView;
@@ -49,21 +50,21 @@
 - (UIView *)grayView {
     if (!_grayView) {
         _grayView = [[UIView alloc] init];
-        _grayView.backgroundColor = GMColorF7F6FA;
+        _grayView.backgroundColor = RGBCOLOR_HEX(0xF7F6FA);
     }
     return _grayView;
 }
 - (UIView *)lineView {
     if (!_lineView) {
         _lineView = [[UIView alloc] init];
-        _lineView.backgroundColor = GMColorE5E5E5;
+        _lineView.backgroundColor = RGBCOLOR_HEX(0xE5E5E5);
     }
     return _lineView;
 }
 - (UIView *)labelView {
     if (!_labelView) {
         _labelView = [[UIView alloc] init];
-        GMLabel *label = [GMLabel labelWithTextColor:GMColor282828 fontSize:15];
+        GMLabel *label = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:15];
         label.text = @"请选择支付方式";
         [_labelView addSubview:label];
         [label mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -7,7 +7,8 @@
 //
 
 #import "GMToFacePayTypeCell.h"
-
+@import GMBase;
+@import SDWebImage;
 @interface GMToFacePayTypeCell ()
 @property (strong, nonatomic) UIImageView *payWayImage;
 @property (strong, nonatomic) GMLabel *payName;
@@ -30,7 +31,7 @@
     [self.payWayImage sd_setImageWithURL:[NSURL URLWithString:typeModel.icon]];
     self.payDesc.text = typeModel.desc;
     self.payName.text = typeModel.title;
-    self.payDesc.textColor = typeModel.recommend?GMColorFF5963:GMColor999999;
+    self.payDesc.textColor = typeModel.recommend?RGBCOLOR_HEX(0xFF5963):RGBCOLOR_HEX(0x999999);
     self.recommendIcon.hidden = !typeModel.recommend;
 }
 - (void)setUI {
@@ -82,13 +83,13 @@
 }
 - (GMLabel *)payName {
     if (!_payName) {
-        _payName = [GMLabel labelWithTextColor:GMColor282828 fontSize:14];
+        _payName = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:14];
     }
     return _payName;
 }
 - (GMLabel *)payDesc {
     if (!_payDesc) {
-        _payDesc = [GMLabel labelWithTextColor:GMColorFF5963 fontSize:12];
+        _payDesc = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0xFF5963) fontSize:12];
     }
     return _payDesc;
 }

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

@@ -13,9 +13,13 @@
 #import "GMToFaceOrderFooterView.h"
 #import "GMToFacePayViewModel.h"
 #import "GMPayResultModel.h"
-#import "NSString+jsonData.h"
 #import "GMThirdPartyDefine.h"
+#import "RequestHeader.h"
+#import "GMLibraryHeader.h"
+#import <GMBase/GMBaseTool.h>
+#import "NSString+AIJsonData.h"
 
+@import GMNetworking;
 @interface GMToFaceOrderViewController ()
 @property (nonatomic, strong) GMToFacePayViewModel *payViewModel;
 /** 头部视图 */
@@ -66,15 +70,17 @@
     self.extraParam = [NSString convertToBriefJsonString:param];
     self.businessId = self.orderModel.orderNo;
 }
+
+
 - (void)setNotification {
     //支付宝支付成功
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:ORDER_PAY_SUCCESS object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:@"order_pay_success" object:nil];
     //支付宝支付失败
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:ORDER_PAY_FAIL object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:@"order_pay_fail" object:nil];
     //微信支付成功
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:kWechatPaySuccess object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPaySuccess:) name:@"kWechatPaySuccess" object:nil];
     //微信支付失败
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:kWechatPayFail object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orderPayFail:) name:@"kWechatPayFail" object:nil];
     //从后台回到前台
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(enterForground) name:UIApplicationWillEnterForegroundNotification object:nil];
 }
@@ -122,7 +128,7 @@
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
     UIView *backView = [[UIView alloc] init];
     backView.backgroundColor = UIColor.whiteColor;
-    GMLabel *label = [GMLabel labelWithTextColor:GMColor999999 fontSize:11];
+    GMLabel *label = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:11];
     label.frame = CGRectMake(15, 28, MAINSCREEN_WIDTH - 15, 12);
     label.text = @"为避免订单失效，建议您在3分钟内完成支付";
     [backView addSubview:label];
@@ -143,7 +149,7 @@
     }]];
     UIAlertAction *action = alert.actions.firstObject;
     //这个key是用 runtime属性列表Ivar遍历得到的
-    [action setValue:GMColor282828 forKey:@"titleTextColor"];
+    [action setValue:RGBCOLOR_HEX(0x282828) forKey:@"titleTextColor"];
     [self presentViewController:alert animated:YES completion:nil];
 }
 //页面按钮的点击埋点
@@ -163,7 +169,7 @@
     [GMNetworking requestOCWithApi:API_ORDER_CANCEL method:GMHTTPMethodPost parameters:@{@"order_no":self.orderModel.orderNo} completion:^(GMResponseOC * _Nonnull responseObject) {
         [GMHudModule hideLoading];
         [GMHudModule toastInView:[UIApplication sharedApplication].keyWindow text:responseObject.message];
-        [AppDelegate.visibleController popViewControllerAnimated:YES completion:nil];
+        [[GMBaseTool getCurrentViewController] popViewControllerAnimated:YES completion:nil];
     }];
 }
 #pragma mark - 点击 "立即支付"

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

@@ -9,9 +9,13 @@
 #import "GMTofaceOrderDetailViewController.h"
 #import "GMComplaintObject.h"
 #import "GMComplaintResultView.h"
-#import "Gengmei-Swift.h"
+//#import "Gengmei-Swift.h"
 #import "GMEndConsultView.h"
-
+#import "RequestHeader.h"
+#import "GMToFaceNetworking.h"
+#import <GMBaseWeb/GMBaseWeb-Swift.h>
+#import <WebKit/WebKit.h>
+@import GMHud;
 @interface GMTofaceOrderDetailViewController () <WKWebViewDelegate>
 @property (nonatomic, strong) GMComplaintObject *complaintObject;
 
@@ -44,7 +48,7 @@
 - (void)viewComplaint:(NSString *)jsonString {
     NSString *diagnosisId = SafeString(jsonString);
     [GMHudModule showLoading:nil];
-    [[GMInterfaceNetwork shareInstance] excuteToFaceComplaintGetDiagnosis_id:diagnosisId SuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceComplaintGetDiagnosis_id:diagnosisId SuccessBlock:^(id response) {
         [GMHudModule hideLoading];
         GMComplaintInterfaceObject *model = [[GMComplaintInterfaceObject alloc] initWithDictionary:response error:nil];
         self.complaintObject.report_detail = model.complaint.content;
@@ -54,10 +58,10 @@
         self.complaintObject.custom_url = model.custom_url;
         self.complaintObject.status = model.status;
         GMComplaintResultView *view = [[GMComplaintResultView alloc] initWithType:self.complaintObject.status dictModel:self.complaintObject];
-        [[AppDelegate shareInstance].window addSubview:view];
+        [[GMBaseTool mainWindow]  addSubview:view];
     } failureBlock:^(NSInteger errorCode, NSString *message) {
         [GMHudModule hideLoading];
-        [AppDelegate.visibleController toast:message];
+        [[GMBaseTool getCurrentViewController] toast:message];
     }];
 }
 #pragma mark - 去投诉
@@ -70,7 +74,7 @@
         NSString *jsStr = [NSString stringWithFormat:@"window.gm&&window.gm.pack&&window.gm.pack.run('notificReportState')"];
         [self.webCompent.webView evaluateJavaScript:jsStr completionHandler:nil];
     };
-    [AppDelegate.navigation.view addSubview:view];
+    [[GMBaseTool getCurrentViewController].view addSubview:view];
 }
 
 - (GMComplaintObject *)complaintObject {

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

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+@import GMNetService;
 NS_ASSUME_NONNULL_BEGIN
 typedef NS_ENUM(NSInteger, GMToFacePayType) {
     /** 支付宝 */

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

@@ -10,10 +10,16 @@
 #import <AlipaySDK/AlipaySDK.h>
 #import "WXApiObject.h"
 #import "WXApi.h"
-#import "GMNotificationName.h"
-#import "AppDelegate.h"
 #import "GMPayResultModel.h"
 #import "GMThirdPartyDefine.h"
+#import "RequestHeader.h"
+#import "GMLibraryHeader.h"
+#import <GMBase/GMBaseTool.h>
+
+/***  @brief 订单支付部分*/
+#define ORDER_PAY_SUCCESS                       @"order_pay_success"
+//订单支付成功
+#define ORDER_PAY_FAIL                          @"order_pay_fail"
 
 @interface GMToFacePayViewModel ()
 
@@ -25,11 +31,11 @@
  */
 - (void)excuteToFacePayCompleteBlock:(HttpSuccessBlock)successBlock failedBlock:(HttpFailedBlock)failedBlock {
     if (self.payType == GMToFacePayTypeAlipay && ![[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"alipay://"]]) {
-        [AppDelegate.visibleController toast:@"请安装支付宝"];
+        [[GMBaseTool getCurrentViewController] toast:@"请安装支付宝"];
         return;
     }
     if (self.payType == GMToFacePayTypeWechat && ![WXApi isWXAppInstalled]) {
-        [AppDelegate.visibleController toast:@"请安装微信"];
+        [[GMBaseTool getCurrentViewController] toast:@"请安装微信"];
         return;
     }
     NSString *channel;

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

@@ -7,6 +7,8 @@
 //
 
 #import "GMAppCameraAndMicrophone.h"
+#import <GMBase/GMBaseTool.h>
+
 
 @implementation GMAppCameraAndMicrophone
 /// 相机权限
@@ -66,7 +68,8 @@
     [alert addAction:[UIAlertAction actionWithTitle:@"设置" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
     }]];
-    [AppDelegate.visibleController presentViewController:alert animated:YES completion:nil];
+    UIViewController *vc = [GMBaseTool getCurrentViewController];
+    [vc presentViewController:alert animated:YES completion:nil];
 }
 
 + (void)showCameraAlert {
@@ -76,7 +79,9 @@
     [alert addAction:[UIAlertAction actionWithTitle:@"设置" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
     }]];
-    [AppDelegate.visibleController presentViewController:alert animated:YES completion:nil];
+    UIViewController *vc = [GMBaseTool getCurrentViewController];
+
+    [vc presentViewController:alert animated:YES completion:nil];
 }
 @end
 

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

@@ -14,6 +14,10 @@
 #import "GMEndConsultView.h"
 #import "GMAppCameraAndMicrophone.h"
 #import "GMVideoPhobos.h"
+#import <GMBase/GMBaseTool.h>
+@import GMHud;
+@import GMRouter;
+
 static GMDoctorVideoTelephoneLogin *loginManager = nil;
 
 @interface GMDoctorVideoTelephoneLogin ()<GMTelephoneViewDelegate, TTTRtcEngineDelegate, GMVideoTelephoneWindowDelegate>
@@ -90,7 +94,7 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
 
 #pragma mark - 初始化直播间
 - (void)doctorLoginVideoRoomModel:(GMVideoTelephoneModel *)model {
-    _uid = GMLoginManager.shareInstance.user.userId;
+    _uid = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];;
     _channelId = model.channelId;
     _pushURL = model.streamUrl;
 
@@ -168,7 +172,7 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
     }
     
     NSString *button_name = status ? @"answer" : @"cancel";
-    UIViewController *vc = AppDelegate.visibleController.navigationController.viewControllers.lastObject;
+    UIViewController *vc = [GMBaseTool getCurrentViewController].navigationController.viewControllers.lastObject;
     NSString *referrer = vc.pageName;
     [Phobos track:@"on_click_button" attributes:@{
         @"page_name":@"video_face_consultation_doctor",
@@ -256,7 +260,7 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
     GMEndConsultView *view = [[GMEndConsultView alloc] initWithType:TTManager.totalTime > 180 ? GMEndConsultViewTypeReport : GMEndConsultViewTypeDefault starNum:0];
     view.complaintType = GMComplaintTypeDoctor;
     view.recordId = TTManager.consultationRecordId;
-    [AppDelegate.navigation.view addSubview:view];
+    [[GMBaseTool getCurrentViewController].view addSubview:view];
     if (TTManager.totalTime > 180) {
        [[NSNotificationCenter defaultCenter] postNotificationName:@"doctor_finshed_video" object:nil];
     }

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

@@ -8,7 +8,7 @@
 
 #import "GMNimChannelManager.h"
 #import <CommonCrypto/CommonDigest.h>
-
+@import GMRouter;
 @implementation GMNimChannelManager
 + (instancetype)shareInstance {
     static dispatch_once_t onceToken;
@@ -167,7 +167,8 @@
 /// @param resultBlock 结果
 - (void)doCallWithAccountId:(NSString *)accountId customInfo:(NSString *)customInfo resultBlock:(nonnull NIMResultBlock)resultBlock {
     NIMSignalingCallRequest *request = [[NIMSignalingCallRequest alloc] init];
-    request.uid = [GMLoginManager shareInstance].user.userId;
+    NSInteger user = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];
+    request.uid = user;
     request.accountId = accountId;
     request.requestId = [self createRequestId];
     request.customInfo = customInfo;

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

@@ -7,7 +7,7 @@
 //
 
 #import "GMRtcManager.h"
-
+#import "GMFaceHeader.h"
 @implementation GMRtcManager : NSObject
 
 static id _manager;
@@ -45,7 +45,7 @@ static id _manager;
         _localProfile = TTTRtc_VideoProfile_Default;
         _cdnProfile = TTTRtc_VideoProfile_Default;
         // 杀死app 需要退出
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(closeRoom) name:GM_CLOSE_APP object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(closeRoom) name:@"gm_close_app" object:nil];
     }
     return self;
 }

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

@@ -11,14 +11,16 @@
 #import "GMUserVideoTelephoneWindow.h"
 #import "GMVideoTelephoneRequestTool.h"
 #import "GMTelephoneAudioPlay.h"
-#import "GMLoginManager.h"
-#import <GMPublicNomalHUD.h>
 #import "GMAppCameraAndMicrophone.h"
 #import "GMVideoPhobos.h"
 #import "GMSureOrderPopView.h"
 #import "GMToFaceOrderInfoModel.h"
 #import "GMNimChannelManager.h"
 #import "NSDictionary+json.h"
+#import "GMToFaceNetworking.h"
+#import <GMBase/GMBaseTool.h>
+
+
 
 static GMUserVideoTelephoneLogin *loginManager = nil;
 
@@ -63,7 +65,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
         self.logoHud = [[GMPublicNomalHUD alloc] init];
         self.logoHud.frame = CGRectMake(0, 0, 100, 100);
         self.logoHud.hidden = YES;
-        self.logoHud.center = AppDelegate.visibleController.view.center;
+        self.logoHud.center = [GMBaseTool getCurrentViewController].view.center;
     }
     return self;
 }
@@ -76,7 +78,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
         return;
     }
     
-    [AppDelegate.visibleController.view addSubview:self.logoHud];
+    [[GMBaseTool getCurrentViewController].view addSubview:self.logoHud];
     self.logoHud.hidden = NO;
     _clientRole = TTTRtc_ClientRole_Anchor;
     _extensionDict = extentsionDict;
@@ -101,7 +103,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
            //如果相机或是麦克风权限必须获取才能视频通话
            return;
     }
-    [AppDelegate.visibleController.view addSubview:self.logoHud];
+    [[GMBaseTool getCurrentViewController].view addSubview:self.logoHud];
     _clientRole = TTTRtc_ClientRole_Broadcaster;
     _extensionDict = extentsionDict;
     TTManager = [GMRtcManager sharedRtcManager];
@@ -112,7 +114,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
 #pragma mark - 初始化直播间
 - (void)userLoginVideoRoomModel:(GMVideoTelephoneModel *)model  {
     
-    _uid = GMLoginManager.shareInstance.user.userId;
+    _uid = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];
     _channelId = model.channelId;
     _pushURL = model.streamUrl;
     _neteaseModel = model.neteaseIm;
@@ -160,7 +162,6 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
                                          @"consultation_record_id": TTManager.consultationRecordId
             };
             [[GMNimChannelManager shareInstance] doInviteJoinWithChannelId:_neteaseModel.channelId accountId:_neteaseModel.toAccountId customInfo:[NSDictionary dictionaryToJson:customInfo] resultBlock:^(BOOL isSuccess) {
-                debugLog(@"doInviteJoinWithChannelId %d", isSuccess ? 1 : 0);
             }];
         }
     }];
@@ -230,16 +231,16 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
     NSString *doctorId = counsellorType == 1 ? TTManager.vidoeTelephoneModel.counsellorInfo.doctorId:TTManager.vidoeTelephoneModel.counsellorInfo.id;
     [self clickConfireBtnPhobo:counsellorType consultationType:consultationType doctorId:doctorId];
     //确认订单
-    [[GMInterfaceNetwork shareInstance] excuteToFaceInfoSureOrder:self.messageDict[@"order_no"] SuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceInfoSureOrder:self.messageDict[@"order_no"] SuccessBlock:^(id response) {
         GMToFaceOrderInfoModel *infoModel = [[GMToFaceOrderInfoModel alloc] initWithDictionary:response error:nil];
         infoModel.consultationRecordId = TTManager.consultationRecordId;
         GMSureOrderPopView *popView = [[GMSureOrderPopView alloc] init];
         popView.isCloseBtnHidden = YES;
         popView.infoModel = infoModel;
         [popView clickConfireBtnPhobo:counsellorType consultationType:consultationType doctorId:doctorId];
-        [[AppDelegate shareInstance].window addSubview:popView];
+        [[GMBaseTool mainWindow]  addSubview:popView];
     } failureBlock:^(NSInteger errorCode, NSString *message) {
-        [AppDelegate.visibleController toast:message];
+        [[GMBaseTool getCurrentViewController] toast:message];
     }];
 
 }

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

@@ -7,6 +7,9 @@
 //
 
 #import "GMVideoPhobos.h"
+@import GMFoundation;
+@import GMPhobos;
+@import GMBase;
 
 @implementation GMVideoPhobos
 /**

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

@@ -7,7 +7,8 @@
 //
 
 #import "GMVideoTelephoneRequestTool.h"
-
+#import "RequestHeader.h"
+#import "GMLibraryHeader.h"
 
 @implementation GMVideoTelephoneRequestTool
 

GMAILab/Classes/ToFace/VideoTelephone/model/GMConsultationInfoModel.h

@@ -7,6 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
+@import GMBase;
+
 NS_ASSUME_NONNULL_BEGIN
 @protocol GMConsultationInfoModel @end
 

GMAILab/Classes/ToFace/VideoTelephone/model/GMRecommendShopingModel.h

@@ -8,6 +8,9 @@
 
 #import <Foundation/Foundation.h>
 
+
+@import GMBase;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GMRecommendShopingModel : GMObject

GMAILab/Classes/ToFace/VideoTelephone/model/GMTelephoneRecommodWelfareModel.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/VideoTelephone/model/GMTelphoneStatusModel.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/VideoTelephone/model/GMUserInfoModel.h

@@ -7,6 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
+@import GMBase;
+
 NS_ASSUME_NONNULL_BEGIN
 @protocol GMUserInfoModel @end
 

GMAILab/Classes/ToFace/VideoTelephone/model/GMVideoTelephoneModel.h

@@ -9,6 +9,8 @@
 #import <Foundation/Foundation.h>
 #import "GMUserInfoModel.h"
 #import "GMConsultationInfoModel.h"
+@import GMBase;
+
 @class GMTelephoneDoctorModel;
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/VideoTelephone/view/GMAISearchNavigationView.h

+//
+//  GMSearchNavigationView.h
+//  Gengmei
+//
+//  Created by ioszhb on 2019/2/1.
+//  Copyright © 2019 更美互动信息科技有限公司. All rights reserved.
+//
+#import "GMLibraryHeader.h"
+@protocol GMSearchNavigationViewDelegate;
+@interface GMAISearchNavigationView : GMView
+@property (nonatomic, assign) id<GMSearchNavigationViewDelegate> delegate;
+@property (nonatomic, assign) BOOL showCancelButton;
+@property (nonatomic, strong) UITextField *textField;
+
+- (void)setShowCancelButton:(BOOL)showCancelButton animated:(BOOL)animated;
+/**
+ *  @brief  重了写该方法，以让搜索栏开始、停止输入
+ *
+ */
+- (BOOL)becomeFirstResponder;
+- (BOOL)resignFirstResponder;
+@end
+@protocol GMSearchNavigationViewDelegate <NSObject>
+
+- (void)searchNavigationCancelButtonClick;
+@end

GMAILab/Classes/ToFace/VideoTelephone/view/GMAISearchNavigationView.m

+//
+//  GMAISearchNavigationView.m
+//  Gengmei
+//
+//  Created by ioszhb on 2019/2/1.
+//  Copyright © 2019 更美互动信息科技有限公司. All rights reserved.
+//
+
+#import "GMAISearchNavigationView.h"
+@interface GMAISearchNavigationView ()<UITextFieldDelegate>
+@property (nonatomic, strong) GMButton *cancelButton;
+/// textFiledCover
+@property (nonatomic, strong) GMView *textCoverView;
+@end
+
+@implementation GMAISearchNavigationView
+
+- (void)setup {
+    [super setup];
+    [self setupSubviews];
+    [self setupConstraints];
+}
+
+- (void)setupSubviews {
+    [self addSubview:self.textField];
+    [self addSubview:self.cancelButton];
+    [self.textField addSubview:self.textCoverView];
+}
+
+- (void)setupConstraints {
+    [self.textField mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(6);
+        make.bottom.mas_equalTo(-6);
+        make.left.mas_equalTo(20);
+    }];
+    
+    [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.textField.mas_right).offset(20);
+        make.right.mas_equalTo(-20);
+        make.top.mas_equalTo(0);
+        make.bottom.mas_equalTo(0);
+        make.width.mas_equalTo(32);
+    }];
+    
+    [self.textCoverView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_equalTo(0);
+    }];
+}
+
+- (void)updateSuberConstraints {
+    [self.cancelButton mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(_showCancelButton ? -20 : 0);
+        make.width.mas_equalTo(_showCancelButton ? 32 : 0);
+    }];
+}
+
+#pragma mark - Setter
+
+- (void)setShowCancelButton:(BOOL)showCancelButton{
+    [self setShowCancelButton:showCancelButton animated:YES];
+}
+
+- (void)setShowCancelButton:(BOOL)showCancelButton animated:(BOOL)animated{
+    _showCancelButton = showCancelButton;
+    [self updateSuberConstraints];
+    if (animated) {
+        [UIView animateWithDuration:0.2 animations:^{
+            [self layoutIfNeeded];
+        }];
+    }
+}
+
+
+#pragma mark - Action
+- (void)cancelAction {
+    if ([self.delegate respondsToSelector:@selector(searchNavigationCancelButtonClick)]) {
+        [self.delegate searchNavigationCancelButtonClick];
+    }
+}
+
+/// 手动点击开始文本编辑
+- (void)beiginTextEdit {
+    [Phobos track:@"on_click_navbar_search" attributes:@{@"page_name":self.pageName}];
+    [self.textField becomeFirstResponder];
+}
+
+#pragma mark - 重写
+- (BOOL)resignFirstResponder{
+    self.showCancelButton = NO;
+    [_textField resignFirstResponder];
+    return [super resignFirstResponder];
+}
+
+- (BOOL)becomeFirstResponder{
+    self.showCancelButton = YES;
+    [_textField becomeFirstResponder];
+    return [super becomeFirstResponder];
+}
+
+#pragma mark - getter subviews
+- (UITextField *)textField {
+    if (!_textField) {
+        _textField = [UITextField new];
+        _textField.delegate = self;
+        _textField.backgroundColor = UIColor.background;
+        _textField.enablesReturnKeyAutomatically = NO;
+        _textField.returnKeyType = UIReturnKeySearch;
+        _textField.clearButtonMode = UITextFieldViewModeWhileEditing;
+        _textField.layer.cornerRadius = 16;
+        _textField.layer.masksToBounds = YES;
+        _textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"搜索项目、美购、医生" attributes:@{
+            NSFontAttributeName:[UIFont systemFontOfSize:14],
+            NSForegroundColorAttributeName:UIColor.auxiliaryTextLight
+        }];
+        _textField.hasCloseButton = YES;
+        UIImage *imge = [UIImage imageNamed:@"home_new_search"];
+        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
+        UIImageView *leftView = [[UIImageView alloc] initWithImage:imge];
+        leftView.image = imge;
+        leftView.frame = CGRectMake(0, 0, imge.size.width, imge.size.height);
+        leftView.center = view.center;
+        [view addSubview:leftView];
+        
+        _textField.leftView = view;
+        _textField.leftViewMode = UITextFieldViewModeAlways;
+        _textField.font = [UIFont gmFont:14];
+        _textField.textColor = [UIColor blackColor];
+    }
+    return _textField;
+}
+
+- (GMButton *)cancelButton {
+    if (!_cancelButton) {
+        _cancelButton = [GMButton new];
+        _cancelButton.backgroundColor = [UIColor whiteColor];
+        [_cancelButton addTarget:self action:@selector(cancelAction) forControlEvents:UIControlEventTouchUpInside];
+        [_cancelButton setTitle:@"取消" forState:UIControlStateNormal];
+        [_cancelButton setTitleColor:UIColor.headlineText forState:UIControlStateNormal];
+        _cancelButton.titleLabel.font = [UIFont gmFont:15];
+    }
+    
+    return _cancelButton;
+}
+
+- (GMView *)textCoverView {
+    if (!_textCoverView) {
+        _textCoverView = [GMView new];
+        _textCoverView.userInteractionEnabled = YES;
+        _textCoverView.backgroundColor = [UIColor clearColor];
+        UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(beiginTextEdit)];
+        [_textCoverView addGestureRecognizer:tapGesture];
+    }
+    return _textCoverView;
+}
+
+@end
+

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorRecommendShoppingView.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 #import "GMVideoTelephoneModel.h"
-
+#import <GMKit/GMView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorRecommendShoppingView.m

@@ -9,12 +9,14 @@
 #import "GMDoctorRecommendShoppingView.h"
 #import "GMDoctorShoppingViewCell.h"
 #import "GMDoctorShopingViewSelectedCell.h"
-#import "GMSearchNavigationView.h"
+#import "GMAISearchNavigationView.h"
 #import "GMRecommendShopingModel.h"
 #import "GMRtcManager.h"
-#import "GMCommonEmptyView.h"
+#import "GMToFaceCommonEmptyView.h"
 #import "GMContextualAcitonImage.h"
-
+#import <GMKit/GMView.h>
+#import "RequestHeader.h"
+@import GMNetworking;
 @protocol GMShoppingTitleView1Delegate <NSObject>
 
 -(void)shoppingTitleView1TureBtnClick;
@@ -159,8 +161,8 @@
 @interface GMDoctorRecommendShoppingView ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,GMShoppingTitleViewDelegate,GMShoppingTitleView1Delegate>
 
 @property(nonatomic, strong)GMTableView *tableView;
-@property(nonatomic, strong)GMSearchNavigationView *searchNavigationView;
-@property (nonatomic, strong)GMCommonEmptyView *emptyView;
+@property(nonatomic, strong)GMAISearchNavigationView *searchNavigationView;
+@property (nonatomic, strong)GMToFaceCommonEmptyView *emptyView;
 @property(nonatomic, strong)GMShoppingTitleView *titltView;
 @property(nonatomic, strong)GMShoppingTitleView1 *titltView1;
 @property (nonatomic, assign)GMShoppingViewSelecteType seletedType;
@@ -468,15 +470,15 @@
 }
 
 - (void)addemptyView {
-    _emptyView = [[GMCommonEmptyView alloc] initWithFrame:CGRectZero];
+    _emptyView = [[GMToFaceCommonEmptyView alloc] initWithFrame:CGRectZero];
     _emptyView.hidden = YES;
     _emptyView.emptyLabel.text = @"你的推荐带空空如也";
     [self addSubview:_emptyView];
 }
 
-- (GMSearchNavigationView *)searchNavigationView{
+- (GMAISearchNavigationView *)searchNavigationView{
     if (!_searchNavigationView) {
-        _searchNavigationView = [GMSearchNavigationView new];
+        _searchNavigationView = [GMAISearchNavigationView new];
         _searchNavigationView.textField.delegate = self;
         _searchNavigationView.hidden = YES;
         _searchNavigationView.textField.placeholder = @"请输入美购名称";

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorShopingViewSelectedCell.h

@@ -5,7 +5,7 @@
 //  Created by 刘鹿杰的mac on 2020/2/25.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
-
+#import "GMLibraryHeader.h"
 @class GMRecommendShopingModel;
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorShopingViewSelectedCell.m

@@ -8,7 +8,6 @@
 
 #import "GMDoctorShopingViewSelectedCell.h"
 #import "GMRecommendShopingModel.h"
-
 @interface GMDoctorShopingViewSelectedCell ()
 
 @property (nonatomic, strong) GMButton *seleBtn;

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorShoppingViewCell.h

@@ -5,7 +5,7 @@
 //  Created by 刘鹿杰的mac on 2020/2/24.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
-
+#import "GMLibraryHeader.h"
 @class GMRecommendShopingModel;
 
 NS_ASSUME_NONNULL_BEGIN

GMAILab/Classes/ToFace/VideoTelephone/view/GMDoctorTelephoneFunctionView.m

@@ -8,7 +8,7 @@
 
 #import "GMDoctorTelephoneFunctionView.h"
 #import "GMTelephoneProxy.h"
-
+@import GMBase;
 @implementation GMDoctorTelephoneFunctionView
 {
     UIButton *shoppingBtn; //购物

GMAILab/Classes/ToFace/VideoTelephone/view/GMLinkPromptView.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "GMLibraryHeader.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GMLinkPromptView : UIView

GMAILab/Classes/ToFace/VideoTelephone/view/GMTelephoneAttentionView.m

@@ -7,6 +7,7 @@
 //
 
 #import "GMTelephoneAttentionView.h"
+#import "GMLibraryHeader.h"
 
 @implementation GMTelephoneAttentionView
 {

GMAILab/Classes/ToFace/VideoTelephone/view/GMTelephoneBtnView.m

@@ -7,6 +7,7 @@
 //
 
 #import "GMTelephoneBtnView.h"
+#import "GMLibraryHeader.h"
 
 @implementation GMTelephoneBtnView
 

GMAILab/Classes/ToFace/VideoTelephone/view/GMTelephoneShoppingEmptyView.m

@@ -7,6 +7,7 @@
 //
 
 #import "GMTelephoneShoppingEmptyView.h"
+#import "GMLibraryHeader.h"
 
 @implementation GMTelephoneShoppingEmptyView
 {

GMAILab/Classes/ToFace/VideoTelephone/view/GMTelephoneView.m

@@ -9,9 +9,11 @@
 #import "GMTelephoneView.h"
 #import "GMTelephoneBtnView.h"
 #import "GMVideoTelephoneRequestTool.h"
-#import "UITabBar+ViewConstant.h"
+#import "UITabBar+BottomSafe.h"
 #import "GMUserFillMessageView.h"
 #import "GMVideoPhobos.h"
+#import "GMLibraryHeader.h"
+
 @implementation GMTelephoneView
 {
     GMTelephoneBtnView *jieting;

GMAILab/Classes/ToFace/VideoTelephone/view/GMUserFillMessageView.m

@@ -7,8 +7,8 @@
 //
 
 #import "GMUserFillMessageView.h"
-#import "UITabBar+ViewConstant.h"
-
+#import "UITabBar+BottomSafe.h"
+#import "GMLibraryHeader.h"
 @implementation GMUserFillMessageView
 {
     UIImageView *_iconImgV;

GMAILab/Classes/ToFace/VideoTelephone/view/GMUserTelephoneFunctionView.m

@@ -8,7 +8,7 @@
 
 #import "GMUserTelephoneFunctionView.h"
 #import "GMTelephoneProxy.h"
-
+@import GMKit;
 @implementation GMUserTelephoneFunctionView
 {
     UIButton *shoppingBtn; //购物

GMAILab/Classes/ToFace/VideoTelephone/view/GMVideoTelephoneRecommendShoppingView.m

@@ -10,6 +10,7 @@
 #import "GMVideoTelephoneRecommodWelfareTableViewCell.h"
 #import "GMTelephoneShoppingEmptyView.h"
 #import "GMVideoTelephoneRequestTool.h"
+#import "GMLibraryHeader.h"
 
 @interface GMVideoTelephoneRecommendShoppingView ()<UITableViewDelegate, UITableViewDataSource>
 {

GMAILab/Classes/ToFace/VideoTelephone/view/GMVideoTelephoneRecommodWelfareTableViewCell.m

@@ -7,7 +7,8 @@
 //
 
 #import "GMVideoTelephoneRecommodWelfareTableViewCell.h"
-
+@import GMBase;
+@import SDWebImage;
 @implementation GMVideoTelephoneRecommodWelfareTableViewCell
 {
     UIImageView *_iconImg;

GMAILab/Classes/ToFace/VideoTelephone/window/GMUserVideoTelephoneWindow.m

@@ -13,6 +13,9 @@
 #import "GMLinkPromptView.h"
 #import "GMTelephoneAudioPlay.h"
 #import "GMVideoPhobos.h"
+#import <GMBase/GMBaseTool.h>
+
+
 @interface GMUserVideoTelephoneWindow ()<TTTRtcEngineDelegate, GMTelephoneFunctionViewDelegate, GMRecommendShoppingDelegate, GMTelephoneAttentionViewDelegate>
 {
     
@@ -193,11 +196,6 @@
 #pragma mark - 点击美购进入美购详情
 - (void)selectedIndex:(NSInteger)index welfareId:(NSString *)welfareId {
     [self windowMini];
-    GMWelfareDetailGrayController *vc = [GMWelfareDetailGrayController new];
-    //@"5708692"
-    vc.welfareId = welfareId;
-    vc.referer = self.pageName;
-    vc.customRefererLink = self.pageName;
     [Phobos track:@"welfare_multiattribute_click_add" attributes:@{
         @"page_name":self.pageName,
         @"referrer_tab_name":SafeString(self.referrerTabName),
@@ -205,7 +203,8 @@
         @"doctor_id":SafeString(_TTManager.vidoeTelephoneModel.counsellorInfo.doctorId) ,
         @"referrer":self.referer,
     }];
-    [AppDelegate.visibleController.navigationController pushViewController:vc animated:YES];
+    NSString *url = [NSString stringWithFormat:@"gengmei://service?service_id=%@&referer=%@&customRefererLink=%@", welfareId,self.pageName,self.pageName];
+    [[GMRouter sharedInstance] pushScheme:url];
 }
 
 #pragma mark - 关闭购物页面
@@ -353,8 +352,8 @@
     [alert addAction:[UIAlertAction actionWithTitle:@"继续等待" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {}]];
     UIAlertAction *action = alert.actions.firstObject;
     //这个key是用 runtime属性列表Ivar遍历得到的
-    [action setValue:GMColor282828 forKey:@"titleTextColor"];
-    [AppDelegate.visibleController presentViewController:alert animated:YES completion:nil];
+    [action setValue:RGBCOLOR_HEX(0x282828) forKey:@"titleTextColor"];
+    [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:nil];
 }
 
 #pragma mark - 退出房间 yes 主动离线  no 被动
@@ -375,7 +374,7 @@
             GMTelphoneStatusModel *model = message[@"model"];
             _TTManager.totalTime = [model.callDuration intValue];
             if (_TTManager.totalTime == 0 && status) {//没有接通并主动离开的时候会退款
-                [AppDelegate.visibleController toast:@"视频面诊已取消，本次视频面诊订单金额将原路退还至您的账户中"];
+                [[GMBaseTool getCurrentViewController] toast:@"视频面诊已取消，本次视频面诊订单金额将原路退还至您的账户中"];
             }
         }
         if ([self.delgate respondsToSelector:@selector(nomalExitRoom)]) {

GMAILab/Classes/ToFace/VideoTelephone/window/GMVideoTelephoneWindow.h

@@ -9,8 +9,6 @@
 #import <UIKit/UIKit.h>
 #import "GMAVRegionView.h"
 #import "GMRtcManager.h"
-#import "GMWelfareDetailGrayController.h"
-#import "AppDelegate.h"
 #import "GMVideoTelephoneRequestTool.h"
 @import CoreTelephony;
 

GMAILab/Classes/ToFace/VideoTelephone/window/GMVideoTelephoneWindow.m

@@ -7,7 +7,9 @@
 //
 
 #import "GMVideoTelephoneWindow.h"
-#import "AppDelegate+AppInit.h"
+#import <GMBase/GMBaseTool.h>
+
+@import GMHud;
 @interface GMVideoTelephoneWindow ()
 
 @end
@@ -19,7 +21,7 @@
     self = [super initWithFrame:frame];
     if (self) {
         self.layer.masksToBounds = YES;
-        UIViewController *vc = AppDelegate.visibleController.navigationController.viewControllers.lastObject;
+        UIViewController *vc = [GMBaseTool getCurrentViewController].navigationController.viewControllers.lastObject;
         self.referer = vc.pageName;
         self.referrerTabName = vc.tabName;
         
@@ -27,10 +29,7 @@
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(userExitTime) name:@"gm_telephone_cancal" object:nil];
         //网络发生变化
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(netWorkingChanged:) name:@"gm_networkingChang" object:nil];
-        //当用手机网络进入直播间时
-        if ([AppDelegate shareInstance].preNetworkStatus == 1) {
-            [GMHudModule showWarning:@"当前为非WiFi环境，请注意流量消耗！"];
-        }
+
         
     }
     return self;

GMAILab/Classes/ToFace/Waiting/GMNoticeInfoObject.h

@@ -5,6 +5,7 @@
 //  Created by yefengming on 2020/3/10.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/Waiting/GMVideoWaitingView.h

@@ -5,6 +5,7 @@
 //  Created by yefengming on 2020/3/6.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+#import <GMKit/GMPopupBgView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/Waiting/GMVideoWaitingView.m

@@ -8,9 +8,12 @@
 
 #import "GMVideoWaitingView.h"
 #import "GMWaitingSuccessView.h"
-#import "UIImage+WebP.h"
 #import "GMNoticeInfoObject.h"
 #import "GMVideoPhobos.h"
+#import "GMLibraryHeader.h"
+
+#import <GMBase/GMBaseTool.h>
+
 #define centerPoint CGPointMake(MAINSCREEN_WIDTH / 2, MAINSCREEN_HEIGHT / 2)
 #define circleAnimaitionTime 2
 #define fromRadius sqrtf((centerPoint.x * centerPoint.x) + (centerPoint.y * centerPoint.y))
@@ -42,13 +45,13 @@
     
     self.animationView.hidden = NO;
     
-    self.topLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:16];
+    self.topLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:16];
     self.topLabel.font = [UIFont gmBoldFont:16];
     self.topLabel.text = @"正在匹配";
     self.topLabel.textAlignment = NSTextAlignmentCenter;
     [self.container addSubview:self.topLabel];
     
-    self.bottomLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:16];
+    self.bottomLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:16];
     self.bottomLabel.font = [UIFont gmBoldFont:16];
     self.bottomLabel.text = @"60s";
     [self.container addSubview:self.bottomLabel];
@@ -56,13 +59,13 @@
     self.cancelBtn = [[GMButton alloc] init];
     [self.cancelBtn setTitle:@"取消连线" forState:UIControlStateNormal];
     [self.cancelBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-    self.cancelBtn.backgroundColor = GMColorCCCCCC;
+    self.cancelBtn.backgroundColor = RGBCOLOR_HEX(0xCCCCCC);
     self.cancelBtn.layer.cornerRadius = 23;
     self.cancelBtn.layer.masksToBounds = YES;
     [self.container addSubview:self.cancelBtn];
     [self.cancelBtn addTarget:self action:@selector(cancelBtnClick) forControlEvents:UIControlEventTouchUpInside];
     
-    self.infoLabel = [GMLabel labelWithTextColor:GMColor464646 fontSize:14];
+    self.infoLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x464646) fontSize:14];
     self.infoLabel.text = @"正在全力为您匹配";
     self.infoLabel.textAlignment = NSTextAlignmentCenter;
     [self.container addSubview:self.infoLabel];
@@ -104,6 +107,15 @@
         make.centerX.mas_equalTo(0);
     }];
 }
+
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
+
 - (void)startShowPhotoAnimation {
     CGPathRef fromPath = _maskLayer.path;
     CGPathRef toPath = [UIBezierPath bezierPathWithArcCenter:centerPoint radius:toRadius startAngle:0 endAngle:2 * M_PI clockwise:YES].CGPath;
@@ -167,7 +179,7 @@
         self.currentTime --;
         if (self.currentTime % 5 == 0) {
             __weak __typeof(self)weakSelf = self;
-            [GMNetworking requestOCWithApi:API_CONSULTATION_DISPATCH_INFO method:GMHTTPMethodGet parameters:nil completion:^(GMResponseOC * _Nonnull response) {
+            [GMNetworking requestOCWithApi:@"/api/consultation_counsel/get_current_dispatch_info" method:GMHTTPMethodGet parameters:nil completion:^(GMResponseOC * _Nonnull response) {
                 if (response.data[@"notice_info"]) {
                     [weakSelf showSuccessView];
                     weakSelf.successView.object = [[GMNoticeInfoObject alloc] initWithDictionary:response.data[@"notice_info"] error:nil];
@@ -182,7 +194,7 @@
     } else {
         NSString *str = self.counsellorType == 1 ? @"医生":@"面诊师";
         str = [NSString stringWithFormat:@"抱歉，暂无%@接单，请稍后再试，本次视频面诊订单金额将原路退还至您的账户中",str];
-        [AppDelegate.visibleController toast:str];
+        [[GMBaseTool getCurrentViewController] toast:str];
         [self invalidateCountDownTimer];
         [self cancelDispatch];
         [self hide];
@@ -193,7 +205,7 @@
 }
 
 - (void)cancelDispatch {
-    [GMNetworking requestOCWithApi:API_CONSULTATION_CANCEL_DISPATCH method:GMHTTPMethodPost parameters:nil completion:^(GMResponseOC * _Nonnull response) {
+    [GMNetworking requestOCWithApi:@"/api/consultation_counsel/cancel_dispatch" method:GMHTTPMethodPost parameters:nil completion:^(GMResponseOC * _Nonnull response) {
 
     }];
 }
@@ -209,7 +221,7 @@
         } rightAlertAction:^{
             
         }];
-        [AppDelegate.visibleController presentViewController:alert animated:YES completion:nil];
+        [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:nil];
     }
 }
 
@@ -227,7 +239,7 @@
 }
 
 - (void)waitViewHide {
-    [AppDelegate.visibleController toast:@"取消派单成功，本次视频面诊订单金额将原路退还至您的账户中"];
+    [[GMBaseTool getCurrentViewController] toast:@"取消派单成功，本次视频面诊订单金额将原路退还至您的账户中"];
     [self invalidateCountDownTimer];
     [self removeAnimation];
     [self hide];
@@ -244,7 +256,7 @@
 - (GMWaitingSuccessView *)successView {
     if (!_successView) {
         _successView = [[GMWaitingSuccessView alloc] init];
-        [AppDelegate.visibleController.view addSubview:_successView];
+        [[GMBaseTool getCurrentViewController].view addSubview:_successView];
     }
     return _successView;
 }

GMAILab/Classes/ToFace/Waiting/GMWaitingSuccessView.h

@@ -7,6 +7,7 @@
 //
 
 #import "GMNoticeInfoObject.h"
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/Waiting/GMWaitingSuccessView.m

@@ -7,9 +7,12 @@
 //
 
 #import "GMWaitingSuccessView.h"
-#import "Gengmei-Swift.h"
 #import "GMUserVideoTelephoneLogin.h"
-
+#import "GMLibraryHeader.h"
+//#import <GMBase/GMBase-Swift.h>
+#import <GMBaseSwift/GMBaseSwift-Swift.h>
+//@import GMBaseSwift
+@import GMBaseSwift;
 @interface GMWaitingSuccessView ()
 {
     NSTimer *_timer;
@@ -40,21 +43,21 @@
     self.doctorView.layer.masksToBounds = YES;
     [self.container addSubview:self.doctorView];
     
-    self.nameLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:16];
+    self.nameLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:16];
     self.nameLabel.font = [UIFont gmBoldFont:16];
     [self.container addSubview:self.nameLabel];
     
-    self.infoLabel = [GMLabel labelWithTextColor:ALColor8E8E8E fontSize:12];
+    self.infoLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x8E8E8E) fontSize:12];
     [self.container addSubview:self.infoLabel];
     
-    self.hospitalLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:16];
+    self.hospitalLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:16];
     self.hospitalLabel.font = [UIFont gmBoldFont:16];
     [self.container addSubview:self.hospitalLabel];
     
-    self.rateLabel = [GMLabel labelWithTextColor:ALColor8E8E8E fontSize:12];
+    self.rateLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x8E8E8E)  fontSize:12];
     [self.container addSubview:self.rateLabel];
     
-    self.projectLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:13];
+    self.projectLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:13];
     self.projectLabel.text = @"擅长项目：";
     [self.container addSubview:self.projectLabel];
     
@@ -64,17 +67,17 @@
     [self.container addSubview:self.iconView];
     
     NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:@"- 匹配成功 -"];
-    [attribute addAttribute:NSForegroundColorAttributeName value:GMColor4ABAB4 range:NSMakeRange(0, 1)];
-    [attribute addAttribute:NSForegroundColorAttributeName value:GMColor4ABAB4 range:NSMakeRange(7, 1)];
-    self.successLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:16];
+    [attribute addAttribute:NSForegroundColorAttributeName value:RGBCOLOR_HEX(0x4ABAB4) range:NSMakeRange(0, 1)];
+    [attribute addAttribute:NSForegroundColorAttributeName value:RGBCOLOR_HEX(0x4ABAB4) range:NSMakeRange(7, 1)];
+    self.successLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:16];
     self.successLabel.textAlignment = NSTextAlignmentCenter;
     self.successLabel.font = [UIFont gmBoldFont:16];
     self.successLabel.attributedText = attribute;
     [self.container addSubview:self.successLabel];
     
     NSMutableAttributedString *attribute2 = [[NSMutableAttributedString alloc] initWithString:@"5S 后开启摄像头进行视频通话\n建议您选择安静、光线充足的环境"];
-    [attribute2 addAttribute:NSForegroundColorAttributeName value:GMColor4ABAB4 range:NSMakeRange(0, 2)];
-    self.successInfoLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:14];
+    [attribute2 addAttribute:NSForegroundColorAttributeName value:RGBCOLOR_HEX(0x4ABAB4) range:NSMakeRange(0, 2)];
+    self.successInfoLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:14];
     self.successInfoLabel.textAlignment = NSTextAlignmentCenter;
     self.successInfoLabel.numberOfLines = 0;
     self.successInfoLabel.attributedText = attribute2;
@@ -84,7 +87,7 @@
         label.backgroundColor = RGBCOLOR_HEX(0xEEF8F7);
         label.textAlignment = NSTextAlignmentCenter;
         label.font = [UIFont gmFont:11];
-        label.textColor = GMColor4DBBB5;
+        label.textColor = RGBCOLOR_HEX(0x4DBBB5);
         label.paddingEdge = UIEdgeInsetsMake(1, 11, 1, 11);
         label.layer.cornerRadius = ONE_PIXEL + 1;
         label.layer.masksToBounds = YES;
@@ -153,7 +156,13 @@
                                              selector:@selector(didBecomeActive)
                                                  name:UIApplicationDidBecomeActiveNotification object:nil];
 }
-
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
 - (void)didBecomeActive {
     [self invalidateCountDownTimer];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -178,22 +187,22 @@
     NSMutableAttributedString *content = [[NSMutableAttributedString alloc] init];
     // 0：不显示1: 好评率 + 接通率 2: 好评率 + 有效面诊人数
     if (_object.showType == 1) {
-        NSAttributedString *subContentA = [[NSAttributedString alloc] initWithString:@"好评率：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor282828}];
-        NSAttributedString *subContent = [[NSAttributedString alloc] initWithString:SafeString(_object.likeRate) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor7DC6CC}];
+        NSAttributedString *subContentA = [[NSAttributedString alloc] initWithString:@"好评率：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x282828)}];
+        NSAttributedString *subContent = [[NSAttributedString alloc] initWithString:SafeString(_object.likeRate) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x7DC6CC)}];
         
-        NSAttributedString *subContentB = [[NSAttributedString alloc] initWithString:@"    接通率：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor282828}];
-        NSAttributedString *subContentC = [[NSAttributedString alloc] initWithString:SafeString(_object.connectRate) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor7DC6CC}];
+        NSAttributedString *subContentB = [[NSAttributedString alloc] initWithString:@"    接通率：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x282828)}];
+        NSAttributedString *subContentC = [[NSAttributedString alloc] initWithString:SafeString(_object.connectRate) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x7DC6CC)}];
         [content appendAttributedString: subContentA];
         [content appendAttributedString: subContent];
         [content appendAttributedString: subContentB];
         [content appendAttributedString: subContentC];
         return content;
     } else {
-        NSAttributedString *subContentA = [[NSAttributedString alloc] initWithString:@"好评率：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor282828}];
-               NSAttributedString *subContent = [[NSAttributedString alloc] initWithString:SafeString(_object.likeRate) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor7DC6CC}];
+        NSAttributedString *subContentA = [[NSAttributedString alloc] initWithString:@"好评率：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x282828)}];
+               NSAttributedString *subContent = [[NSAttributedString alloc] initWithString:SafeString(_object.likeRate) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x7DC6CC)}];
                
-               NSAttributedString *subContentB = [[NSAttributedString alloc] initWithString:@"    有效面诊：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor282828}];
-               NSAttributedString *subContentC = [[NSAttributedString alloc] initWithString:SafeString(_object.consultPeopleNumber) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: GMColor7DC6CC}];
+               NSAttributedString *subContentB = [[NSAttributedString alloc] initWithString:@"    有效面诊：" attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x282828)}];
+               NSAttributedString *subContentC = [[NSAttributedString alloc] initWithString:SafeString(_object.consultPeopleNumber) attributes:@{NSFontAttributeName: [UIFont gmFont:12], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x7DC6CC)}];
                [content appendAttributedString: subContentA];
                [content appendAttributedString: subContent];
                [content appendAttributedString: subContentB];
@@ -214,7 +223,7 @@
 - (void)updateCountDown {
     if (currentTime >= 0) {
         NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%dS 后开启摄像头进行视频通话\n建议您选择安静、光线充足的环境", currentTime]];
-        [attribute addAttribute:NSForegroundColorAttributeName value:GMColor4ABAB4 range:NSMakeRange(0, 2)];
+        [attribute addAttribute:NSForegroundColorAttributeName value:RGBCOLOR_HEX(0x4ABAB4) range:NSMakeRange(0, 2)];
         self.successInfoLabel.attributedText = attribute;
         currentTime --;
     } else {

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

@@ -5,6 +5,7 @@
 //  Created by zhouLiang on 2020/2/22.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 // 从杜欣前端给传的数据 --- 投诉结果
 @interface GMComplaintObject : GMObject

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

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

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

@@ -5,6 +5,7 @@
 //  Created by Locus on 2020/2/19.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMEditQuesPartModel.h"
+#import "GMLibraryHeader.h"
 
 @implementation GMEditQuesPartDetailModel
 

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

@@ -5,6 +5,7 @@
 //  Created by zhouLiang on 2020/2/22.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 @protocol GMStarInfoObject @end
 @interface GMStarInfoObject : GMObject

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMDiagnosisWorkingTableSwitch.h"
+@import GMBase;
 
 
 @protocol GMWorkTableNotifyObject @end

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

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
+#import <GMKit/GMPopupBgView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/WorkingTable/View/GMCommonTipAlertView.m

@@ -8,7 +8,10 @@
 
 #import "GMCommonTipAlertView.h"
 #import "UIView+CornerRadius.h"
+#import <GMBase/GMBaseTool.h>
 
+@import GMBase;
+@import GMFoundation;
 @interface GMCommonTipAlertView()
 @property(nonatomic, strong) GMLabel *title;
 @property(nonatomic, strong) GMLabel *contentLabel;
@@ -38,7 +41,7 @@ static GMCommonTipAlertView *_alertView = nil;
     }];
     
     _title = [[GMLabel alloc] init];
-    _title.textColor = GMColor282828;
+    _title.textColor = RGBCOLOR_HEX(0x282828);
     _title.textAlignment = NSTextAlignmentCenter;
     _title.font = [UIFont gmBoldFont:18];
     [_title setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
@@ -46,7 +49,7 @@ static GMCommonTipAlertView *_alertView = nil;
     [_contentView addSubview:_title];
     
     _contentLabel = [[GMLabel alloc] init];
-    _contentLabel.textColor = GMColor282828;
+    _contentLabel.textColor = RGBCOLOR_HEX(0x282828);
     _contentLabel.textAlignment = NSTextAlignmentCenter;
     _contentLabel.font = [UIFont gmFont:17];
     _contentLabel.numberOfLines = 0;
@@ -66,7 +69,7 @@ static GMCommonTipAlertView *_alertView = nil;
     
     _leftBtn = [UIButton new];
     _leftBtn.titleLabel.font = [UIFont gmFont:16];
-    [_leftBtn setTitleColor:ALColor999999 forState:UIControlStateNormal];
+    [_leftBtn setTitleColor:RGBCOLOR_HEX(0x999999) forState:UIControlStateNormal];
     [_contentView addSubview:_leftBtn];
     [_leftBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(44);
@@ -87,7 +90,7 @@ static GMCommonTipAlertView *_alertView = nil;
     
     _rightBtn = [UIButton new];
     _rightBtn.titleLabel.font = [UIFont gmFont:16];
-    [_rightBtn setTitleColor:GMColor4ABAB4 forState:UIControlStateNormal];
+    [_rightBtn setTitleColor:RGBCOLOR_HEX(0x4ABAB4) forState:UIControlStateNormal];
     [_contentView addSubview:_rightBtn];
     [_rightBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(44);
@@ -150,7 +153,7 @@ static GMCommonTipAlertView *_alertView = nil;
     [_alertView.rightBtn  addTarget:target action:rightAction forControlEvents:UIControlEventTouchUpInside];
     [_alertView.leftBtn  addTarget:target action:leftAction forControlEvents:UIControlEventTouchUpInside];
     [_alertView updateConstraints];
-    [AppDelegate.navigation.view addSubview:_alertView];
+    [[GMBaseTool getCurrentViewController].view addSubview:_alertView];
 }
 
 +(void)hideAtertView {

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

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 #import "GMComplaintObject.h"
+#import <GMKit/GMView.h>
 
 typedef NS_ENUM(NSInteger, GMComplaintResultViewType) {
     /// 投诉审核中

GMAILab/Classes/ToFace/WorkingTable/View/GMComplaintResultView.m

@@ -9,7 +9,8 @@
 #import "GMComplaintResultView.h"
 #import "NSAttributedString+YYText.h"
 #import "YYLabel.h"
-#import "GMCustomerServiceDetailViewController.h"
+@import GMRouter;
+//#import "GMCustomerServiceDetailViewController.h"
 
 @interface GMComplaintResultCellView : UIView
 @property (nonatomic, strong) GMLabel *titleLabel;
@@ -63,7 +64,7 @@
 }
 - (GMLabel *)titleLabel {
     if (!_titleLabel) {
-        _titleLabel = [GMLabel labelWithTextColor:ALColor666666 fontSize:14];
+        _titleLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x666666) fontSize:14];
         _titleLabel.font = [UIFont gmBoldFont:14];
         _titleLabel.textAlignment = NSTextAlignmentLeft;
     }
@@ -71,14 +72,14 @@
 }
 - (GMLabel *)rightLabel {
     if (!_rightLabel) {
-        _rightLabel = [GMLabel labelWithTextColor:ALColor999999 fontSize:11];
+        _rightLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x999999) fontSize:11];
         _rightLabel.textAlignment = NSTextAlignmentRight;
     }
     return _rightLabel;
 }
 - (GMLabel *)contentLabel {
     if (!_contentLabel) {
-        _contentLabel = [GMLabel labelWithTextColor:ALColor666666 fontSize:13];
+        _contentLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x666666) fontSize:13];
         _contentLabel.numberOfLines = 0;
     }
     return _contentLabel;
@@ -113,6 +114,13 @@
     }
     return self;
 }
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
 - (void)setup {
     [super setup];
     [self setUI];
@@ -176,14 +184,14 @@
     
     if (self.type == GMComplaintResultViewTypeInAudit) {
         self.resultCell.rightLabel.text = @"审核处理中";
-        self.resultCell.rightLabel.textColor = GMColorFF2F4F;
+        self.resultCell.rightLabel.textColor = RGBCOLOR_HEX(0xFF2F4F);
     }
     self.titleLabel.text = self.textArray[self.type];
 }
 - (UIView *)grayLineView {
     if (!_grayLineView) {
         _grayLineView = [[UIView alloc] init];
-        _grayLineView.backgroundColor = GMColorEEEEEE;
+        _grayLineView.backgroundColor = RGBCOLOR_HEX(0xEEEEEE);
         _grayLineView.layer.cornerRadius = 2.5f;
         _grayLineView.layer.masksToBounds = YES;
     }
@@ -230,7 +238,7 @@
     if (!_callPhoneLabel) {
         NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"如你对处理结果有异议，可联系客服"];
         text.yy_font = [UIFont gmFont:11];
-        text.yy_color = ALColor999999;
+        text.yy_color = RGBCOLOR_HEX(0x999999);
         [text yy_setUnderlineStyle:NSUnderlineStyleSingle range:NSMakeRange(12, 4)];
         [text yy_setUnderlineColor:[UIColor colorWithHex:0x4DBBB5] range:NSMakeRange(12, 4)];
         [text yy_setTextHighlightRange:NSMakeRange(12, 4) color:[UIColor colorWithHex:0x4DBBB5] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
@@ -246,7 +254,7 @@
 - (UIView *)lineView {
     if (!_lineView) {
         _lineView = [[UIView alloc] init];
-        _lineView.backgroundColor = ALColorF8F8F8;
+        _lineView.backgroundColor = RGBCOLOR_HEX(0xF8F8F8);
     }
     return _lineView;
 }

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

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 
+#import <GMKit/GMView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/WorkingTable/View/GMDiagnosisDispatchInfoView.m

@@ -7,6 +7,7 @@
 //
 
 #import "GMDiagnosisDispatchInfoView.h"
+@import GMBase;
 
 @implementation GMDiagnosisDispatchInfoView
 - (void)setup {
@@ -23,7 +24,7 @@
     
     _locationLabel = [[UILabel alloc] init];
     _locationLabel.text = @"北京";
-    _locationLabel.textColor = ALColor282828;
+    _locationLabel.textColor = RGBCOLOR_HEX(0x282828);
     _locationLabel.font = [UIFont gmBoldFont:14];
     [self addSubview:_locationLabel];
     [_locationLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -34,7 +35,7 @@
     
     _infoLabel = [[UILabel alloc] init];
     _infoLabel.text = @"女，22岁，没做过医美";
-    _infoLabel.textColor = ALColor282828;
+    _infoLabel.textColor = RGBCOLOR_HEX(0x282828);
     _infoLabel.textAlignment = NSTextAlignmentCenter;
     _infoLabel.font = [UIFont gmBoldFont:14];
     [self addSubview:_infoLabel];
@@ -46,7 +47,7 @@
     
     _projectLabel = [[UILabel alloc] init];
     _projectLabel.text = @"咨询项目：皮肤美容 | 面部轮廓 | 眼部";
-    _projectLabel.textColor = ALColor282828;
+    _projectLabel.textColor = RGBCOLOR_HEX(0x282828);
     _projectLabel.font = [UIFont gmFont:13];
     [self addSubview:_projectLabel];
     [_projectLabel mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -5,7 +5,7 @@
 //  Created by Jessica on 2020/2/19.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
-
+@import GMKit;
 @protocol GMDiagnosisWorkingTableChooseIdentityViewDelegate <NSObject>
 // 点击
 -(void)openWorkTableDidclickedWithTags:(NSArray *)tags;

GMAILab/Classes/ToFace/WorkingTable/View/GMDiagnosisWorkingTableChooseIdentityView.m

@@ -8,9 +8,13 @@
 
 #import "GMDiagnosisWorkingTableChooseIdentityView.h"
 #import "UIView+CornerRadius.h"
-#import <YYText.h>
+#import "YYText.h"
 #import "NSString+CalculateSize.h"
 #import "WMTagObject.h"
+#import <GMBase/GMBaseTool.h>
+#import <GMBaseWeb/GMWebutil.h>
+@import GMHud;
+@import GMRouter;
 
 @implementation GMChooseIdentityTagCell
 - (void)setup {
@@ -19,7 +23,7 @@
     _contentBtn.userInteractionEnabled = NO;
     [_contentBtn setImage:[UIImage imageNamed:@"wt_good_unselected_icon"] forState:UIControlStateNormal];
     [_contentBtn setImage:[UIImage imageNamed:@"wt_good_selected_icon"] forState:UIControlStateSelected];
-    [_contentBtn setTitleColor:GMColor282828 forState:UIControlStateNormal];
+    [_contentBtn setTitleColor:RGBCOLOR_HEX(0x282828) forState:UIControlStateNormal];
     _contentBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 6, 0, 0);
     _contentBtn.contentEdgeInsets = UIEdgeInsetsMake(6, 12, 6, 12);
     _contentBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
@@ -57,7 +61,7 @@
     }];
     
     _identityBtn = [GMButton new];
-    [_identityBtn setTitleColor:ALColor282828 forState:UIControlStateNormal];
+    [_identityBtn setTitleColor:RGBCOLOR_HEX(0x282828) forState:UIControlStateNormal];
     _identityBtn.titleLabel.font = [UIFont gmBoldFont:16];
     [_identityBtn setImage:[UIImage imageNamed:@"wt_identity"] forState:UIControlStateNormal];
     [_identityBtn setImage:[UIImage imageNamed:@"wt_identity_selected"] forState:UIControlStateSelected];
@@ -122,7 +126,7 @@
     [_openBtn setTitle:@"开启面诊" forState:UIControlStateNormal];
     _openBtn.titleLabel.font = [UIFont gmBoldFont:16];
     _openBtn.userInteractionEnabled = NO;
-    [_openBtn setBackgroundColor:GMColorFF8C8D forState:UIControlStateNormal];
+    [_openBtn setBackgroundColor:RGBCOLOR_HEX(0xFF8C8D) forState:UIControlStateNormal];
     [self.container addSubview:_openBtn];
     [_openBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(45);
@@ -151,7 +155,7 @@
     
     _projectLabel = [[UILabel alloc] init];
     _projectLabel.text = @"擅长的项目（最多3个）";
-    _projectLabel.textColor = ALColor282828;
+    _projectLabel.textColor = RGBCOLOR_HEX(0x282828);
     _projectLabel.textAlignment = NSTextAlignmentCenter;
     _projectLabel.font = [UIFont gmBoldFont:16];
     [self.contentView addSubview:_projectLabel];
@@ -172,7 +176,7 @@
     
     _tipLabel = [[UILabel alloc] init];
     _tipLabel.text = @"温馨提示：";
-    _tipLabel.textColor = ALColor282828;
+    _tipLabel.textColor = RGBCOLOR_HEX(0x282828);
     _tipLabel.textAlignment = NSTextAlignmentLeft;
     _tipLabel.font = [UIFont gmBoldFont:11];
     [self.contentView addSubview:_tipLabel];
@@ -193,10 +197,11 @@
     NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:content];
     attribute.yy_lineSpacing = 6;
     attribute.yy_font = [UIFont gmFont:11];
-    attribute.yy_color = ALColor282828;
-    [attribute yy_setTextHighlightRange:privateRange color:GMColorFF8C8D backgroundColor:UIColor.whiteColor tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+    attribute.yy_color = RGBCOLOR_HEX(0x282828);
+    [attribute yy_setTextHighlightRange:privateRange color:RGBCOLOR_HEX(0xFF8C8D) backgroundColor:UIColor.whiteColor tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
         // 视频面诊使用管理条例
-        NSString *url = [NSString stringWithFormat:@"gengmei://common_webview?url=%@/phantom/about/treatment_agreement", GMServerDomains.apiHost];
+        NSString *host = [GMWebutil getCurrentApiHost];
+        NSString *url = [NSString stringWithFormat: @"gengmei://common_webview?url=%@/phantom/about/treatment_agreement",host];
         [[GMRouter sharedInstance] pushScheme:url];
     }];
     self.contentLabel.attributedText = attribute;
@@ -220,10 +225,10 @@
 - (void)isCanOpen {
     if (_tagIds.count == 0) {
         _openBtn.userInteractionEnabled = NO;
-        [_openBtn setBackgroundColor:GMColorD5D5D5 forState:UIControlStateNormal];
+        [_openBtn setBackgroundColor:RGBCOLOR_HEX(0xD5D5D5) forState:UIControlStateNormal];
     } else {
         _openBtn.userInteractionEnabled = YES;
-        [_openBtn setBackgroundColor:GMColorFF8C8D forState:UIControlStateNormal];
+        [_openBtn setBackgroundColor:RGBCOLOR_HEX(0xFF8C8D) forState:UIControlStateNormal];
     }
 }
 
@@ -312,7 +317,7 @@
             [_tagIds removeObject:@(tagObject.tagId)];
         }
     } else if (!tagObject.isSelected && _tagIds.count >= 3 ) {
-        [AppDelegate.visibleController toast:@"最多选择三个"];
+        [[GMBaseTool getCurrentViewController] toast:@"最多选择三个"];
     }
     [cell updateStatus:tagObject.isSelected];
     

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

@@ -6,6 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
 #import "GMWorkTableObject.h"
+#import <GMKit/GMView.h>
 
 @interface GMServiceDataItemView : GMView
 @property(nonatomic, strong)UILabel *dataLabel;

GMAILab/Classes/ToFace/WorkingTable/View/GMDiagnosisWorkingTableHeaderView.m

@@ -9,8 +9,10 @@
 #import "GMDiagnosisWorkingTableHeaderView.h"
 #import "GMWoikingTableCollectionCell.h"
 #import "GMGMDiagnosisWorkingTableScrollView.h"
-#import "WMBrowserViewController.h"
-
+#import "RequestHeader.h"
+#import "GMLibraryHeader.h"
+//#import "WMBrowserViewController.h"
+@import GMRouter;
 @interface GMServiceDataItemView()
 @property (nonatomic, strong) UILabel *line;
 @end
@@ -19,7 +21,7 @@
 - (void)setup {
     [super setup];
     _dataLabel = [[UILabel alloc] init];
-    _dataLabel.textColor = ALColor282828;
+    _dataLabel.textColor = RGBCOLOR_HEX(0x282828);
     _dataLabel.textAlignment = NSTextAlignmentCenter;
     _dataLabel.font = [UIFont gmBoldFont:21];
     [self addSubview:_dataLabel];
@@ -30,7 +32,7 @@
     }];
     
     _descLabel = [[UILabel alloc] init];
-    _descLabel.textColor = GMColor909399;
+    _descLabel.textColor = RGBCOLOR_HEX(0x909399);
     _descLabel.textAlignment = NSTextAlignmentCenter;
     _descLabel.font = [UIFont gmFont:11];
     [self addSubview:_descLabel];
@@ -41,7 +43,7 @@
     }];
     
     _line = [[UILabel alloc] init];
-    _line.backgroundColor = GMColorEEEEEE;
+    _line.backgroundColor = RGBCOLOR_HEX(0xEEEEEE);
     [self addSubview:_line];
     [_line mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self.mas_centerY);
@@ -92,7 +94,7 @@
     
     _dataDesc = [[UILabel alloc] init];
     _dataDesc.text = @"服务数据";
-    _dataDesc.textColor = ALColor282828;
+    _dataDesc.textColor = RGBCOLOR_HEX(0x282828);
     _dataDesc.textAlignment = NSTextAlignmentCenter;
     _dataDesc.font = [UIFont gmBoldFont:16];
     [self addSubview:_dataDesc];
@@ -105,7 +107,7 @@
     
     _desc = [[UILabel alloc] init];
     _desc.text = @"（当天）";
-    _desc.textColor = GMColor909399;
+    _desc.textColor = RGBCOLOR_HEX(0x909399);
     _desc.textAlignment = NSTextAlignmentCenter;
     _desc.font = [UIFont gmFont:14];
     [self addSubview:_desc];
@@ -128,7 +130,7 @@
     
     _desc1 = [[UILabel alloc] init];
     _desc1.text = @"明细";
-    _desc1.textColor = GMColor909399;
+    _desc1.textColor = RGBCOLOR_HEX(0x909399);
     _desc1.textAlignment = NSTextAlignmentRight;
     _desc1.font = [UIFont gmFont:14];
     [self addSubview:_desc1];
@@ -177,7 +179,7 @@
     
     _bottomLabel = [[UILabel alloc] init];
     _bottomLabel.text = @"公告区";
-    _bottomLabel.textColor = GMColor909399;
+    _bottomLabel.textColor = RGBCOLOR_HEX(0x909399);
     _bottomLabel.textAlignment = NSTextAlignmentCenter;
     _bottomLabel.font = [UIFont gmBoldFont:12];
     [self addSubview:_bottomLabel];
@@ -189,7 +191,7 @@
     }];
     
     _leftLine = [[UILabel alloc] init];
-    _leftLine.backgroundColor = GMColorEEEEEE;
+    _leftLine.backgroundColor = RGBCOLOR_HEX(0xEEEEEE);
     [self addSubview:_leftLine];
     [_leftLine mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(_bottomLabel.mas_centerY);
@@ -199,7 +201,7 @@
     }];
     
     _rightLine = [[UILabel alloc] init];
-    _rightLine.backgroundColor = GMColorEEEEEE;
+    _rightLine.backgroundColor = RGBCOLOR_HEX(0xEEEEEE);
     [self addSubview:_rightLine];
     [_rightLine mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(_bottomLabel.mas_centerY);
@@ -311,10 +313,10 @@
 
 - (NSMutableAttributedString *)scrollItemStr:(NSString *)string leftStr:(NSString *)leftStr rightStr:(NSString *)rightStr {
     NSMutableAttributedString *content = [[NSMutableAttributedString alloc] init];
-    NSAttributedString *subContentA = [[NSAttributedString alloc] initWithString:leftStr attributes:@{NSFontAttributeName: [UIFont gmBoldFont:15], NSForegroundColorAttributeName: GMColor282828}];
-    NSAttributedString *subContent = [[NSAttributedString alloc] initWithString:string attributes:@{NSFontAttributeName: [UIFont gmBoldFont:15], NSForegroundColorAttributeName: GMColorFF8C8D}];
+    NSAttributedString *subContentA = [[NSAttributedString alloc] initWithString:leftStr attributes:@{NSFontAttributeName: [UIFont gmBoldFont:15], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x282828)}];
+    NSAttributedString *subContent = [[NSAttributedString alloc] initWithString:string attributes:@{NSFontAttributeName: [UIFont gmBoldFont:15], NSForegroundColorAttributeName: RGBCOLOR_HEX(0xFF8C8D)}];
 
-    NSAttributedString *subContentB = [[NSAttributedString alloc] initWithString:rightStr attributes:@{NSFontAttributeName: [UIFont gmBoldFont:15], NSForegroundColorAttributeName: GMColor282828}];
+    NSAttributedString *subContentB = [[NSAttributedString alloc] initWithString:rightStr attributes:@{NSFontAttributeName: [UIFont gmBoldFont:15], NSForegroundColorAttributeName: RGBCOLOR_HEX(0x282828)}];
     [content appendAttributedString: subContentA];
     [content appendAttributedString: subContent];
     [content appendAttributedString: subContentB];

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

@@ -5,6 +5,7 @@
 //  Created by Jessica on 2020/2/19.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
+@import GMBase;
 
 typedef NS_ENUM(NSInteger, DiagnosisWorkingTableSwitchStatus) {
     DiagnosisWorkingTableSwitchStatusOff      = 1,// 关闭 (可以开启)

GMAILab/Classes/ToFace/WorkingTable/View/GMDoctorConsultatioPromptView.m

@@ -7,7 +7,7 @@
 //
 
 #import "GMDoctorConsultatioPromptView.h"
-
+@import GMBase;
 @implementation GMDoctorConsultatioPromptView
 
 - (instancetype)initWithFrame:(CGRect)frame

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

@@ -7,7 +7,7 @@
 //
 
 #import "GMEditQuesPartModel.h"
-
+#import "GMLibraryHeader.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GMEditQuesPartCell : GMTableViewCell

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMEditQuesPartModel.h"
+#import <GMKit/GMView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/WorkingTable/View/GMEditQuesPartSelectView.m

@@ -8,6 +8,8 @@
 
 #import "GMEditQuesPartSelectView.h"
 #import "GMEditQuesPartController.h"
+#import <GMBase/GMBaseTool.h>
+
 
 @interface GMEditQuesPartSelectCell : GMTableViewCell
 
@@ -121,7 +123,7 @@
                 [_selectArray addObject:cell.model];
                 cell.selectButton.selected = YES;
             } else {
-                [AppDelegate.visibleController toast:@"最多选3个"];
+                [[GMBaseTool getCurrentViewController] toast:@"最多选3个"];
             }
         }
     }
@@ -244,7 +246,7 @@
     if (!_confirmButton) {
         _confirmButton = [GMButton buttonWithType:UIButtonTypeCustom];
         [_confirmButton setTitle:@"确定" forState:UIControlStateNormal];
-        [_confirmButton setTitleColor:GMColorFF8C8D forState:UIControlStateNormal];
+        [_confirmButton setTitleColor:RGBCOLOR_HEX(0xFF8C8D) forState:UIControlStateNormal];
         [_confirmButton addTarget:self action:@selector(confirmButtonClick) forControlEvents:UIControlEventTouchUpInside];
         _confirmButton.titleLabel.font = [UIFont gmFont:14];
     }

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

@@ -5,7 +5,7 @@
 //  Created by Locus on 2020/2/19.
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //
-
+#import "GMLibraryHeader.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface GMEditQuesSuggestCell : GMTableViewCell

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

@@ -7,6 +7,7 @@
 //
 
 #import "GMStarWithContentObject.h"
+@import GMBase;
 
 NS_ASSUME_NONNULL_BEGIN
 

GMAILab/Classes/ToFace/WorkingTable/View/GMEndConsultView.m

@@ -8,6 +8,13 @@
 
 #import "GMEndConsultView.h"
 #import "GMEditQuesPartController.h"
+#import "RequestHeader.h"
+#import "GMToFaceNetworking.h"
+#import <GMBase/GMBaseTool.h>
+
+
+@import GMNetworking;
+@import MBProgressHUD;
 
 @interface GMEndConsultView () <UITextViewDelegate>
 
@@ -47,6 +54,13 @@
     [self setLayout];
     [self containerRectCorner:self.container];
 }
+- (void)containerRectCorner:(UIView *)view {
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = view.bounds;
+    maskLayer.path = maskPath.CGPath;
+    view.layer.mask = maskLayer;
+}
 - (void)setUI {
     self.animationType = GMPopupAnimationTypeFlipFromBottom;
     [self.container addSubview:self.grayLineView];
@@ -275,10 +289,10 @@
                 weakSelf.evaluateFinish(1, 0, @"");
             }
             if (weakSelf.complaintType == GMComplaintTypeUser) {
-                [GMHudModule toastInView:[AppDelegate shareInstance].window text:@"投诉意见提交成功"];
+                [GMHudModule toastInView:[GMBaseTool mainWindow]  text:@"投诉意见提交成功"];
             }
         }else {
-            [GMHudModule toastInView:[AppDelegate shareInstance].window text:response.message];
+            [GMHudModule toastInView:[GMBaseTool mainWindow]  text:response.message];
         }
     }];
 }
@@ -287,32 +301,32 @@
     [self showLoading];
     __weak __typeof(self)weakSelf = self;
     if (self.starNum <= 0) {
-        [GMHudModule toastInView:[AppDelegate shareInstance].window text:@"请选择1-5星进行评价"];
+        [GMHudModule toastInView:[GMBaseTool mainWindow]  text:@"请选择1-5星进行评价"];
         return;
     }
-    [[GMInterfaceNetwork shareInstance] excuteToFaceEvaluateDiagnosis_id:self.recordId star:self.starNum SuccessBlock:^(id response) {
+    [[GMToFaceNetworking shareInstance] excuteToFaceEvaluateDiagnosis_id:self.recordId star:self.starNum SuccessBlock:^(id response) {
         if (weakSelf.evaluateFinish && weakSelf.starNum>=1) {
             GMStarInfoObject *object = weakSelf.starContentArray[weakSelf.starNum - 1];
             weakSelf.evaluateFinish(0, weakSelf.starNum, object.descrip);
         }
         [weakSelf hideLoading];
         [weakSelf hide];
-        [GMHudModule toastInView:[AppDelegate shareInstance].window text:@"感谢您的评价～"];
+        [GMHudModule toastInView:[GMBaseTool mainWindow]  text:@"感谢您的评价～"];
     } failureBlock:^(NSInteger errorCode, NSString *message) {
         [weakSelf hideLoading];
         [weakSelf hide];
-        [GMHudModule toastInView:[AppDelegate shareInstance].window text:message];
+        [GMHudModule toastInView:[GMBaseTool mainWindow]  text:message];
     }];
 }
 - (void)confirmButtonClick {
     if (self.type == GMEndConsultViewTypeReport) {
         GMEditQuesPartController *vc = [GMEditQuesPartController new];
         vc.viewModel.recordId = self.recordId;
-        [AppDelegate.navigation pushViewController:vc animated:YES];
+        [[GMBaseTool getNavigation] pushViewController:vc animated:YES];
         [self hide];
     } else if (self.type == GMEndConsultViewTypeDoctorComplaint || self.type == GMEndConsultViewTypeUserComplaint) {
         if (self.textView.text.length < 10) {
-            [AppDelegate.visibleController toast:@"请填写您的投诉原因，至少10个字"];
+            [[GMBaseTool getCurrentViewController] toast:@"请填写您的投诉原因，至少10个字"];
         } else {
             [self complaint];
         }
@@ -365,7 +379,7 @@
 - (UIView *)grayLineView {
     if (!_grayLineView) {
         _grayLineView = [[UIView alloc] init];
-        _grayLineView.backgroundColor = GMColorEEEEEE;
+        _grayLineView.backgroundColor = RGBCOLOR_HEX(0xEEEEEE);
         _grayLineView.layer.cornerRadius = 2.5f;
         _grayLineView.layer.masksToBounds = YES;
     }
@@ -387,7 +401,7 @@
         _confirmButton.titleLabel.font = [UIFont gmBoldFont:17];
         [_confirmButton setTitle:@"保存" forState:UIControlStateNormal];
         [_confirmButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        [_confirmButton setBackgroundColor:GMColorFF8C8D forState:UIControlStateNormal];
+        [_confirmButton setBackgroundColor:RGBCOLOR_HEX(0xFF8C8D) forState:UIControlStateNormal];
         [_confirmButton addTarget:self action:@selector(confirmButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _confirmButton;
@@ -419,7 +433,7 @@
         _complaintUserButton = [GMButton buttonWithType:UIButtonTypeCustom];
         _complaintUserButton.titleLabel.font = [UIFont gmFont:13];
         [_complaintUserButton setTitle:@"我要投诉>" forState:UIControlStateNormal];
-        [_complaintUserButton setTitleColor:GMColorFF8C8D forState:UIControlStateNormal];
+        [_complaintUserButton setTitleColor:RGBCOLOR_HEX(0xFF8C8D) forState:UIControlStateNormal];
         [_complaintUserButton addTarget:self action:@selector(complaintUserButtonClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _complaintUserButton;
@@ -463,14 +477,14 @@
 }
 - (GMLabel *)bottomLabel {
     if (!_bottomLabel) {
-        _bottomLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:14];
+        _bottomLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:14];
         _bottomLabel.textAlignment = NSTextAlignmentCenter;
     }
     return _bottomLabel;
 }
 - (GMLabel *)tipLabel {
     if (!_tipLabel) {
-        _tipLabel = [GMLabel labelWithTextColor:GMColor282828 fontSize:11];
+        _tipLabel = [GMLabel labelWithTextColor:RGBCOLOR_HEX(0x282828) fontSize:11];
         _tipLabel.text = @"请详细填写您需要申诉的问题，审核通过后将会为您安排退款";
     }
     return _tipLabel;