Skip to content

G
GMAILab
Commit 6324cf4c authored by jz's avatar jz
Browse files
Options

update

parent 1f16cd61
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 73 deletions
Example/GMAILab.xcodeproj/project.pbxproj
View file @ 6324cf4c
...@@ -325,6 +325,7 @@ ...@@ -325,6 +325,7 @@
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/EVReflection/EVReflection.framework", "${BUILT_PRODUCTS_DIR}/EVReflection/EVReflection.framework",
"${BUILT_PRODUCTS_DIR}/GM-Swift-Observable/GM_Swift_Observable.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}/GMCache/GMCache.framework",
"${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework", "${BUILT_PRODUCTS_DIR}/GMFoundation/GMFoundation.framework",
"${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework", "${BUILT_PRODUCTS_DIR}/GMHud/GMHud.framework",
...@@ -363,6 +364,7 @@ ...@@ -363,6 +364,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EVReflection.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}/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}/GMCache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMFoundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GMHud.framework",
......
Example/Podfile
View file @ 6324cf4c
...@@ -10,15 +10,12 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git' ...@@ -10,15 +10,12 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git'
target 'GMAILab_Example' do target 'GMAILab_Example' do
pod 'GMAILab', :path => '../' pod 'GMAILab', :path => '../'
# pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => 'f3b40c7' pod 'GMPhobos'
pod 'GMPhobos', '2.0.7' pod 'GMBase'
# pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677' pod 'GMBaseSwift'
#9e91ae1 pod 'GMAlbum'
pod 'GMBase', '1.1.7' pod 'Qiniu'
pod 'GMBaseSwift', '3.4.2' pod 'GMBaseWeb'
pod 'GMAlbum', '4.1.6'
pod 'Qiniu', '7.2.6'
pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => 'c3ca876'
# s.dependency 'GMBaseSwift','3.4.0' # s.dependency 'GMBaseSwift','3.4.0'
......
Example/Podfile.lock
View file @ 6324cf4c
...@@ -46,8 +46,7 @@ PODS: ...@@ -46,8 +46,7 @@ PODS:
- GMBase - GMBase
- GMKit - GMKit
- GPUImage (= 0.1.7) - GPUImage (= 0.1.7)
- GMBase (1.1.7): - GMBase (1.2.1):
- GMBaseSwift
- GMFoundation - GMFoundation
- GMHud - GMHud
- GMJSONModel - GMJSONModel
...@@ -59,7 +58,7 @@ PODS: ...@@ -59,7 +58,7 @@ PODS:
- MBProgressHUD - MBProgressHUD
- SDWebImage - SDWebImage
- "UITableView+FDTemplateLayoutCell (= 1.4)" - "UITableView+FDTemplateLayoutCell (= 1.4)"
- GMBaseSwift (3.4.2): - GMBaseSwift (3.4.3):
- EVReflection (= 5.10.0) - EVReflection (= 5.10.0)
- GM-Swift-Observable - GM-Swift-Observable
- GMHud - GMHud
...@@ -68,9 +67,10 @@ PODS: ...@@ -68,9 +67,10 @@ PODS:
- GMPhobos - GMPhobos
- GMRefresh - GMRefresh
- SnapKit (= 4.0.0) - SnapKit (= 4.0.0)
- GMBaseWeb (0.1.0): - GMBaseWeb (0.0.4):
- GMAlbum - GMAlbum
- GMBase - GMBase
- GMBaseSwift
- GMCache - GMCache
- GMFoundation - GMFoundation
- GMHud - GMHud
...@@ -86,66 +86,59 @@ PODS: ...@@ -86,66 +86,59 @@ PODS:
- lottie-ios (= 2.5.2) - lottie-ios (= 2.5.2)
- MBProgressHUD (= 0.9.2) - MBProgressHUD (= 0.9.2)
- GMJSONModel (1.7.4) - GMJSONModel (1.7.4)
- GMKit (1.2.8): - GMKit (1.3.2):
- GMKit/Category (= 1.2.8) - GMKit/Category (= 1.3.2)
- GMKit/Color (= 1.2.8) - GMKit/Color (= 1.3.2)
- GMKit/Constant (= 1.2.8) - GMKit/Constant (= 1.3.2)
- GMKit/FDFullscreenPopGesture (= 1.2.8) - GMKit/FDFullscreenPopGesture (= 1.3.2)
- GMKit/Kit (= 1.2.8) - GMKit/Kit (= 1.3.2)
- GMKit/Protocol (= 1.2.8) - GMKit/Protocol (= 1.3.2)
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit - GMKit/Category (1.3.2):
- GMKit/Category (1.2.8): - GMKit/Color (= 1.3.2)
- GMKit/Color (= 1.2.8) - GMKit/Constant (= 1.3.2)
- GMKit/Constant (= 1.2.8) - GMKit/Protocol (= 1.3.2)
- GMKit/Protocol (= 1.2.8)
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit - GMKit/Color (1.3.2):
- GMKit/Color (1.2.8):
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit - GMKit/Constant (1.3.2):
- GMKit/Constant (1.2.8):
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit - GMKit/FDFullscreenPopGesture (1.3.2):
- GMKit/FDFullscreenPopGesture (1.2.8):
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit - GMKit/Kit (1.3.2):
- GMKit/Kit (1.2.8): - GMKit/Category (= 1.3.2)
- GMKit/Category (= 1.2.8) - GMKit/Color (= 1.3.2)
- GMKit/Color (= 1.2.8) - GMKit/Constant (= 1.3.2)
- GMKit/Constant (= 1.2.8) - GMKit/Protocol (= 1.3.2)
- GMKit/Protocol (= 1.2.8)
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit - GMKit/Protocol (1.3.2):
- GMKit/Protocol (1.2.8):
- GMPhobos - GMPhobos
- Masonry - Masonry
- SDWebImage - SDWebImage
- SnapKit
- GMNetService (1.0.3): - GMNetService (1.0.3):
- AFNetworking - AFNetworking
- GMNetworking (4.0.7): - GMNetworking (4.0.7):
- Alamofire (= 4.7.0) - Alamofire (= 4.7.0)
- GMPhobos (2.0.7): - GMPhobos (2.1.4):
- GMCache - GMCache
- MagicalRecord - MagicalRecord
- MJExtension - MJExtension
- GMRefresh (1.0.10): - GMRefresh (1.1.0):
- GMPhobos - GMPhobos
- MJRefresh - MJRefresh
- GMRouter (0.1.7): - GMRouter (0.1.8):
- GMPhobos - GMPhobos
- MJExtension - MJExtension
- GMShareSDK (0.2.2): - GMShareSDK (0.2.2):
...@@ -176,9 +169,9 @@ PODS: ...@@ -176,9 +169,9 @@ PODS:
- PLPlayerKit/iphoneos (= 3.4.3) - PLPlayerKit/iphoneos (= 3.4.3)
- PLPlayerKit/iphoneos (3.4.3) - PLPlayerKit/iphoneos (3.4.3)
- Qiniu (7.2.6) - Qiniu (7.2.6)
- SDWebImage (5.8.3): - SDWebImage (5.8.4):
- SDWebImage/Core (= 5.8.3) - SDWebImage/Core (= 5.8.4)
- SDWebImage/Core (5.8.3) - SDWebImage/Core (5.8.4)
- SnapKit (4.0.0) - SnapKit (4.0.0)
- TMCache (2.1.0) - TMCache (2.1.0)
- "UITableView+FDTemplateLayoutCell (1.4)" - "UITableView+FDTemplateLayoutCell (1.4)"
...@@ -188,12 +181,12 @@ PODS: ...@@ -188,12 +181,12 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- GMAILab (from `../`) - GMAILab (from `../`)
- GMAlbum (= 4.1.6) - GMAlbum
- GMBase (= 1.1.7) - GMBase
- GMBaseSwift (= 3.4.2) - GMBaseSwift
- "GMBaseWeb (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git`, commit `c3ca876`)" - GMBaseWeb
- GMPhobos (= 2.0.7) - GMPhobos
- Qiniu (= 7.2.6) - Qiniu
SPEC REPOS: SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
...@@ -201,6 +194,7 @@ SPEC REPOS: ...@@ -201,6 +194,7 @@ SPEC REPOS:
- GMAlbum - GMAlbum
- GMBase - GMBase
- GMBaseSwift - GMBaseSwift
- GMBaseWeb
- GMCache - GMCache
- GMFoundation - GMFoundation
- GMHud - GMHud
...@@ -242,14 +236,6 @@ SPEC REPOS: ...@@ -242,14 +236,6 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
GMAILab: GMAILab:
:path: "../" :path: "../"
GMBaseWeb:
:commit: c3ca876
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
CHECKOUT OPTIONS:
GMBaseWeb:
:commit: c3ca876
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git"
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
...@@ -261,19 +247,19 @@ SPEC CHECKSUMS: ...@@ -261,19 +247,19 @@ SPEC CHECKSUMS:
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595 GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMAILab: c900b10ce5ceba6b5d24b2787b6661bbd766fa0e GMAILab: c900b10ce5ceba6b5d24b2787b6661bbd766fa0e
GMAlbum: f1073eaa4ec518316d7da2098806df473942ebe0 GMAlbum: f1073eaa4ec518316d7da2098806df473942ebe0
GMBase: 2b21497f52e691e0a2ba47fc883f1334fa7f2cbf GMBase: 8233aa9d51177f1c25d3b5bec479789cc304f6cb
GMBaseSwift: 82915eb16c9505ff19f66c85a2bbf5f7f50756f2 GMBaseSwift: 9fc40e6a92cbe822ed92dccfbcb134cedd038da2
GMBaseWeb: 4b374ec5a7afc59368eea5dc480f0e98129a9c69 GMBaseWeb: 0cb73c0fda1ba0fc9a4f4f41355485055f07c0b8
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
GMKit: bfb96afc614ed15404c5893f864e83cedaf7c839 GMKit: acc124a9e844ec1ce8300a6b9a8c3e26159f5963
GMNetService: 78d729467b99b6ce9814d51efa4dcfa3ddebafe3 GMNetService: 78d729467b99b6ce9814d51efa4dcfa3ddebafe3
GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2 GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2
GMPhobos: ae8ecc3c1fc4e94e0fa4fd093da46e4f6bce580e GMPhobos: b4e16c162df6618c6f7d10f4649a5f32920961fd
GMRefresh: 11497a660eb14b1fda443bfe682910e0cc6031f4 GMRefresh: b2f2b0942d9726aa7a9d93ed73a2644f3437ba5c
GMRouter: 6f2c630e6d9f03d117ac39e5cdb1b522acf6ad65 GMRouter: a8d1d6bea779954a2b5b6181763618e663baafff
GMShareSDK: 5a0fc06881021f0055841675bf748c01143acc2d GMShareSDK: 5a0fc06881021f0055841675bf748c01143acc2d
GMUtil: 194a8831e4311762c4b1ac1278281b456157f4ec GMUtil: 194a8831e4311762c4b1ac1278281b456157f4ec
GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d
...@@ -287,7 +273,7 @@ SPEC CHECKSUMS: ...@@ -287,7 +273,7 @@ SPEC CHECKSUMS:
PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0 PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06 PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
SDWebImage: 112503ec94a5a2a41869503844a15e8d8f1ead5c SDWebImage: cf6922231e95550934da2ada0f20f2becf2ceba9
SnapKit: a42d492c16e80209130a3379f73596c3454b7694 SnapKit: a42d492c16e80209130a3379f73596c3454b7694
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
"UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030 "UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030
...@@ -295,6 +281,6 @@ SPEC CHECKSUMS: ...@@ -295,6 +281,6 @@ SPEC CHECKSUMS:
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849 YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
PODFILE CHECKSUM: 1046380b9bddf0bea14e4262b5a1c38da592c3b1 PODFILE CHECKSUM: 6fff101276ba53d028e858841e95eabac638b8f2
COCOAPODS: 1.9.3 COCOAPODS: 1.9.3
GMAILab/Classes/AddClass/GMLiveWelfareView.m
View file @ 6324cf4c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "GMLiveWelfareView.h" #import "GMLiveWelfareView.h"
#import "UIView+Layout.h" #import "UIView+Layout.h"
#import <GMBase/GMBase-Swift.h> //#import <GMBase/GMBase-Swift.h>
//#import "GMAdLabel.h" //#import "GMAdLabel.h"
#import <GMKit/GMKit-umbrella.h> #import <GMKit/GMKit-umbrella.h>
//#import "AllLayoutButton.swift" //#import "AllLayoutButton.swift"
......
GMAILab/Classes/ToFace/Waiting/GMVideoWaitingView.m
View file @ 6324cf4c
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#import <GMBase/GMBaseTool.h> #import <GMBase/GMBaseTool.h>
#import "NSBundle+GMAILab.h" #import "NSBundle+GMAILab.h"
#import <GMKit/UIAlertController+gm.h>
#define centerPoint CGPointMake(MAINSCREEN_WIDTH / 2, MAINSCREEN_HEIGHT / 2) #define centerPoint CGPointMake(MAINSCREEN_WIDTH / 2, MAINSCREEN_HEIGHT / 2)
#define circleAnimaitionTime 2 #define circleAnimaitionTime 2
#define fromRadius sqrtf((centerPoint.x * centerPoint.x) + (centerPoint.y * centerPoint.y)) #define fromRadius sqrtf((centerPoint.x * centerPoint.x) + (centerPoint.y * centerPoint.y))
...@@ -261,12 +261,11 @@ ...@@ -261,12 +261,11 @@
[self cancelDispatch]; [self cancelDispatch];
} else { } else {
__weak __typeof(self)weakSelf = self; __weak __typeof(self)weakSelf = self;
UIAlertController *alert = [UIAlertController alert:@"正在为您全力匹配医生、面诊师 真的不再等一等了么？" leftTitle:@"残忍离开" rightTitle:@"取消" leftAlterAction:^{ [UIAlertController gm_Alert:@"正在为您全力匹配医生、面诊师 真的不再等一等了么？" leftTitle:@"残忍离开" rightTitle:@"取消" leftAlterAction:^{
[weakSelf waitViewHide]; [weakSelf waitViewHide];
} rightAlertAction:^{ } rightAlertAction:^{
}]; }];
[[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:nil];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment