conflict fix

667c4ea5 · 朱璇 · 62c33ec6 · 6324cf4c · 667c4ea5 · 667c4ea5
Commit 667c4ea5 authored Jul 24, 2020 by 朱璇
11 changed files
--- a/Example/GMAILab.xcodeproj/project.pbxproj
+++ b/Example/GMAILab.xcodeproj/project.pbxproj
@@ -325,6 +325,7 @@
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/EVReflection/EVReflection.framework",
 				"${BUILT_PRODUCTS_DIR}/GM-Swift-Observable/GM_Swift_Observable.framework",
+				"${BUILT_PRODUCTS_DIR}/GMBase/GMBase.framework",
 				"${BUILT_PRODUCTS_DIR}/GMCache/GMCache.framework",
 				"${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework",
 				"${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework",
@@ -337,6 +338,7 @@
 				"${BUILT_PRODUCTS_DIR}/GMRouter/GMRouter.framework",
 				"${BUILT_PRODUCTS_DIR}/GMUtil/GMUtil.framework",
 				"${BUILT_PRODUCTS_DIR}/GPUImage/GPUImage.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
@@ -363,6 +365,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EVReflection.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GM_Swift_Observable.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMBase.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMCache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework",
@@ -375,6 +378,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMRouter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMUtil.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GPUImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
@@ -385,7 +389,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NMC.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NMCBasicModuleFramework.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLMediaStreamingKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",

--- a/Example/Podfile
+++ b/Example/Podfile
@@ -10,15 +10,12 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git'

 target 'GMAILab_Example' do
  pod 'GMAILab', :path => '../'
-#  pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => 'f3b40c7'
-  pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => 'ed24e93'
-#  pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677'
-#9e91ae1
-  pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => '9e91ae1'
-  pod 'GMBaseSwift', '3.4.2'
-  pod 'GMAlbum', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git', :commit => '31dcd07'
-  pod 'Qiniu',  '7.2.6'
-  pod 'GMBaseWeb',  :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '9554b01'
+  pod 'GMPhobos'
+  pod 'GMBase'
+  pod 'GMBaseSwift'
+  pod 'GMAlbum'
+  pod 'Qiniu'
+  pod 'GMBaseWeb'

  
 #  s.dependency 'GMBaseSwift','3.4.0'

--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -42,12 +42,12 @@ PODS:
    - PLPlayerKit
    - Qiniu
    - YYText
-  - GMAlbum (4.1.3):
+  - GMAlbum (4.1.6):
    - GMBase
    - GMKit
    - GPUImage (= 0.1.7)
-  - GMBase (1.1.5):
-    - GMBaseSwift
+  - GMBase (1.2.1):
+    - GMFoundation
    - GMHud
    - GMJSONModel
    - GMKit
@@ -55,11 +55,10 @@ PODS:
    - GMNetworking
    - GMPhobos
    - GMRefresh
-    - GMShareSDK
    - MBProgressHUD
    - SDWebImage
    - "UITableView+FDTemplateLayoutCell (= 1.4)"
-  - GMBaseSwift (3.4.2):
+  - GMBaseSwift (3.4.3):
    - EVReflection (= 5.10.0)
    - GM-Swift-Observable
    - GMHud
@@ -68,7 +67,7 @@ PODS:
    - GMPhobos
    - GMRefresh
    - SnapKit (= 4.0.0)
-  - GMBaseWeb (0.0.2):
+  - GMBaseWeb (0.0.4):
    - GMAlbum
    - GMBase
    - GMBaseSwift
@@ -87,63 +86,56 @@ PODS:
    - lottie-ios (= 2.5.2)
    - MBProgressHUD (= 0.9.2)
  - GMJSONModel (1.7.4)
