Commit 5f34f981 authored by jz's avatar jz

update module

parent ac965c1c
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
04EB3BC2238FE9C40007CB4A /* GMTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04EB3BC1238FE9C40007CB4A /* GMTestViewController.m */; };
102638280A9EBC48C11CA68C /* Pods_GMRouter_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68E3E2FC8A6762195785F5C1 /* Pods_GMRouter_Tests.framework */; }; 102638280A9EBC48C11CA68C /* Pods_GMRouter_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68E3E2FC8A6762195785F5C1 /* Pods_GMRouter_Tests.framework */; };
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
...@@ -37,8 +38,10 @@ ...@@ -37,8 +38,10 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
0CE176D5199DE2FD76A0CDAE /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; }; 04EB3BC0238FE9C40007CB4A /* GMTestViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GMTestViewController.h; sourceTree = "<group>"; };
1CF696923FC0730E5FE7FD62 /* GMRouter.podspec */ = {isa = PBXFileReference; includeInIndex = 1; name = GMRouter.podspec; path = ../GMRouter.podspec; sourceTree = "<group>"; }; 04EB3BC1238FE9C40007CB4A /* GMTestViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GMTestViewController.m; sourceTree = "<group>"; };
0CE176D5199DE2FD76A0CDAE /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
1CF696923FC0730E5FE7FD62 /* GMRouter.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GMRouter.podspec; path = ../GMRouter.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
223EBBCDA6F6B0AD76422406 /* Pods-GMRouter_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMRouter_Example.debug.xcconfig"; path = "Target Support Files/Pods-GMRouter_Example/Pods-GMRouter_Example.debug.xcconfig"; sourceTree = "<group>"; }; 223EBBCDA6F6B0AD76422406 /* Pods-GMRouter_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMRouter_Example.debug.xcconfig"; path = "Target Support Files/Pods-GMRouter_Example/Pods-GMRouter_Example.debug.xcconfig"; sourceTree = "<group>"; };
4379E9AD17C4F11ACFBA5F58 /* Pods_GMRouter_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRouter_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4379E9AD17C4F11ACFBA5F58 /* Pods_GMRouter_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRouter_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6003F58A195388D20070C39A /* GMRouter_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GMRouter_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58A195388D20070C39A /* GMRouter_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GMRouter_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -60,7 +63,7 @@ ...@@ -60,7 +63,7 @@
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; }; 6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; }; 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
6269A92F618AC96284544A67 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; name = README.md; path = ../README.md; sourceTree = "<group>"; }; 6269A92F618AC96284544A67 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
68E3E2FC8A6762195785F5C1 /* Pods_GMRouter_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRouter_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 68E3E2FC8A6762195785F5C1 /* Pods_GMRouter_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GMRouter_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
...@@ -103,7 +106,6 @@ ...@@ -103,7 +106,6 @@
FF3B36A744211B01E8B4A0DD /* Pods-GMRouter_Tests.debug.xcconfig */, FF3B36A744211B01E8B4A0DD /* Pods-GMRouter_Tests.debug.xcconfig */,
AD5565AAC73B66075675ED03 /* Pods-GMRouter_Tests.release.xcconfig */, AD5565AAC73B66075675ED03 /* Pods-GMRouter_Tests.release.xcconfig */,
); );
name = Pods;
path = Pods; path = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
...@@ -149,6 +151,8 @@ ...@@ -149,6 +151,8 @@
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */, 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */,
6003F5A5195388D20070C39A /* GMViewController.h */, 6003F5A5195388D20070C39A /* GMViewController.h */,
6003F5A6195388D20070C39A /* GMViewController.m */, 6003F5A6195388D20070C39A /* GMViewController.m */,
04EB3BC0238FE9C40007CB4A /* GMTestViewController.h */,
04EB3BC1238FE9C40007CB4A /* GMTestViewController.m */,
71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */, 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */,
6003F5A8195388D20070C39A /* Images.xcassets */, 6003F5A8195388D20070C39A /* Images.xcassets */,
6003F594195388D20070C39A /* Supporting Files */, 6003F594195388D20070C39A /* Supporting Files */,
...@@ -255,7 +259,7 @@ ...@@ -255,7 +259,7 @@
}; };
buildConfigurationList = 6003F585195388D10070C39A /* Build configuration list for PBXProject "GMRouter" */; buildConfigurationList = 6003F585195388D10070C39A /* Build configuration list for PBXProject "GMRouter" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = en;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
en, en,
...@@ -364,6 +368,7 @@ ...@@ -364,6 +368,7 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
04EB3BC2238FE9C40007CB4A /* GMTestViewController.m in Sources */,
6003F59E195388D20070C39A /* GMAppDelegate.m in Sources */, 6003F59E195388D20070C39A /* GMAppDelegate.m in Sources */,
6003F5A7195388D20070C39A /* GMViewController.m in Sources */, 6003F5A7195388D20070C39A /* GMViewController.m in Sources */,
6003F59A195388D20070C39A /* main.m in Sources */, 6003F59A195388D20070C39A /* main.m in Sources */,
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="u7L-eo-lZa">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait" appearance="light"/>
<adaptation id="fullscreen"/>
</device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<scenes> <scenes>
...@@ -22,10 +20,27 @@ ...@@ -22,10 +20,27 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view> </view>
<navigationItem key="navigationItem" id="p8W-46-Cyu"/>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="305" y="433"/> <point key="canvasLocation" x="708" y="431"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="qRv-n3-5Rw">
<objects>
<navigationController id="u7L-eo-lZa" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="YtA-dW-IL4">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="whP-gf-Uak" kind="relationship" relationship="rootViewController" id="6WD-Sx-WDw"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="QVQ-VH-Kf2" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-124" y="447"/>
</scene> </scene>
</scenes> </scenes>
</document> </document>
//
// GMTestViewController.h
// GMRouter_Example
//
// Created by Q14 on 2019/11/28.
// Copyright © 2019 jz. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface GMTestViewController : UIViewController
@end
NS_ASSUME_NONNULL_END
//
// GMTestViewController.m
// GMRouter_Example
//
// Created by Q14 on 2019/11/28.
// Copyright © 2019 jz. All rights reserved.
//
#import "GMTestViewController.h"
@interface GMTestViewController ()
@end
@implementation GMTestViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
// //
#import "GMViewController.h" #import "GMViewController.h"
#import <GMRouter/GMRouter-umbrella.h>
//@import GMRouter;
@interface GMViewController () @interface GMViewController ()
@end @end
...@@ -18,6 +20,19 @@ ...@@ -18,6 +20,19 @@
{ {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view, typically from a nib. // Do any additional setup after loading the view, typically from a nib.
UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
[btn setBackgroundColor:UIColor.redColor];
[btn addTarget:self action:@selector(clickBtn) forControlEvents:UIControlEventTouchUpInside];
btn.frame = CGRectMake(0, 100, 100, 30);
[self.view addSubview:btn];
}
- (void)clickBtn {
// Target_commons *target = [[Target_commons alloc] init];
// [target push_CommonViewController:@"GMTestViewController" params:@{}];
UIViewController *vc = [[GMRouter sharedInstance] performAction:@"GMTestViewController" params:@{} shouldCacheTarget:YES];
[self.navigationController pushViewController:vc animated:YES];
} }
- (void)didReceiveMemoryWarning - (void)didReceiveMemoryWarning
......
...@@ -9,7 +9,7 @@ EXTERNAL SOURCES: ...@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../" :path: "../"
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMRouter: 1c8c83b6c5042a0cbffab748e794a87ba636abe6 GMRouter: 649720313dfcbadcc7cdbd8834896da8f59a7f96
PODFILE CHECKSUM: bcbc555b81a3b21a917383786de0d49ebef33013 PODFILE CHECKSUM: bcbc555b81a3b21a917383786de0d49ebef33013
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"summary": "A short description of GMRouter.", "summary": "A short description of GMRouter.",
"description": "TODO: Add long description of the pod here.", "description": "TODO: Add long description of the pod here.",
"homepage": "https://github.com/jz/GMRouter", "homepage": "http://git.wanmeizhensuo.com/gengmeiios/GMRouter.git",
"license": { "license": {
"type": "MIT", "type": "MIT",
"file": "LICENSE" "file": "LICENSE"
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"jz": "qiaojinzhu@igengmei.com" "jz": "qiaojinzhu@igengmei.com"
}, },
"source": { "source": {
"git": "https://github.com/jz/GMRouter.git", "git": "git@git.wanmeizhensuo.com:gengmeiios/GMRouter.git",
"tag": "0.1.0" "tag": "0.1.0"
}, },
"platforms": { "platforms": {
......
...@@ -9,7 +9,7 @@ EXTERNAL SOURCES: ...@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../" :path: "../"
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMRouter: 1c8c83b6c5042a0cbffab748e794a87ba636abe6 GMRouter: 649720313dfcbadcc7cdbd8834896da8f59a7f96
PODFILE CHECKSUM: bcbc555b81a3b21a917383786de0d49ebef33013 PODFILE CHECKSUM: bcbc555b81a3b21a917383786de0d49ebef33013
......
This diff is collapsed.
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
#endif #endif
#endif #endif
#import "GMRouter+gm.h"
#import "GMRouter.h"
#import "Target_commons.h"
#import "UIViewController+Router.h"
FOUNDATION_EXPORT double GMRouterVersionNumber; FOUNDATION_EXPORT double GMRouterVersionNumber;
FOUNDATION_EXPORT const unsigned char GMRouterVersionString[]; FOUNDATION_EXPORT const unsigned char GMRouterVersionString[];
......
...@@ -21,7 +21,7 @@ Pod::Spec.new do |s| ...@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
TODO: Add long description of the pod here. TODO: Add long description of the pod here.
DESC DESC
s.homepage = 'http://git.wanmeizhensuo.com/gengmeiios/gengmeiios.git' s.homepage = 'http://git.wanmeizhensuo.com/gengmeiios/GMRouter.git'
# s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
s.license = { :type => 'MIT', :file => 'LICENSE' } s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'jz' => 'qiaojinzhu@igengmei.com' } s.author = { 'jz' => 'qiaojinzhu@igengmei.com' }
......
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