Commit dabdfbed authored by jz's avatar jz

update

parent 9e91ae10
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "GMBase/GMBase_Example-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "GMBase/GMBase_Example-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$GMBase-Swift.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "$GMBase-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2; SWIFT_VERSION = 4.0;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Debug; name = Debug;
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "GMBase/GMBase_Example-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "GMBase/GMBase_Example-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$GMBase-Swift.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "$GMBase-Swift.h";
SWIFT_VERSION = 4.2; SWIFT_VERSION = 4.0;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
}; };
name = Release; name = Release;
......
...@@ -8,7 +8,7 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git' ...@@ -8,7 +8,7 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git'
target 'GMBase_Example' do target 'GMBase_Example' do
pod 'GMBase', :path => '../' pod 'GMBase', :path => '../'
pod 'SnapKit', '4.2.0' pod 'SnapKit', '4.0.0'
pod 'GMShareSDK', '0.2.1' pod 'GMShareSDK', '0.2.1'
pod 'GMBaseSwift', :path => '../../GMBaseSwift' pod 'GMBaseSwift', :path => '../../GMBaseSwift'
......
...@@ -43,7 +43,7 @@ PODS: ...@@ -43,7 +43,7 @@ PODS:
- GMNetworking - GMNetworking
- GMPhobos - GMPhobos
- GMRefresh - GMRefresh
- SnapKit (= 4.2.0) - SnapKit (= 4.0.0)
- GMCache (1.0.1): - GMCache (1.0.1):
- TMCache (= 2.1.0) - TMCache (= 2.1.0)
- GMFoundation (1.0.8) - GMFoundation (1.0.8)
...@@ -122,7 +122,7 @@ PODS: ...@@ -122,7 +122,7 @@ PODS:
- SDWebImage (5.8.0): - SDWebImage (5.8.0):
- SDWebImage/Core (= 5.8.0) - SDWebImage/Core (= 5.8.0)
- SDWebImage/Core (5.8.0) - SDWebImage/Core (5.8.0)
- 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)
...@@ -133,7 +133,7 @@ DEPENDENCIES: ...@@ -133,7 +133,7 @@ DEPENDENCIES:
- GMBaseSwift (from `../../GMBaseSwift`) - GMBaseSwift (from `../../GMBaseSwift`)
- "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `7e58199898627699373ad6a9f87b875ab04b0927`)" - "GMPhobos (from `git@git.wanmeizhensuo.com:gengmeiios/GMPhobos.git`, commit `7e58199898627699373ad6a9f87b875ab04b0927`)"
- GMShareSDK (= 0.2.1) - GMShareSDK (= 0.2.1)
- SnapKit (= 4.2.0) - SnapKit (= 4.0.0)
SPEC REPOS: SPEC REPOS:
"git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git": "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
...@@ -186,8 +186,8 @@ SPEC CHECKSUMS: ...@@ -186,8 +186,8 @@ SPEC CHECKSUMS:
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728 EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595 GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b GMBase: d12a1ea6d5851d397d7908295160a3830c33c25b
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5 GMBaseSwift: fb846fbbfd7c6fb82af2909b0d730edfdc572ba6
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c GMHud: 18d41f4900a204f27be14e9504fcee2060ae3b2c
...@@ -204,12 +204,12 @@ SPEC CHECKSUMS: ...@@ -204,12 +204,12 @@ SPEC CHECKSUMS:
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545 MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6 MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a SnapKit: a42d492c16e80209130a3379f73596c3454b7694
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
"UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030 "UITableView+FDTemplateLayoutCell": 234e1582bcc4e18461af91155123bb96538ed030
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
PODFILE CHECKSUM: db60bbf458f56874386142fa246e256c5fa92944 PODFILE CHECKSUM: e95d6f8605334b66e3f2179ba01177c3fbae6cec
COCOAPODS: 1.9.1 COCOAPODS: 1.9.1
...@@ -18,15 +18,10 @@ Pod::Spec.new do |s| ...@@ -18,15 +18,10 @@ Pod::Spec.new do |s|
s.dependency 'GMHud' s.dependency 'GMHud'
s.dependency 'GMKit' s.dependency 'GMKit'
s.dependency 'SDWebImage' s.dependency 'SDWebImage'
# s.dependency 'SnapKit', '4.0.0'
s.dependency 'GMShareSDK' s.dependency 'GMShareSDK'
s.dependency 'GMNetworking' s.dependency 'GMNetworking'
# s.dependency 'PLMediaStreamingKit'
# s.dependency 'PLPlayerKit'
# s.dependency 'GMAlbum'
# SnapKit 4.2.0
# s.dependency 'SnapKit', '4.2.0'
s.dependency 'GMBaseSwift' s.dependency 'GMBaseSwift'
s.swift_version = '4.2'
s.swift_version = '4.0'
s.static_framework = true s.static_framework = true
end end
...@@ -115,9 +115,9 @@ public class GMCalendarEventManager: NSObject { ...@@ -115,9 +115,9 @@ public class GMCalendarEventManager: NSObject {
alert.addAction(actionA) alert.addAction(actionA)
let actionB = UIAlertAction(title: "去设置", style: .default) { (_) in let actionB = UIAlertAction(title: "去设置", style: .default) { (_) in
if #available(iOS 10.0, *) { if #available(iOS 10.0, *) {
UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil) UIApplication.shared.open(URL(string: UIApplicationOpenSettingsURLString)!, options: [:], completionHandler: nil)
} else { } else {
UIApplication.shared.openURL(URL(string: UIApplication.openSettingsURLString)!) UIApplication.shared.openURL(URL(string: UIApplicationOpenSettingsURLString)!)
} }
} }
alert.addAction(actionB) alert.addAction(actionB)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// Copyright © 2016年 更美互动信息科技有限公司. All rights reserved. // Copyright © 2016年 更美互动信息科技有限公司. All rights reserved.
// //
@import GMKit; #import <GMKit/WYSegmentView.h>
/** /**
带小红点的segmentView 带小红点的segmentView
*/ */
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
// //
#import "GMSegmentViewWithRedBadge.h" #import "GMSegmentViewWithRedBadge.h"
#import <GMKit/GMFont.h>
#import <GMKit/UIColor+GMTheme.h>
#import <GMKit/UIView+Layout.h>
#import <GMKit/Constant.h>
@implementation GMSegmentViewWithRedBadge { @implementation GMSegmentViewWithRedBadge {
NSArray<UIImageView *> *_badgeViews; NSArray<UIImageView *> *_badgeViews;
......
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