Skip to content

G
GMAILab
Commit 94b6f4ff authored by jz's avatar jz
Browse files
Options

update

parent 33df8a1e
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 57 deletions
Example/Podfile
View file @ 94b6f4ff
...@@ -11,12 +11,12 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git' ...@@ -11,12 +11,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 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => 'f3b40c7'
pod 'GMPhobos', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git', :commit => 'ed24e93' pod 'GMPhobos', '2.0.7'
# pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677' # pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => '0752677'
#9e91ae1 #9e91ae1
pod 'GMBase', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBase.git', :commit => '9e91ae1' pod 'GMBase', '1.1.7'
pod 'GMBaseSwift', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git', :commit => 'b54da90' pod 'GMBaseSwift', '3.4.2'
pod 'GMAlbum', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git', :commit => '31dcd07' pod 'GMAlbum', '4.1.6'
pod 'Qiniu', '7.2.6' pod 'Qiniu', '7.2.6'
# pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => 'c3ca876' # pod 'GMBaseWeb', :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMBaseWeb.git', :commit => 'c3ca876'
......
Example/Podfile.lock
View file @ 94b6f4ff
...@@ -42,12 +42,13 @@ PODS: ...@@ -42,12 +42,13 @@ PODS:
- PLPlayerKit - PLPlayerKit
- Qiniu - Qiniu
- YYText - YYText
- GMAlbum (4.1.3): - GMAlbum (4.1.6):
- GMBase - GMBase
- GMKit - GMKit
- GPUImage (= 0.1.7) - GPUImage (= 0.1.7)
- GMBase (1.1.5): - GMBase (1.1.7):
- GMBaseSwift - GMBaseSwift
- GMFoundation
- GMHud - GMHud
- GMJSONModel - GMJSONModel
- GMKit - GMKit
...@@ -55,11 +56,10 @@ PODS: ...@@ -55,11 +56,10 @@ PODS:
- GMNetworking - GMNetworking
- GMPhobos - GMPhobos
- GMRefresh - GMRefresh
- GMShareSDK
- MBProgressHUD - MBProgressHUD
- SDWebImage - SDWebImage
- "UITableView+FDTemplateLayoutCell (= 1.4)" - "UITableView+FDTemplateLayoutCell (= 1.4)"
- GMBaseSwift (3.4.1): - GMBaseSwift (3.4.2):
- EVReflection (= 5.10.0) - EVReflection (= 5.10.0)
- GM-Swift-Observable - GM-Swift-Observable
- GMHud - GMHud
...@@ -67,7 +67,7 @@ PODS: ...@@ -67,7 +67,7 @@ PODS:
- GMNetworking - GMNetworking
- GMPhobos - GMPhobos
- GMRefresh - GMRefresh
- SnapKit (= 4.2.0) - SnapKit (= 4.0.0)
- GMBaseWeb (0.0.2): - GMBaseWeb (0.0.2):
- GMAlbum - GMAlbum
- GMBase - GMBase
...@@ -132,7 +132,7 @@ PODS: ...@@ -132,7 +132,7 @@ PODS:
- AFNetworking (= 3.1.0) - AFNetworking (= 3.1.0)
- GMNetworking (4.0.7): - GMNetworking (4.0.7):
- Alamofire (= 4.7.0) - Alamofire (= 4.7.0)
- GMPhobos (2.0.5): - GMPhobos (2.0.7):
- GMCache - GMCache
- MagicalRecord - MagicalRecord
- MJExtension - MJExtension
...@@ -142,7 +142,7 @@ PODS: ...@@ -142,7 +142,7 @@ PODS:
- GMRouter (0.1.7): - GMRouter (0.1.7):
- GMPhobos - GMPhobos
- MJExtension - MJExtension
- GMShareSDK (0.2.1): - GMShareSDK (0.2.2):
- DouyinOpenSDK (= 1.4.1) - DouyinOpenSDK (= 1.4.1)
- GMFoundation - GMFoundation
- GMJSONModel - GMJSONModel
...@@ -170,10 +170,10 @@ PODS: ...@@ -170,10 +170,10 @@ 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.0): - SDWebImage (5.8.1):
- SDWebImage/Core (= 5.8.0) - SDWebImage/Core (= 5.8.1)
- SDWebImage/Core (5.8.0) - SDWebImage/Core (5.8.1)
- SnapKit (4.2.0) - SnapKit (4.0.0)
- TMCache (2.1.0) - TMCache (2.1.0)
- "UITableView+FDTemplateLayoutCell (1.4)" - "UITableView+FDTemplateLayoutCell (1.4)"
- WechatOpenSDK (1.8.6.2) - WechatOpenSDK (1.8.6.2)
...@@ -182,15 +182,18 @@ PODS: ...@@ -182,15 +182,18 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- GMAILab (from `../`) - GMAILab (from `../`)
- "GMAlbum (from `git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git`, commit `31dcd07`)" - GMAlbum (= 4.1.6)
- "GMBase (from `git@git.wanmeizhensuo.com:gengmeiios/GMBase.git`, commit `9e91ae1`)" - GMBase (= 1.1.7)
- "GMBaseSwift (from `git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git`, commit `b54da90`)" - GMBaseSwift (= 3.4.2)
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `ed24e93`)" - GMPhobos (= 2.0.7)
- Qiniu (= 7.2.6) - Qiniu (= 7.2.6)
SPEC REPOS: SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
- GM-Swift-Observable - GM-Swift-Observable
- GMAlbum
- GMBase
- GMBaseSwift
- GMBaseWeb - GMBaseWeb
- GMCache - GMCache
- GMFoundation - GMFoundation
...@@ -199,6 +202,7 @@ SPEC REPOS: ...@@ -199,6 +202,7 @@ SPEC REPOS:
- GMKit - GMKit
- GMNetService - GMNetService
- GMNetworking - GMNetworking
- GMPhobos
- GMRefresh - GMRefresh
- GMRouter - GMRouter
- GMShareSDK - GMShareSDK
...@@ -232,32 +236,6 @@ SPEC REPOS: ...@@ -232,32 +236,6 @@ SPEC REPOS:
EXTERNAL SOURCES: EXTERNAL SOURCES:
GMAILab: GMAILab:
:path: "../" :path: "../"
GMAlbum:
:commit: 31dcd07
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMAlbum.git"
GMBase:
:commit: 9e91ae1
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBase.git"
GMBaseSwift:
:commit: b54da90
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.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"
GMBaseSwift:
:commit: b54da90
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMBaseSwift.git"
GMPhobos:
:commit: ed24e93
:git: "git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git"
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
...@@ -268,9 +246,9 @@ SPEC CHECKSUMS: ...@@ -268,9 +246,9 @@ SPEC CHECKSUMS:
EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728 EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595 GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMAILab: 4463b0965e77c547ecd4c998efd2478e0b51dd88 GMAILab: 4463b0965e77c547ecd4c998efd2478e0b51dd88
GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192 GMAlbum: f1073eaa4ec518316d7da2098806df473942ebe0
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b GMBase: 2b21497f52e691e0a2ba47fc883f1334fa7f2cbf
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5 GMBaseSwift: 82915eb16c9505ff19f66c85a2bbf5f7f50756f2
GMBaseWeb: d3c49a18ac9a51d424814d22152df52a62073b42 GMBaseWeb: d3c49a18ac9a51d424814d22152df52a62073b42
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
...@@ -279,10 +257,10 @@ SPEC CHECKSUMS: ...@@ -279,10 +257,10 @@ SPEC CHECKSUMS:
GMKit: 410f4a2da98698ffe2e1e97043ea8f97ab8adb17 GMKit: 410f4a2da98698ffe2e1e97043ea8f97ab8adb17
GMNetService: 7c69e7981b4fac29657fad5fc86a0c453196b862 GMNetService: 7c69e7981b4fac29657fad5fc86a0c453196b862
GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2 GMNetworking: 592b9b71f2a7d92203483276158ce3139ac789d2
GMPhobos: abab7c666c8a75549adea937e40e101d4d341b0d GMPhobos: ae8ecc3c1fc4e94e0fa4fd093da46e4f6bce580e
GMRefresh: 11497a660eb14b1fda443bfe682910e0cc6031f4 GMRefresh: 11497a660eb14b1fda443bfe682910e0cc6031f4
GMRouter: 6f2c630e6d9f03d117ac39e5cdb1b522acf6ad65 GMRouter: 6f2c630e6d9f03d117ac39e5cdb1b522acf6ad65
GMShareSDK: a0725e2848d043aec84e787f6d233ac1546c1661 GMShareSDK: 5a0fc06881021f0055841675bf748c01143acc2d
GMUtil: 194a8831e4311762c4b1ac1278281b456157f4ec GMUtil: 194a8831e4311762c4b1ac1278281b456157f4ec
GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
...@@ -295,14 +273,14 @@ SPEC CHECKSUMS: ...@@ -295,14 +273,14 @@ SPEC CHECKSUMS:
PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0 PLMediaStreamingKit: 3f4fafe3535de54a02c219f40331afa2b47592e0
PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06 PLPlayerKit: a44734dc78c1f8f9fb22c537fa1916612fa46b06
Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e Qiniu: 9d1f20dcc348919972b4ee1b1272f9b9d4a7e69e
SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc SDWebImage: e3eae2eda88578db0685a0c88597fdadd9433f05
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a SnapKit: a42d492c16e80209130a3379f73596c3454b7694
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
"UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030 "UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849 YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
PODFILE CHECKSUM: c0c9cd00be75867d07d91da14338db9aaaded856 PODFILE CHECKSUM: c85b45131163a07565d21eb2daf37ca0f951d9c6
COCOAPODS: 1.9.3 COCOAPODS: 1.9.3
GMAILab/Classes/ToFace/ToFaceOrder/ViewController/GMTofaceOrderDetailViewController.h
View file @ 94b6f4ff
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMWebViewController.h" //#import "GMWebViewController.h"
#import <GMBaseWeb/GMWebViewController.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface GMTofaceOrderDetailViewController : GMWebViewController @interface GMTofaceOrderDetailViewController : GMWebViewController
......
GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportListController.h
View file @ 94b6f4ff
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMWebViewController.h" #import <GMBaseWeb/GMWebViewController.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
GMAILab/Classes/ToFace/WorkingTable/ViewController/GMBusinessReportResultController.h
View file @ 94b6f4ff
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMWebViewController.h" #import <GMBaseWeb/GMWebViewController.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
GMAILab/Classes/ToFace/diagnoseRecord/GMDiagnoseRecordWebViewController.h
View file @ 94b6f4ff
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// Copyright © 2020 更美互动信息科技有限公司. All rights reserved. // Copyright © 2020 更美互动信息科技有限公司. All rights reserved.
// //
#import "GMWebViewController.h" #import <GMBaseWeb/GMWebViewController.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
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