Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history 
.a —> framework
  • Loading branch information
@jinht
jinht committed Sep 28, 2017
1 parent 6a1082c commit ceeebac
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 199 deletions.
0 ...quee/JhtMarqueeSDK/JhtHorizontalMarquee.h → ....framework/Headers/JhtHorizontalMarquee.h
View file
File renamed without changes.
0 ...arquee/JhtMarqueeSDK/JhtVerticalMarquee.h → ...ee.framework/Headers/JhtVerticalMarquee.h
View file
File renamed without changes.
Binary file added JhtMarquee.framework/Info.plist
View file
Binary file not shown.
Binary file added JhtMarquee.framework/JhtMarquee
View file
Binary file not shown.
64 changes: 36 additions & 28 deletions JhtMarquee.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
78808AE31E6EADB60081C941 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 78808AD61E6EADB60081C941 /* main.m */; };
78808AE41E6EADB60081C941 /* testVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 78808AD91E6EADB60081C941 /* testVC.m */; };
78808AE51E6EADB60081C941 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 78808ADB1E6EADB60081C941 /* ViewController.m */; };
8E3400981ED7D64700ECC223 /* JhtMarqueeSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E3400951ED7D64700ECC223 /* JhtMarqueeSDK.a */; };
A52039D21F7C9E8400272F6F /* JhtMarquee.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A52039591F7BAB0800272F6F /* JhtMarquee.framework */; };
A58F83FA1E1120BE00E30D68 /* JhtMarqueeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A58F83F91E1120BE00E30D68 /* JhtMarqueeTests.m */; };
A58F84051E1120BE00E30D68 /* JhtMarqueeUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = A58F84041E1120BE00E30D68 /* JhtMarqueeUITests.m */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -49,10 +49,7 @@
78808AD91E6EADB60081C941 /* testVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = testVC.m; sourceTree = "<group>"; };
78808ADA1E6EADB60081C941 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
78808ADB1E6EADB60081C941 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
8E3400941ED7D64700ECC223 /* JhtHorizontalMarquee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JhtHorizontalMarquee.h; sourceTree = "<group>"; };
8E3400951ED7D64700ECC223 /* JhtMarqueeSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = JhtMarqueeSDK.a; sourceTree = "<group>"; };
8E3400961ED7D64700ECC223 /* JhtMarqueeSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JhtMarqueeSDK.h; sourceTree = "<group>"; };
8E3400971ED7D64700ECC223 /* JhtVerticalMarquee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JhtVerticalMarquee.h; sourceTree = "<group>"; };
A52039591F7BAB0800272F6F /* JhtMarquee.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JhtMarquee.framework; sourceTree = "<group>"; };
A58F83DC1E1120BE00E30D68 /* JhtMarquee.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JhtMarquee.app; sourceTree = BUILT_PRODUCTS_DIR; };
A58F83F51E1120BE00E30D68 /* JhtMarqueeTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JhtMarqueeTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A58F83F91E1120BE00E30D68 /* JhtMarqueeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JhtMarqueeTests.m; sourceTree = "<group>"; };
Expand All @@ -67,7 +64,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8E3400981ED7D64700ECC223 /* JhtMarqueeSDK.a in Frameworks */,
A52039D21F7C9E8400272F6F /* JhtMarquee.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -96,7 +93,6 @@
78808ADA1E6EADB60081C941 /* ViewController.h */,
78808ADB1E6EADB60081C941 /* ViewController.m */,
78808AD71E6EADB60081C941 /* testVC */,
8E3400931ED7D64700ECC223 /* JhtMarqueeSDK */,
78808AC91E6EADB60081C941 /* Assets.xcassets */,
78808ACA1E6EADB60081C941 /* LaunchScreen.storyboard */,
78808ACC1E6EADB60081C941 /* Main.storyboard */,
Expand All @@ -115,24 +111,15 @@
path = testVC;
sourceTree = "<group>";
};
8E3400931ED7D64700ECC223 /* JhtMarqueeSDK */ = {
isa = PBXGroup;
children = (
8E3400961ED7D64700ECC223 /* JhtMarqueeSDK.h */,
8E3400971ED7D64700ECC223 /* JhtVerticalMarquee.h */,
8E3400941ED7D64700ECC223 /* JhtHorizontalMarquee.h */,
8E3400951ED7D64700ECC223 /* JhtMarqueeSDK.a */,
);
path = JhtMarqueeSDK;
sourceTree = "<group>";
};
A58F83D31E1120BE00E30D68 = {
isa = PBXGroup;
children = (
A52039591F7BAB0800272F6F /* JhtMarquee.framework */,
78808AC61E6EADB60081C941 /* JhtMarquee */,
A58F83F81E1120BE00E30D68 /* JhtMarqueeTests */,
A58F84031E1120BE00E30D68 /* JhtMarqueeUITests */,
A58F83DD1E1120BE00E30D68 /* Products */,
A5A0FE921F7B894900688220 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -164,6 +151,13 @@
path = JhtMarqueeUITests;
sourceTree = "<group>";
};
A5A0FE921F7B894900688220 /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -398,7 +392,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -439,7 +433,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand All @@ -451,13 +445,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = BY48QUJK83;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/JhtMarquee.framework",
"$(PROJECT_DIR)",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/JhtMarquee.framework/Headers",
);
INFOPLIST_FILE = JhtMarquee/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/JhtMarquee/JhtMarqueeSDK",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.jht.JhtMarquee;
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -468,13 +469,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = BY48QUJK83;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/JhtMarquee.framework",
"$(PROJECT_DIR)",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/JhtMarquee.framework/Headers",
);
INFOPLIST_FILE = JhtMarquee/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/JhtMarquee/JhtMarqueeSDK",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.jht.JhtMarquee;
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down
Binary file modified ...e.xcodeproj/project.xcworkspace/xcuserdata/Jht.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
Binary file removed JhtMarquee/JhtMarqueeSDK/JhtMarqueeSDK.a
View file
Binary file not shown.
16 changes: 0 additions & 16 deletions JhtMarquee/JhtMarqueeSDK/JhtMarqueeSDK.h
View file