-  - GMKit (1.3.1):
-    - GMKit/Category (= 1.3.1)
-    - GMKit/Color (= 1.3.1)
-    - GMKit/Constant (= 1.3.1)
-    - GMKit/FDFullscreenPopGesture (= 1.3.1)
-    - GMKit/Kit (= 1.3.1)
-    - GMKit/Protocol (= 1.3.1)
+  - GMKit (1.3.2):
+    - GMKit/Category (= 1.3.2)
+    - GMKit/Color (= 1.3.2)
+    - GMKit/Constant (= 1.3.2)
+    - GMKit/FDFullscreenPopGesture (= 1.3.2)
+    - GMKit/Kit (= 1.3.2)
+    - GMKit/Protocol (= 1.3.2)
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
-  - GMKit/Category (1.3.1):
-    - GMKit/Color (= 1.3.1)
-    - GMKit/Constant (= 1.3.1)
-    - GMKit/Protocol (= 1.3.1)
+  - GMKit/Category (1.3.2):
+    - GMKit/Color (= 1.3.2)
+    - GMKit/Constant (= 1.3.2)
+    - GMKit/Protocol (= 1.3.2)
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
-  - GMKit/Color (1.3.1):
+  - GMKit/Color (1.3.2):
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
-  - GMKit/Constant (1.3.1):
+  - GMKit/Constant (1.3.2):
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
-  - GMKit/FDFullscreenPopGesture (1.3.1):
+  - GMKit/FDFullscreenPopGesture (1.3.2):
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
-  - GMKit/Kit (1.3.1):
-    - GMKit/Category (= 1.3.1)
-    - GMKit/Color (= 1.3.1)
-    - GMKit/Constant (= 1.3.1)
-    - GMKit/Protocol (= 1.3.1)
+  - GMKit/Kit (1.3.2):
+    - GMKit/Category (= 1.3.2)
+    - GMKit/Color (= 1.3.2)
+    - GMKit/Constant (= 1.3.2)
+    - GMKit/Protocol (= 1.3.2)
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
-  - GMKit/Protocol (1.3.1):
+  - GMKit/Protocol (1.3.2):
    - GMPhobos
    - Masonry
    - SDWebImage
-    - SnapKit
  - GMNetService (1.0.3):
    - AFNetworking
  - GMNetworking (4.0.7):
    - Alamofire (= 4.7.0)
-  - GMPhobos (2.0.5):
+  - GMPhobos (2.1.4):
    - GMCache
    - MagicalRecord
    - MJExtension
-  - GMRefresh (1.0.10):
+  - GMRefresh (1.1.0):
    - GMPhobos
    - MJRefresh
  - GMRouter (0.1.8):
@@ -161,6 +153,7 @@ PODS:
    - Weibo_SDK (= 3.2.7)
  - GMUtil (3.1.0)
  - GPUImage (0.1.7)
+  - HappyDNS (0.3.17)
  - lottie-ios (2.5.2)
  - MagicalRecord (2.3.2):
    - MagicalRecord/Core (= 2.3.2)
@@ -176,7 +169,8 @@ PODS:
  - PLPlayerKit (3.4.3):
    - PLPlayerKit/iphoneos (= 3.4.3)
  - PLPlayerKit/iphoneos (3.4.3)
-  - Qiniu (7.2.6)
+  - Qiniu (7.4.2):
+    - HappyDNS (~> 0.3.17)
  - SDWebImage (5.8.4):
    - SDWebImage/Core (= 5.8.4)
  - SDWebImage/Core (5.8.4)
@@ -189,17 +183,20 @@ PODS:

 DEPENDENCIES:
  - GMAILab (from `../`)
-  - "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)"
-  - "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)"
-  - GMBaseSwift (= 3.4.2)
-  - "GMBaseWeb (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git`, commit `9554b01`)"
-  - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `ed24e93`)"
-  - Qiniu (= 7.2.6)
+  - GMAlbum
+  - GMBase
+  - GMBaseSwift
+  - GMBaseWeb
+  - GMPhobos
+  - Qiniu

 SPEC REPOS:
  "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
    - GM-Swift-Observable
+    - GMAlbum
+    - GMBase
    - GMBaseSwift
+    - GMBaseWeb
    - GMCache
    - GMFoundation
    - GMHud
@@ -207,6 +204,7 @@ SPEC REPOS:
    - GMKit
    - GMNetService
    - GMNetworking
+    - GMPhobos
    - GMRefresh
    - GMRouter
    - GMShareSDK
@@ -219,6 +217,7 @@ SPEC REPOS:
    - DouyinOpenSDK
    - EVReflection
    - GPUImage
+    - HappyDNS
    - lottie-ios
    - MagicalRecord
    - Masonry
@@ -240,32 +239,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
  GMAILab:
    :path: "../"
-  GMAlbum:
-    :commit: 31dcd07
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git"
-  GMBase:
-    :commit: 9e91ae1
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
-  GMBaseWeb:
-    :commit: 9554b01
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
-  GMPhobos:
-    :commit: ed24e93
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
-
-CHECKOUT OPTIONS:
-  GMAlbum:
-    :commit: 31dcd07
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git"
-  GMBase:
-    :commit: 9e91ae1
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
-  GMBaseWeb:
-    :commit: 9554b01
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
-  GMPhobos:
-    :commit: ed24e93
-    :git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"

 SPEC CHECKSUMS:
  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
@@ -276,23 +249,24 @@ SPEC CHECKSUMS:
  EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
  GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
  GMAILab: c900b10ce5ceba6b5d24b2787b6661bbd766fa0e
-  GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192
-  GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
-  GMBaseSwift: 82915eb16c9505ff19f66c85a2bbf5f7f50756f2
-  GMBaseWeb: 54568ee1ba785b9bc252f738cbb636247bb91721
+  GMAlbum: f1073eaa4ec518316d7da2098806df473942ebe0
+  GMBase: 8233aa9d51177f1c25d3b5bec479789cc304f6cb
+  GMBaseSwift: 9fc40e6a92cbe822ed92dccfbcb134cedd038da2
+  GMBaseWeb: 0cb73c0fda1ba0fc9a4f4f41355485055f07c0b8
  GMCache: b78d8e46db864405e91d226ce640cc80d966c611
  GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
  GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f
  GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
-  GMKit: e97c521f3f54a3c1c43343254f2cd99d9fb27185
+  GMKit: acc124a9e844ec1ce8300a6b9a8c3e26159f5963
  GMNetService: 78d729467b99b6ce9814d51efa4dcfa3ddebafe3
  GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2
-  GMPhobos: abab7c666c8a75549adea937e40e101d4d341b0d
-  GMRefresh: 11497a660eb14b1fda443bfe682910e0cc6031f4
+  GMPhobos: b4e16c162df6618c6f7d10f4649a5f32920961fd
+  GMRefresh: b2f2b0942d9726aa7a9d93ed73a2644f3437ba5c
  GMRouter: a8d1d6bea779954a2b5b6181763618e663baafff
  GMShareSDK: 5a0fc06881021f0055841675bf748c01143acc2d
  GMUtil: 194a8831e4311762c4b1ac1278281b456157f4ec
  GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d
+  HappyDNS: 848ef73e24f2b0e2752064223ce2dc0dd88900ea
  lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
  MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -302,7 +276,7 @@ SPEC CHECKSUMS:
  NIMSDK: a43eb9b8bf83ddb0338c51ae2d756b683edc0cb8
  PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
  PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
-  Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
+  Qiniu: 0e2887592ffb0f23f86b920470d2301933d51f11
  SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9
  SnapKit: a42d492c16e80209130a3379f73596c3454b7694
  TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
@@ -311,6 +285,6 @@ SPEC CHECKSUMS:
  Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
  YYText: 5c461d709e24d55a182d1441c41dc639a18a4849

-PODFILE CHECKSUM: cfc00708d341bbb73e9867a99840c08908fc589f
+PODFILE CHECKSUM: 6fff101276ba53d028e858841e95eabac638b8f2

 COCOAPODS: 1.9.3
