Merge branch 'develop'

# Conflicts: # Example/GMAILab.xcworkspace/xcuserdata/dzc.xcuserdatad/UserInterfaceState.xcuserstate # Example/Pods/.DS_Store

Merge branch 'develop'
# Conflicts: # Example/GMAILab.xcworkspace/xcuserdata/dzc.xcuserdatad/UserInterfaceState.xcuserstate # Example/Pods/.DS_Store
5034621c · 曹逢阳 · b79548c2 · 2dc97e45 · 5034621c · 5034621c
Commit 5034621c authored Apr 30, 2020 by 曹逢阳
15 changed files
--- a/Example/GMAILab.xcworkspace/xcuserdata/dzc.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/Example/GMAILab.xcworkspace/xcuserdata/dzc.xcuserdatad/UserInterfaceState.xcuserstate
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -14,18 +14,20 @@ PODS:
  - AFNetworking/Serialization (3.1.0)
  - AFNetworking/UIKit (3.1.0):
    - AFNetworking/NSURLSession
-  - GMAILab (0.1.0):
-    - GMAILab/Controller (= 0.1.0)
-    - GMAILab/Model (= 0.1.0)
-    - GMAILab/View (= 0.1.0)
-    - GMAILab/ViewModel (= 0.1.0)
+  - GMAILab (1.0.0):
+    - GMAILab/Controller (= 1.0.0)
+    - GMAILab/Model (= 1.0.0)
+    - GMAILab/Utils (= 1.0.0)
+    - GMAILab/View (= 1.0.0)
+    - GMAILab/ViewModel (= 1.0.0)
    - GMBase
    - GMediator
    - GMFoundation
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/Controller (0.1.0):
+  - GMAILab/Controller (1.0.0):
+    - GMAILab/Utils
    - GMAILab/View
    - GMAILab/ViewModel
    - GMBase
@@ -34,14 +36,21 @@ PODS:
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/Model (0.1.0):
+  - GMAILab/Model (1.0.0):
    - GMBase
    - GMediator
    - GMFoundation
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/View (0.1.0):
+  - GMAILab/Utils (1.0.0):
+    - GMBase
+    - GMediator
+    - GMFoundation
+    - GMKit
+    - GMNetService
+    - GMRefresh
+  - GMAILab/View (1.0.0):
    - GMAILab/ViewModel
    - GMBase
    - GMediator
@@ -49,7 +58,7 @@ PODS:
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/ViewModel (0.1.0):
+  - GMAILab/ViewModel (1.0.0):
    - GMBase
    - GMediator
    - GMFoundation
@@ -170,7 +179,7 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  GMAILab: 5f37a3b13279d2a0bb432633db95b1bf936969d6
+  GMAILab: 35f544e87ecde9ce08be2609e4f4fa0be405a8b5
  GMBase: 2b77f591a35a589ed331c490af093b68b0fc73be
  GMCache: b78d8e46db864405e91d226ce640cc80d966c611
  GMediator: 0b222275ef14deaf72eca107e76e048b67172c2c

--- a/Example/Pods/.DS_Store
+++ b/Example/Pods/.DS_Store
--- a/Example/Pods/Local Podspecs/GMAILab.podspec.json
+++ b/Example/Pods/Local Podspecs/GMAILab.podspec.json
 {
  "name": "GMAILab",
-  "version": "0.1.0",
+  "version": "1.0.0",
  "summary": "A short description of GMAILab.",
  "description": "TODO: Add long description of the pod here.",
-  "homepage": "https://github.com/Q14/GMAILab",
+  "homepage": "http://git.wanmeizhensuo.com/gengmeiios/GMAILab",
  "license": {
    "type": "MIT",
    "file": "LICENSE"
@@ -12,8 +12,8 @@
    "Q14": "qiaojinzhu@igengmei.com"
  },
  "source": {
-    "git": "https://github.com/Q14/GMAILab.git",
-    "tag": "0.1.0"
+    "git": "http://git.wanmeizhensuo.com/gengmeiios/GMAILab.git",
+    "tag": "1.0.0"
  },
  "platforms": {
    "ios": "9.0"
@@ -49,6 +49,10 @@
      "name": "Model",
      "source_files": "GMAILab/Classes/Model/*.{h,m}"
    },
+    {
+      "name": "Utils",
+      "source_files": "GMAILab/Classes/Utils/*.{h,m}"
+    },
    {
      "name": "ViewModel",
      "source_files": "GMAILab/Classes/ViewModel/*.{h,m}"
@@ -62,6 +66,9 @@
        ],
        "GMAILab/ViewModel": [

+        ],
+        "GMAILab/Utils": [
+
        ]
      }
    },

--- a/Example/Pods/Manifest.lock
+++ b/Example/Pods/Manifest.lock
@@ -14,18 +14,20 @@ PODS:
  - AFNetworking/Serialization (3.1.0)
  - AFNetworking/UIKit (3.1.0):
    - AFNetworking/NSURLSession
-  - GMAILab (0.1.0):
-    - GMAILab/Controller (= 0.1.0)
-    - GMAILab/Model (= 0.1.0)
-    - GMAILab/View (= 0.1.0)
-    - GMAILab/ViewModel (= 0.1.0)
+  - GMAILab (1.0.0):
+    - GMAILab/Controller (= 1.0.0)
+    - GMAILab/Model (= 1.0.0)
+    - GMAILab/Utils (= 1.0.0)
+    - GMAILab/View (= 1.0.0)
+    - GMAILab/ViewModel (= 1.0.0)
    - GMBase
    - GMediator
    - GMFoundation
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/Controller (0.1.0):
+  - GMAILab/Controller (1.0.0):
+    - GMAILab/Utils
    - GMAILab/View
    - GMAILab/ViewModel
    - GMBase
@@ -34,14 +36,21 @@ PODS:
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/Model (0.1.0):
+  - GMAILab/Model (1.0.0):
    - GMBase
    - GMediator
    - GMFoundation
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/View (0.1.0):
+  - GMAILab/Utils (1.0.0):
+    - GMBase
+    - GMediator
+    - GMFoundation
+    - GMKit
+    - GMNetService
+    - GMRefresh
+  - GMAILab/View (1.0.0):
    - GMAILab/ViewModel
    - GMBase
    - GMediator
@@ -49,7 +58,7 @@ PODS:
    - GMKit
    - GMNetService
    - GMRefresh
-  - GMAILab/ViewModel (0.1.0):
+  - GMAILab/ViewModel (1.0.0):
    - GMBase
    - GMediator
    - GMFoundation
@@ -170,7 +179,7 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  GMAILab: 5f37a3b13279d2a0bb432633db95b1bf936969d6
+  GMAILab: 35f544e87ecde9ce08be2609e4f4fa0be405a8b5
  GMBase: 2b77f591a35a589ed331c490af093b68b0fc73be
  GMCache: b78d8e46db864405e91d226ce640cc80d966c611
  GMediator: 0b222275ef14deaf72eca107e76e048b67172c2c

--- a/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Example/Pods/Pods.xcodeproj/project.pbxproj
--- a/Example/Pods/Target Support Files/GMAILab/GMAILab-Info.plist
+++ b/Example/Pods/Target Support Files/GMAILab/GMAILab-Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
-  <string>0.1.0</string>
+  <string>1.0.0</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

--- a/Example/Pods/Target Support Files/GMAILab/GMAILab-umbrella.h
+++ b/Example/Pods/Target Support Files/GMAILab/GMAILab-umbrella.h
@@ -10,8 +10,9 @@
 #endif
 #endif

-#import "NSBundle+GMAILab.h"
 #import "GMAIChannelViewController.h"
+#import "GMAICardModel.h"
+#import "NSBundle+GMAILab.h"
 #import "GMAICardCollectionCell.h"
 #import "GMVerticalFlowLayout.h"
 #import "GMAIChannelViewModel.h"

--- a/Example/Pods/Target Support Files/GMAILab/ResourceBundle-GMAILab-GMAILab-Info.plist
+++ b/Example/Pods/Target Support Files/GMAILab/ResourceBundle-GMAILab-GMAILab-Info.plist
@@ -13,7 +13,7 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
-  <string>0.1.0</string>
+  <string>1.0.0</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

--- a/GMAILab.podspec
+++ b/GMAILab.podspec
@@ -21,11 +21,11 @@ Pod::Spec.new do |s|
 TODO: Add long description of the pod here.
                       DESC

-  s.homepage         = 'https://github.com/Q14/GMAILab'
+  s.homepage         = 'http://git.wanmeizhensuo.com/gengmeiios/GMAILab'
  # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
  s.license          = { :type => 'MIT', :file => 'LICENSE' }
  s.author           = { 'Q14' => 'qiaojinzhu@igengmei.com' }
-  s.source           = { :git => 'https://github.com/Q14/GMAILab.git', :tag => s.version.to_s }
+  s.source           = { :git => 'http://git.wanmeizhensuo.com/gengmeiios/GMAILab.git', :tag => s.version.to_s }
  # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'

  s.ios.deployment_target = '9.0'
@@ -36,6 +36,10 @@ TODO: Add long description of the pod here.
    ss.source_files = 'GMAILab/Classes/Model/*.{h,m}'
  end
  
+  s.subspec 'Utils' do |ss|
+    ss.source_files = 'GMAILab/Classes/Utils/*.{h,m}'
+  end
+
  s.subspec 'ViewModel' do |ss|
    ss.source_files = 'GMAILab/Classes/ViewModel/*.{h,m}'
  end
@@ -44,6 +48,7 @@ TODO: Add long description of the pod here.
    ss.source_files = 'GMAILab/Classes/Controller/*.{h,m}'
    ss.dependency 'GMAILab/View'
    ss.dependency 'GMAILab/ViewModel'
+    ss.dependency 'GMAILab/Utils'
  end
  
  s.subspec 'View' do |ss|

--- a/GMAILab/Classes/.DS_Store
+++ b/GMAILab/Classes/.DS_Store
--- a/GMAILab/Classes/Model/GMAICardModel.h
+++ b/GMAILab/Classes/Model/GMAICardModel.h
+//
+//  GMAICardModel.h
+//  Pods
+//
+//  Created by cfy on 2020/4/30.
+//
+
+#import <GMBase/GMObject.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GMAICardModel : GMObject
+
+@end
+
+NS_ASSUME_NONNULL_END
--- a/GMAILab/Classes/Model/GMAICardModel.m
+++ b/GMAILab/Classes/Model/GMAICardModel.m
+//
+//  GMAICardModel.m
+//  Pods
+//
+//  Created by cfy on 2020/4/30.
+//
+
+#import "GMAICardModel.h"
+
+@implementation GMAICardModel
+
+@end
--- a/GMAILab/Classes/NSBundle+GMAILab.h
+++ b/GMAILab/Classes/NSBundle+GMAILab.h
--- a/GMAILab/Classes/NSBundle+GMAILab.m
+++ b/GMAILab/Classes/NSBundle+GMAILab.m