This file was deleted.

12 changes: 6 additions & 6 deletions JhtMarquee/ViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#import "ViewController.h"
#import "testVC.h"
#import "JhtVerticalMarquee.h"
#import "JhtHorizontalMarquee.h"
#import <JhtMarquee/JhtVerticalMarquee.h>
#import <JhtMarquee/JhtHorizontalMarquee.h>

/** 屏幕的宽度 */
#define FrameW [UIScreen mainScreen].bounds.size.width
Expand Down Expand Up @@ -87,7 +87,7 @@ - (void)createUI {
#pragma mark 水平滚动的跑马灯
/** 添加水平滚动的跑马灯 */
- (void)addHorizontalMarquee {
_horizontalMarquee = [[JhtHorizontalMarquee alloc] initWithFrame:CGRectMake(0, 64, FrameW, 40) withSingleScrollDuration:10.0];
_horizontalMarquee = [[JhtHorizontalMarquee alloc] initWithFrame:CGRectMake(0, 64 + 20, FrameW, 40) withSingleScrollDuration:10.0];
_horizontalMarquee.text = @"这是一个跑马灯View，测试一下好不好用，哈哈哈，😁👌😀 😁👌😀 😁👌😀 😁👌😀 哈哈哈哈！ ";
[self.view addSubview:_horizontalMarquee];

Expand All @@ -97,7 +97,7 @@ - (void)addHorizontalMarquee {
}

- (void)horizontalMarqueeTapGes:(UITapGestureRecognizer *)ges {
NSLog(@"点击__水平__滚动的跑马灯啦啊！！！");
NSLog(@"点击__水平__滚动的跑马灯啦！！！");
[_verticalMarquee marqueeOfSettingWithState:MarqueePause_V];
_isPauseV = YES;

Expand Down Expand Up @@ -137,7 +137,7 @@ - (void)addVerticalMarquee {
// _verticalMarquee.isCounterclockwise = YES;
_verticalMarquee.sourceArray = soureArray;
[_verticalMarquee scrollWithCallbackBlock:^(JhtVerticalMarquee *view, NSInteger currentIndex) {
NSLog(@"滚动到第 %ld 条数据", currentIndex);
NSLog(@"滚动到第 %ld 条数据", (long)currentIndex);
}];

// 开始滚动
Expand All @@ -149,7 +149,7 @@ - (void)addVerticalMarquee {
}

- (void)verticalMarqueeTapGes:(UITapGestureRecognizer *)ges {
NSLog(@"点击__纵向__滚动的跑马灯_第 %ld 条数据啦啊！！！", _verticalMarquee.currentIndex);
NSLog(@"点击__纵向__滚动的跑马灯_第 %ld 条数据啦！！！", (long)_verticalMarquee.currentIndex);
[_verticalMarquee marqueeOfSettingWithState:MarqueePause_V];
_isPauseV = YES;

Expand Down
50 changes: 0 additions & 50 deletions JhtMarqueeSDK/JhtHorizontalMarquee.h
View file

This file was deleted.

Binary file removed JhtMarqueeSDK/JhtMarqueeSDK.a
View file
Binary file not shown.
16 changes: 0 additions & 16 deletions JhtMarqueeSDK/JhtMarqueeSDK.h
View file

This file was deleted.

83 changes: 0 additions & 83 deletions JhtMarqueeSDK/JhtVerticalMarquee.h
View file

This file was deleted.

0 comments on commit ceeebac

Please sign in to comment.