--- a/GMAILab.podspec
+++ b/GMAILab.podspec
@@ -80,7 +80,6 @@ TODO: Add long description of the pod here.
  s.dependency 'GMShareSDK'
  s.dependency 'DouyinOpenSDK', '1.4.1'
  s.dependency 'GMBaseWeb'
-
  # 信令
  s.dependency 'NIMSDK',          '7.5.0'
  s.dependency 'AlipaySDK-iOS', '15.6.8'
@@ -88,19 +87,14 @@ TODO: Add long description of the pod here.
  s.dependency 'PLPlayerKit'
  s.dependency 'Qiniu'
  
-  
  s.libraries    = "z", "c++", "xml2", "sqlite3"
  s.frameworks = 'ReplayKit', 'CoreTelephony', 'SystemConfiguration'
  s.pod_target_xcconfig = { 'VALID_ARCHS' => 'arm64 armv7 x86_64' }

-#  s.pod_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' }
-
-
 #  s.dependency 'TTTRtcEngineKit_iOS'
 #  s.dependency 'TTTPlayerKit_iOS'
  s.static_framework  =  true
  
-#  s.pod_target_xcconfig = { 'VALID_ARCHS' => 'armv7' }


 end
--- a/GMAILab/Classes/AddClass/GMLiveWelfareView.h
+++ b/GMAILab/Classes/AddClass/GMLiveWelfareView.h
+//
+//  GMLiveWelfareView.h
+//  Gengmei
+//
+//  Created by 汪俊 on 2017/3/30.
+//  Copyright © 2017年 更美互动信息科技有限公司. All rights reserved.
+//
+
+#import "GMImageView.h"
+#import "GMInstallmentView.h"
+#import "GMInsuranceView.h"
+//#import "Gengmei-Swift.h"
+@class AllLayoutButton;
+@class GMLiveWelfareView;
+@class GMAdLabel;
+@protocol GMLiveWelfareViewDelegate <NSObject>
+- (void)didSelectedWelfareView:(GMLiveWelfareView *)welFareView;
+- (void)didClickedHospitalDetailButton:(AllLayoutButton *)button;
+@end
+/**
+ 直播和回放页面的美购
+ */
+@interface GMLiveWelfareView : GMView
+
+@property (nonatomic , strong) GMView *welfareContainer;
+/** @brief 美购大图片 */
+@property (nonatomic , strong) GMImageView *bigIconImage;
+
+/** @brief 预付价 */
+@property (nonatomic , strong) GMImageView *yufuImage;
+
+/** @brief 已售完 */
+@property (nonatomic , strong) GMImageView *sallOutImage;
+
+/** @brief 美购标题 */
+@property (nonatomic , strong) GMLabel *welfareTitle;
+
+/** @brief 美购简介 */
+@property (nonatomic , strong) GMAdLabel *welfareContent;
+
+/** @brief 更美价 */
+@property (nonatomic , strong) GMLabel *gengmeiPrice;
+
+/** @brief 市场价 */
+@property (nonatomic , strong) GMLabel *marketPrice;
+
+/** @brief 删除线 */
+@property (nonatomic , strong) GMLabel *deleteLabel;
+
+/** @brief 人民币(元/元起) */
+@property (nonatomic , strong) GMLabel *yuanLabel;
+
+/** @brief 预付款标签 */
+@property (nonatomic , strong) GMLabel *yufuLabel;
+
+/** @brief 申请数 */
+@property (nonatomic , strong) GMLabel *applyNumber;
+
+/** @brief  剩余多少个*/
+@property (nonatomic , strong) GMLabel *surplusLabel;
+
+/** @brief 城市 */
+@property (nonatomic , strong) GMLabel *cityLabel;
+
+/** @brief 医生 */
+@property (nonatomic , strong) GMLabel *doctorLabel;
+
+/** @brief 机构 */
+@property (nonatomic , strong) GMLabel *hospitalLabel;
+/**状态栏背景*/
+@property (nonatomic, strong) GMView *statusBG;
+
+/** @brief  */
+@property (nonatomic , strong) UIView *surplusBG;
+
+/** @brief  秒杀价图片*/
+@property (nonatomic , strong) GMImageView *seckillIcon;
+/** seckill是否隐藏*/
+@property (nonatomic, assign) BOOL isSeckillHidden;
+
+/**
+ 展示推广label
+ @author wangjun 16-08-01 in 6.3.0
+ */
+@property (nonatomic, assign) BOOL showPromotion;
+
+/**
+ 分期提示
+ */
+//@property (nonatomic, strong) GMInstallmentView *installmentView;
+
+/**
+ 保险提示
+ */
+//@property (nonatomic, strong) GMInsuranceView *insuranceView;
+
+/**
+ 是否展示推分期
+ */
+//@property (nonatomic, assign) BOOL showInstallment;
+
+
+/**
+ 是否展示保险
+ */
+//@property (nonatomic, assign) BOOL showInsurance;
+@property (nonatomic , strong) UIImageView *hospitalBg;
+
+@property (nonatomic, weak) id<GMLiveWelfareViewDelegate> delegate;
+- (void)show;
+- (void)hide;
+@end
--- a/GMAILab/Classes/AddClass/GMLiveWelfareView.m
+++ b/GMAILab/Classes/AddClass/GMLiveWelfareView.m
--- a/GMAILab/Classes/ToFace/ToFaceOrder/ViewController/GMTofaceOrderDetailViewController.h
+++ b/GMAILab/Classes/ToFace/ToFaceOrder/ViewController/GMTofaceOrderDetailViewController.h
@@ -6,7 +6,8 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //

-#import "GMWebViewController.h"
+//#import "GMWebViewController.h"
+#import <GMBaseWeb/GMWebViewController.h>

 NS_ASSUME_NONNULL_BEGIN
 @interface GMTofaceOrderDetailViewController : GMWebViewController

--- a/GMAILab/Classes/ToFace/Waiting/GMVideoWaitingView.m
+++ b/GMAILab/Classes/ToFace/Waiting/GMVideoWaitingView.m
@@ -14,7 +14,7 @@

 #import <GMBase/GMBaseTool.h>
 #import "NSBundle+GMAILab.h"
-
+#import <GMKit/UIAlertController+gm.h>
 #define centerPoint CGPointMake(MAINSCREEN_WIDTH / 2, MAINSCREEN_HEIGHT / 2)
 #define circleAnimaitionTime 2
 #define fromRadius sqrtf((centerPoint.x * centerPoint.x) + (centerPoint.y * centerPoint.y))
@@ -261,12 +261,11 @@
        [self cancelDispatch];
    } else {
        __weak __typeof(self)weakSelf = self;
-        UIAlertController *alert = [UIAlertController alert:@"正在为您全力匹配医生、面诊师 真的不再等一等了么？" leftTitle:@"残忍离开" rightTitle:@"取消" leftAlterAction:^{
+        [UIAlertController gm_Alert:@"正在为您全力匹配医生、面诊师 真的不再等一等了么？" leftTitle:@"残忍离开" rightTitle:@"取消" leftAlterAction:^{
            [weakSelf waitViewHide];
        } rightAlertAction:^{
            
        }];
-        [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:nil];
    }
 }


--- a/GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportListController.h
+++ b/GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportListController.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //

-#import "GMWebViewController.h"
+#import <GMBaseWeb/GMWebViewController.h>

 NS_ASSUME_NONNULL_BEGIN


--- a/GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportResultController.h
+++ b/GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportResultController.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //

-#import "GMWebViewController.h"
+#import <GMBaseWeb/GMWebViewController.h>

 NS_ASSUME_NONNULL_BEGIN


--- a/GMAILab/Classes/ToFace/diagnoseRecord/GMDiagnoseRecordWebViewController.h
+++ b/GMAILab/Classes/ToFace/diagnoseRecord/GMDiagnoseRecordWebViewController.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
 //

-@import GMBaseWeb;
+#import <GMBaseWeb/GMWebViewController.h>

 NS_ASSUME_NONNULL_BEGIN