diff --git a/.gitignore b/.gitignore index e19dcd0..736f0bc 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ fastlane/screenshots # scan temporary files fastlane/test_output -Ifish.app.dSYM.zip \ No newline at end of file +Ifish.app.dSYM.zip +*.svn-base diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 5a117d8..037d2af 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2291,6 +2291,11 @@ C0B2F55D244D5577001079AA /* StoreNameView.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B2F55B244D5577001079AA /* StoreNameView.h */; }; C0B2F55E244D5577001079AA /* StoreNameView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0B2F55C244D5577001079AA /* StoreNameView.m */; }; C0B2F560244D568E001079AA /* StoreNameView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C0B2F55F244D568E001079AA /* StoreNameView.xib */; }; + C0D3A1282647ED8E008E6FD6 /* ELPCircleConsoleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C0D3A1262647ED8D008E6FD6 /* ELPCircleConsoleView.m */; }; + C0D3A1292647ED8E008E6FD6 /* ELPCircleConsoleView.h in Headers */ = {isa = PBXBuildFile; fileRef = C0D3A1272647ED8D008E6FD6 /* ELPCircleConsoleView.h */; }; + C0D3A12C2647ED99008E6FD6 /* UIView+Sizes.h in Headers */ = {isa = PBXBuildFile; fileRef = C0D3A12A2647ED99008E6FD6 /* UIView+Sizes.h */; }; + C0D3A12D2647ED99008E6FD6 /* UIView+Sizes.m in Sources */ = {isa = PBXBuildFile; fileRef = C0D3A12B2647ED99008E6FD6 /* UIView+Sizes.m */; }; + C0D3A12F2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C0D3A12E2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets */; }; C0E746D5239E4A7D001BCD6D /* wechatlogin.png in Resources */ = {isa = PBXBuildFile; fileRef = C0E746D4239E4A7C001BCD6D /* wechatlogin.png */; }; C0E7D6C023A1D11500256A10 /* WXApiRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E7D6BC23A1D11200256A10 /* WXApiRequestHandler.h */; }; C0E7D6C123A1D11500256A10 /* WXApiManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E7D6BD23A1D11200256A10 /* WXApiManager.h */; }; @@ -5756,6 +5761,11 @@ C0B2F55B244D5577001079AA /* StoreNameView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StoreNameView.h; sourceTree = ""; }; C0B2F55C244D5577001079AA /* StoreNameView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StoreNameView.m; sourceTree = ""; }; C0B2F55F244D568E001079AA /* StoreNameView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StoreNameView.xib; sourceTree = ""; }; + C0D3A1262647ED8D008E6FD6 /* ELPCircleConsoleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELPCircleConsoleView.m; sourceTree = ""; }; + C0D3A1272647ED8D008E6FD6 /* ELPCircleConsoleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELPCircleConsoleView.h; sourceTree = ""; }; + C0D3A12A2647ED99008E6FD6 /* UIView+Sizes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Sizes.h"; sourceTree = ""; }; + C0D3A12B2647ED99008E6FD6 /* UIView+Sizes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Sizes.m"; sourceTree = ""; }; + C0D3A12E2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ELPCircleRotateImageAsset.xcassets; sourceTree = ""; }; C0E746D4239E4A7C001BCD6D /* wechatlogin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wechatlogin.png; sourceTree = ""; }; C0E7D6BC23A1D11200256A10 /* WXApiRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiRequestHandler.h; sourceTree = ""; }; C0E7D6BD23A1D11200256A10 /* WXApiManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiManager.h; sourceTree = ""; }; @@ -11950,6 +11960,7 @@ 88F5ECA41D48C9C400CC7CAF /* ThirdPartUnity */ = { isa = PBXGroup; children = ( + C0D3A11B2647EB9F008E6FD6 /* ZLRocker */, C0873EBC249105FF00D47D34 /* ESPTouch */, 18C54F032350541400DF4E7D /* AlibcTradeSDK-3.1.1.96 */, CB8B646A230FAD250032EB24 /* Bugly */, @@ -12293,6 +12304,18 @@ name = petsStoreName; sourceTree = ""; }; + C0D3A11B2647EB9F008E6FD6 /* ZLRocker */ = { + isa = PBXGroup; + children = ( + C0D3A12E2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets */, + C0D3A1272647ED8D008E6FD6 /* ELPCircleConsoleView.h */, + C0D3A1262647ED8D008E6FD6 /* ELPCircleConsoleView.m */, + C0D3A12A2647ED99008E6FD6 /* UIView+Sizes.h */, + C0D3A12B2647ED99008E6FD6 /* UIView+Sizes.m */, + ); + path = ZLRocker; + sourceTree = ""; + }; C0E7D6C423A1D16C00256A10 /* Helper */ = { isa = PBXGroup; children = ( @@ -12928,6 +12951,7 @@ 3D1C5134221A9EE10096AE43 /* YooseeNextConnectViewController.h in Headers */, CB484DFF22B8C8C80075F050 /* audioconvert.h in Headers */, CB484DED22B8C8C80075F050 /* file.h in Headers */, + C0D3A1292647ED8E008E6FD6 /* ELPCircleConsoleView.h in Headers */, CBA61654228F9A6C00ED380D /* YYClassInfo.h in Headers */, 3D1C50BA221A9EE00096AE43 /* NetManager.h in Headers */, C0E7D6D023A1D16D00256A10 /* Constant.h in Headers */, @@ -13108,6 +13132,7 @@ 3D1C50D9221A9EE00096AE43 /* CheckAlarmMessageResult.h in Headers */, 3D1C50E0221A9EE00096AE43 /* ShapeRenderNotifyMsg.h in Headers */, 3D1C5125221A9EE00096AE43 /* IfishCameraRecordFourCell.h in Headers */, + C0D3A12C2647ED99008E6FD6 /* UIView+Sizes.h in Headers */, CB484DEA22B8C8C80075F050 /* intfloat_readwrite.h in Headers */, CB4820922334E99700A50C92 /* IQNSArray+Sort.h in Headers */, CB4820942334E99700A50C92 /* IQUITextFieldView+Additions.h in Headers */, @@ -14017,6 +14042,7 @@ 882956A71DBDA3A200E9DDD7 /* community_left@3x.png in Resources */, 886537481E24B70400E3C87F /* explore_new_label@3x.png in Resources */, 8871C4471E6D2819000AA49F /* QianDaoWayTitleViewCell.xib in Resources */, + C0D3A12F2647EDA5008E6FD6 /* ELPCircleRotateImageAsset.xcassets in Resources */, 886512051E97966400BABDF1 /* task_shareIfishApp@2x.png in Resources */, 881671CA1EA5DE2B00BEBF23 /* UMComUserInfoBar.xib in Resources */, 885FBDD41E4C0CB400E0D7D1 /* explore_iocn_merchants@2x.png in Resources */, @@ -15123,6 +15149,7 @@ 404D7CEA2238CF77005655F5 /* UIViewController+Swizzling.m in Sources */, 881672001EA5DE2B00BEBF23 /* UMImagePickerController.m in Sources */, 88C598951EA0605600BDC812 /* KebordExternAddTextInputView.m in Sources */, + C0D3A1282647ED8E008E6FD6 /* ELPCircleConsoleView.m in Sources */, 883E788F1D48A5E50030E075 /* InfoXingBieCell.m in Sources */, 887069521D4EE8A600BCF675 /* LXPopView.m in Sources */, 881671C71EA5DE2B00BEBF23 /* UMComFindTableViewCell.m in Sources */, @@ -15521,6 +15548,7 @@ CB8B6469230F7F980032EB24 /* IfishMainInfoCell.m in Sources */, FA0892F62270BED00084A609 /* XuanduoHuliModel.m in Sources */, 3D1C5106221A9EE00096AE43 /* CameraNoParyBackVideoView.m in Sources */, + C0D3A12D2647ED99008E6FD6 /* UIView+Sizes.m in Sources */, 881671AD1EA5DE2B00BEBF23 /* UMComUserListDataController.m in Sources */, 3D1C513E221A9EE10096AE43 /* FishControlSecondCell.m in Sources */, 88597ABF1E56BAF1003D0E5C /* WFCollectionViewCell.m in Sources */, diff --git a/Ifish/.DS_Store b/Ifish/.DS_Store index d1242e8..9fdf1a0 100644 Binary files a/Ifish/.DS_Store and b/Ifish/.DS_Store differ diff --git a/Ifish/Assets.xcassets/.DS_Store b/Ifish/Assets.xcassets/.DS_Store index 7596d88..7ff9bf7 100644 Binary files a/Ifish/Assets.xcassets/.DS_Store and b/Ifish/Assets.xcassets/.DS_Store differ diff --git a/Ifish/Assets.xcassets/images/Contents.json b/Ifish/Assets.xcassets/images/Contents.json index da4a164..73c0059 100644 --- a/Ifish/Assets.xcassets/images/Contents.json +++ b/Ifish/Assets.xcassets/images/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Ifish/Assets.xcassets/images/equipment_iocn_joystick.imageset/Contents.json b/Ifish/Assets.xcassets/images/equipment_iocn_joystick.imageset/Contents.json new file mode 100644 index 0000000..32ca6df --- /dev/null +++ b/Ifish/Assets.xcassets/images/equipment_iocn_joystick.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "equipment_iocn_joystick.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/images/equipment_iocn_joystick.imageset/equipment_iocn_joystick.png b/Ifish/Assets.xcassets/images/equipment_iocn_joystick.imageset/equipment_iocn_joystick.png new file mode 100644 index 0000000..44fad30 Binary files /dev/null and b/Ifish/Assets.xcassets/images/equipment_iocn_joystick.imageset/equipment_iocn_joystick.png differ diff --git a/Ifish/Assets.xcassets/images/equipment_iocn_joystickicon.imageset/Contents.json b/Ifish/Assets.xcassets/images/equipment_iocn_joystickicon.imageset/Contents.json new file mode 100644 index 0000000..76d94e1 --- /dev/null +++ b/Ifish/Assets.xcassets/images/equipment_iocn_joystickicon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "equipment_iocn_joystickicon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/images/equipment_iocn_joystickicon.imageset/equipment_iocn_joystickicon.png b/Ifish/Assets.xcassets/images/equipment_iocn_joystickicon.imageset/equipment_iocn_joystickicon.png new file mode 100644 index 0000000..7346021 Binary files /dev/null and b/Ifish/Assets.xcassets/images/equipment_iocn_joystickicon.imageset/equipment_iocn_joystickicon.png differ diff --git a/Ifish/Assets.xcassets/images/joystick.imageset/Contents.json b/Ifish/Assets.xcassets/images/joystick.imageset/Contents.json new file mode 100644 index 0000000..7e33a22 --- /dev/null +++ b/Ifish/Assets.xcassets/images/joystick.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "joystick.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/images/joystick.imageset/joystick.png b/Ifish/Assets.xcassets/images/joystick.imageset/joystick.png new file mode 100644 index 0000000..b938e1f Binary files /dev/null and b/Ifish/Assets.xcassets/images/joystick.imageset/joystick.png differ diff --git a/Ifish/Assets.xcassets/images/joystickicon.imageset/Contents.json b/Ifish/Assets.xcassets/images/joystickicon.imageset/Contents.json new file mode 100644 index 0000000..df4f21b --- /dev/null +++ b/Ifish/Assets.xcassets/images/joystickicon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "joystickicon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/images/joystickicon.imageset/joystickicon.png b/Ifish/Assets.xcassets/images/joystickicon.imageset/joystickicon.png new file mode 100644 index 0000000..7346021 Binary files /dev/null and b/Ifish/Assets.xcassets/images/joystickicon.imageset/joystickicon.png differ diff --git a/Ifish/Assets.xcassets/images/roundBall.imageset/Contents.json b/Ifish/Assets.xcassets/images/roundBall.imageset/Contents.json new file mode 100644 index 0000000..c11c5cb --- /dev/null +++ b/Ifish/Assets.xcassets/images/roundBall.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "roundBall@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ifish/Assets.xcassets/images/roundBall.imageset/roundBall@3x.png b/Ifish/Assets.xcassets/images/roundBall.imageset/roundBall@3x.png new file mode 100644 index 0000000..441c290 Binary files /dev/null and b/Ifish/Assets.xcassets/images/roundBall.imageset/roundBall@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleConsoleView.h b/Ifish/ZLRocker/ELPCircleConsoleView.h new file mode 100644 index 0000000..0eefc27 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleConsoleView.h @@ -0,0 +1,40 @@ +// +// ELPCircleConsoleView.h +// ELPCircleConsoleViewTest +// +// Created by ElsonPeng on 2018/3/2. +// Copyright © 2018年 ElsonPeng. All rights reserved. +// + +#import + +typedef NS_ENUM(NSUInteger, ELPCircleConsoleMoveDirection) { + ELPCircleConsoleMoveDirectionUp, + ELPCircleConsoleMoveDirectionDown, + ELPCircleConsoleMoveDirectionLeft, + ELPCircleConsoleMoveDirectionRight, + ELPCircleConsoleMoveDirectionNone, + ELPCircleConsoleMoveDirectionStop, + ELPCircleConsoleMoveDirectionLeftStop, + ELPCircleConsoleMoveDirectionRightStop, + ELPCircleConsoleMoveDirectionUpStop, + ELPCircleConsoleMoveDirectionDownStop +}; + +@class ELPCircleConsoleView; + +@protocol ELPCircleConsoleMoveDelegate + +@optional +- (void)rotateCircleView:(ELPCircleConsoleView *)rotetaCircleView didRotateWithValueX:(NSString *)Xstr valueY:(NSString *)Ystr stop:(BOOL)needStop moveDirection:(ELPCircleConsoleMoveDirection)orientation; +@end + +@interface ELPCircleConsoleView : UIView + +@property (nonatomic, weak) id delegate; + +@property (nonatomic, assign) BOOL isPortrait; + +-(instancetype)initWithOritention:(BOOL)isProtrait; + +@end diff --git a/Ifish/ZLRocker/ELPCircleConsoleView.m b/Ifish/ZLRocker/ELPCircleConsoleView.m new file mode 100644 index 0000000..87889e3 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleConsoleView.m @@ -0,0 +1,493 @@ +// +// ELPCircleConsoleView.m +// ELPCircleConsoleViewTest +// +// Created by ElsonPeng on 2018/3/2. +// Copyright © 2018年 ElsonPeng. All rights reserved. +// + +#import "ELPCircleConsoleView.h" + +#import "UIView+Sizes.h" + +@interface ELPCircleConsoleView () + +@property (nonatomic, strong) UIImageView *consoleBGImageView; + +@property (nonatomic, strong) UIButton *rotateButton; // 旋转按钮 + +@property (nonatomic, strong) UIView *traceView; // 旋转轨迹 + +@property (nonatomic, assign) ELPCircleConsoleMoveDirection direction; + +@property (nonatomic, assign) ELPCircleConsoleMoveDirection preDirection; + +@property (nonatomic, assign) CGPoint tempPoint; + +@property (nonatomic, assign) CGFloat deltaRadius; + +//图片相关 +@property (nonatomic, strong) UIImage *rotateBackgroundImage_normal; +@property (nonatomic, strong) UIImage *rotateBackgroundImage_active_up; +@property (nonatomic, strong) UIImage *rotateBackgroundImage_active_down; +@property (nonatomic, strong) UIImage *rotateBackgroundImage_active_left; +@property (nonatomic, strong) UIImage *rotateBackgroundImage_active_right; +@property (nonatomic, strong) UIImage *rotateCenterButtonImage_normal; +@property (nonatomic, strong) UIImage *rotateCenterButtonImage_active; + +@end + + +@implementation ELPCircleConsoleView{ + ELPCircleConsoleMoveDirection currentDirection; + CGPoint currentPoint; + NSOperationQueue *queue; + CGFloat centerViewX; + CGFloat centerViewY; + + NSInteger xAxisSpeed; + NSInteger yAxisSpeed; + + NSInteger initxAxisSpeed; + NSInteger inityAxisSpeed; + + CGFloat timeInterval; + + //判断当前是不是正在发送stop指令 + BOOL isSendOnlyStopCmd; + +} + +-(instancetype)init{ + return [self initWithOritention:YES]; +} + +-(instancetype)initWithOritention:(BOOL)isProtrait { + self = [super init]; + if (self) { + self.isPortrait = isProtrait; + + self.consoleBGImageView = [[UIImageView alloc] init]; + self.consoleBGImageView.userInteractionEnabled = YES; + [self addSubview:self.consoleBGImageView]; + + self.rotateButton = [[UIButton alloc] init]; + self.rotateButton.adjustsImageWhenHighlighted = NO; + [self.rotateButton addTarget:self action:@selector(rotateButtonImgChange) forControlEvents:UIControlEventTouchDown]; + [self addSubview:self.rotateButton]; + + // 运动轨迹view + self.traceView = [[UIView alloc] init]; + [self addSubview:self.traceView]; + + self.consoleBGImageView.image = self.rotateBackgroundImage_normal; + + [self.rotateButton setImage:self.rotateCenterButtonImage_normal forState:UIControlStateNormal]; + [self.rotateButton setImage:_rotateCenterButtonImage_active forState:UIControlStateHighlighted]; + self.rotateButton.size = self.rotateCenterButtonImage_normal.size; + + // 添加拖动手势 + UIPanGestureRecognizer *panPressGes = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(moveInCircle:)]; + panPressGes.minimumNumberOfTouches = 0.1; + [self.rotateButton addGestureRecognizer:panPressGes]; + } + return self; +} + + +-(void) rotateButtonImgChange { + +} + +- (void)layoutSubviews { + [super layoutSubviews]; + + _preDirection =ELPCircleConsoleMoveDirectionNone; + + self.consoleBGImageView.left = 0; + self.consoleBGImageView.top = 0; + + self.rotateButton.centerX = self.consoleBGImageView.centerX; + self.rotateButton.centerY = self.consoleBGImageView.centerY; + + self.traceView.centerX = self.consoleBGImageView.centerX; + self.traceView.centerY = self.consoleBGImageView.centerY; + + CGFloat radiusBig = ( self.consoleBGImageView.width + self.consoleBGImageView.height ) * 0.5 * 0.5; + CGFloat radiusSmall = (self.rotateButton.width + self.rotateButton.height) * 0.5 * 0.5; + self.deltaRadius = (radiusBig - radiusSmall) * (radiusBig - radiusSmall); + + centerViewX = self.rotateButton.centerX; + centerViewY = self.rotateButton.centerY; + + xAxisSpeed = 50; + yAxisSpeed = 20; + timeInterval = 0.3; +} + +#pragma mark - 在触摸方面开发时，只针对touches进行处理 +#pragma mark - 触摸开始 在一次触摸事件中 只会执行一次 +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { + UITouch *touch = [touches anyObject]; + + CGPoint currentP = [touch locationInView:self]; + + _tempPoint = currentP; + [UIView animateWithDuration:0.3 animations:^{ + [self rotateLocation:currentP]; + }]; +} + +#pragma mark - 触摸移动  在一次触摸事件中会执行多次 +-(void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event { + + UITouch *touch = [touches anyObject]; + //要知道手指触摸的位置 + CGPoint pLocation = [touch locationInView:self]; + //对位置进行修正 + [self rotateLocation:pLocation]; +} + +-(void)rotateLocation:(CGPoint)pLocation { + if([self IfYuntaiViewIsIntheBigView:pLocation]){ + self.rotateButton.center = CGPointMake(pLocation.x, pLocation.y); + + CGPoint tranPoint = CGPointMake(pLocation.x - centerViewX, pLocation.y - centerViewY); + ELPCircleConsoleMoveDirection direction = [self determineCameraDirection:tranPoint]; + currentDirection = direction; + } else { + CGFloat radius = self.traceView.size.width * 0.5; + CGPoint pointc = self.consoleBGImageView.center; + CGPoint changePoint = [self CirclePoint:radius withCenterCircle:pointc withCurrentPoint:pLocation]; + + self.rotateButton.center = CGPointMake(changePoint.x, changePoint.y); + + CGPoint tranPoint = CGPointMake(changePoint.x - centerViewX, changePoint.y - centerViewY); + ELPCircleConsoleMoveDirection direction = [self determineCameraDirection:tranPoint]; + currentDirection = direction; + } + + CGFloat xValue = fabs(self.rotateButton.centerX - centerViewX); + CGFloat yValue = fabs(self.rotateButton.centerY - centerViewY); + + CGFloat currentRadiusValue = xValue * xValue + yValue * yValue; + CGFloat bgImgRadiusWith = self.consoleBGImageView.width * 0.5 * 0.5; + if(currentRadiusValue > bgImgRadiusWith * bgImgRadiusWith * 0.6) { + [self sendRotateButtonRotateCmd]; + } else { + [self resumBackgroundImgToNormal]; + } +} + +-(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { + [self.consoleBGImageView setImage:self.rotateBackgroundImage_normal]; + [UIView animateWithDuration:0.1f delay:0.1f options:UIViewAnimationOptionAllowUserInteraction animations:^{ + self.rotateButton.center = CGPointMake(self.consoleBGImageView.centerX, self.consoleBGImageView.centerY); + } completion:nil]; + + [self.rotateButton setImage:self.rotateCenterButtonImage_normal forState:UIControlStateNormal]; + self.rotateButton.highlighted = NO; + _preDirection =ELPCircleConsoleMoveDirectionNone; + + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:nil valueY:nil stop:YES moveDirection:ELPCircleConsoleMoveDirectionStop]; + } + isSendOnlyStopCmd = YES; +} + +- (void)rotateButtonClickedCancel { + _preDirection =ELPCircleConsoleMoveDirectionNone; + + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:nil valueY:nil stop:YES moveDirection:ELPCircleConsoleMoveDirectionStop]; + } + isSendOnlyStopCmd = YES; + + [self.rotateButton setImage:self.rotateCenterButtonImage_normal forState:UIControlStateNormal]; + [self.consoleBGImageView setImage:self.rotateBackgroundImage_normal]; + + self.rotateButton.centerX = self.consoleBGImageView.centerX; + self.rotateButton.centerY = self.consoleBGImageView.centerY; + +} + +- (void)moveInCircle:(UIPanGestureRecognizer *)gesture { + + if (gesture.state == UIGestureRecognizerStateEnded) { + [self rotateButtonClickedCancel]; + } else if (gesture.state == UIGestureRecognizerStateChanged) { + CGPoint translation = [gesture translationInView:self]; + CGPoint locationP = [gesture locationInView:self]; + ELPCircleConsoleMoveDirection direction = [self determineCameraDirection:translation]; + currentPoint = translation; + currentDirection = direction; + + //判断当前内部 云台 旋转 是否在大圆范围内 + if([self IfYuntaiViewIsIntheBigView:locationP]) { + self.rotateButton.centerX = locationP.x; + self.rotateButton.centerY = locationP.y; + } else { + CGFloat radius = self.traceView.size.width * 0.5; + CGPoint pointc = self.consoleBGImageView.center; + CGPoint changePoint = [self CirclePoint:radius withCenterCircle:pointc withCurrentPoint:locationP]; + + self.rotateButton.centerX = changePoint.x; + self.rotateButton.centerY = changePoint.y; + } + CGFloat xValue = fabs(self.rotateButton.centerX - centerViewX); + CGFloat yValue = fabs(self.rotateButton.centerY - centerViewY); + + CGFloat currentRadiusValue = xValue * xValue + yValue * yValue; + CGFloat bgImgRadiusWith = self.consoleBGImageView.width * 0.5 * 0.5; + + if(currentRadiusValue > bgImgRadiusWith * bgImgRadiusWith * 0.6) { + [self sendRotateButtonRotateCmd]; + } else { + [self resumBackgroundImgToNormal]; + } + } else if (gesture.state == UIGestureRecognizerStateBegan) { + [self.rotateButton setImage:self.rotateCenterButtonImage_active forState:UIControlStateNormal]; + } +} + +-(void)setConsoleBackgroundImage { + if(currentDirection ==ELPCircleConsoleMoveDirectionUp) { + [self.consoleBGImageView setImage:self.rotateBackgroundImage_active_up]; + } else if(currentDirection ==ELPCircleConsoleMoveDirectionDown) { + [self.consoleBGImageView setImage:self.rotateBackgroundImage_active_down]; + } else if(currentDirection ==ELPCircleConsoleMoveDirectionLeft) { + [self.consoleBGImageView setImage:self.rotateBackgroundImage_active_left]; + } else if(currentDirection ==ELPCircleConsoleMoveDirectionRight) { + [self.consoleBGImageView setImage:self.rotateBackgroundImage_active_right]; + } +} + +-(BOOL)IfYuntaiViewIsIntheBigView:(CGPoint)mPoint { + CGFloat delX = fabs(mPoint.x - centerViewX); + CGFloat delY = fabs(mPoint.y - centerViewY); + + if((delX * delX + delY * delY) < self.deltaRadius) { + return YES; + } + return NO; +} + +-(void)sendRotateButtonRotateCmd { + [self setConsoleBackgroundImage]; + + xAxisSpeed = initxAxisSpeed; + yAxisSpeed = inityAxisSpeed; + + NSString *xPositive = [NSString stringWithFormat:@"%ld",(long)xAxisSpeed]; + NSString *xNegative = [NSString stringWithFormat:@"%ld",-(long)xAxisSpeed]; + + NSString *yPositive = [NSString stringWithFormat:@"%ld",(long)yAxisSpeed]; + NSString *yNegative = [NSString stringWithFormat:@"%ld",-(long)yAxisSpeed]; + + isSendOnlyStopCmd = NO; + if(currentDirection ==ELPCircleConsoleMoveDirectionRight) { + //直接向右转动 + if(_preDirection == currentDirection || _preDirection ==ELPCircleConsoleMoveDirectionNone) { + if (self.delegate != nil && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:xPositive valueY:@"0" stop:NO moveDirection:ELPCircleConsoleMoveDirectionRight]; + } + } + //前一个方向停止，向右转动 + else { + if (self.delegate != nil && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:xPositive valueY:@"0" stop:YES moveDirection:ELPCircleConsoleMoveDirectionRightStop]; + } + } + } else if(currentDirection ==ELPCircleConsoleMoveDirectionUp) { + if(_preDirection == currentDirection || _preDirection ==ELPCircleConsoleMoveDirectionNone) { + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:@"0" valueY:yPositive stop:NO moveDirection:ELPCircleConsoleMoveDirectionUp]; + } + } else { + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:@"0" valueY:yPositive stop:YES moveDirection:ELPCircleConsoleMoveDirectionUpStop]; + } + } + } else if(currentDirection ==ELPCircleConsoleMoveDirectionLeft) { + if(_preDirection == currentDirection || _preDirection ==ELPCircleConsoleMoveDirectionNone) { + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:xNegative valueY:@"0" stop:NO moveDirection:ELPCircleConsoleMoveDirectionLeft]; + } + } else { + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:xNegative valueY:@"0" stop:YES moveDirection:ELPCircleConsoleMoveDirectionLeftStop]; + } + } + } else if(currentDirection ==ELPCircleConsoleMoveDirectionDown) { + if(_preDirection == currentDirection || _preDirection ==ELPCircleConsoleMoveDirectionNone) { + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:@"0" valueY:yNegative stop:NO moveDirection:ELPCircleConsoleMoveDirectionDown]; + } + } else { + if (self.delegate && [self.delegate respondsToSelector:@selector(rotateCircleView:didRotateWithValueX:valueY:stop:moveDirection:)]) { + [self.delegate rotateCircleView:self didRotateWithValueX:@"0" valueY:yNegative stop:YES moveDirection:ELPCircleConsoleMoveDirectionDownStop]; + } + } + } + _preDirection = currentDirection; +} + +-(void)resumBackgroundImgToNormal { + [self.consoleBGImageView setImage:self.rotateBackgroundImage_normal]; +} + +// 获取 当前拖动的点于圆心构成的直线 和运动轨迹圆的相交点 +- (CGPoint)CirclePoint:(CGFloat)radius withCenterCircle:(CGPoint)centerCircle withCurrentPoint:(CGPoint)curPoint { + CGPoint cPoint; + CGFloat x = curPoint.x; + CGFloat y = curPoint.y; + //圆的X坐标轨迹 + CGFloat cX ; + //圆的Y坐标轨迹 + CGFloat cY ; + // 圆心到转动按钮的距离的平方 + CGFloat daX; + // 圆心到转动按钮的距离 + CGFloat aX; + // 圆心水平方向与转动按钮形成的夹角的cos值 + CGFloat cosX; + // 圆心与触控点的距离的平方（勾股定理） + daX = (x - centerCircle.x)*(x - centerCircle.x) + (y - centerCircle.y)*(y - centerCircle.y); + aX = sqrt(daX); //开根号 //圆心与触控点的距离 + cosX = fabs(x - centerCircle.x)/aX; //绝对值 + cX = cosX * radius; // x =R * cosX; 圆心到触控点在水平坐标的X的值 + cY = sqrt(radius * radius - cX * cX); + + if(x < centerCircle.x){ //如果X所在的点小于圆心 在圆心的左边 + cX = centerCircle.x - cX; + }else{ + cX = centerCircle.x + cX; + } + + if(y < centerCircle.y){ + cY = centerCircle.y - cY; + }else{ + cY = centerCircle.y + cY; + } + cPoint.x = cX; + cPoint.y = cY; + return cPoint; +} + +// 根据拖动时候的偏移确定摄像头的移动方向 +- (ELPCircleConsoleMoveDirection)determineCameraDirection:(CGPoint)translation { + if (translation.y == 0.0 || fabs(translation.x / translation.y) >= 1.0){ + if (translation.x > 0.0 ){ + _direction =ELPCircleConsoleMoveDirectionRight; + }else{ + _direction =ELPCircleConsoleMoveDirectionLeft; + } + } else if (translation.x == 0.0 || fabs(translation.y / translation.x) >= 1.0){ + if (translation.y > 0.0 ){ + _direction =ELPCircleConsoleMoveDirectionDown; + }else{ + _direction =ELPCircleConsoleMoveDirectionUp; + } + } + return _direction; +} + +-(void)dealloc{ + NSLog(@"ELPCircleConsole dealloc"); +} + +-(UIImage *)imageByInchesWithName:(NSString *)imageName{ + if (!imageName) { + return [UIImage new]; + } + return [UIImage imageNamed:[NSString stringWithFormat:@"%@",imageName]]; +} + +#pragma mark - setter & getter +-(void)setFrame:(CGRect)frame{ + [super setFrame:frame]; + self.consoleBGImageView.frame = self.bounds; + self.consoleBGImageView.size = self.size; + + self.rotateButton.size = self.rotateCenterButtonImage_normal.size; + + self.traceView.size = (CGSize){self.consoleBGImageView.width - self.rotateButton.width-10,self.consoleBGImageView.height - self.rotateButton.height-10}; +} + +-(void)setIsPortrait:(BOOL)isPortrait{ + _isPortrait = isPortrait; + + if (self.consoleBGImageView) { + self.consoleBGImageView.image = self.rotateBackgroundImage_normal; + } + if (self.rotateButton) { + [self.rotateButton setImage:self.rotateCenterButtonImage_normal forState:UIControlStateNormal]; + [self.rotateButton setImage:_rotateCenterButtonImage_active forState:UIControlStateHighlighted]; + self.rotateButton.size = self.rotateCenterButtonImage_normal.size; + } + if (self.traceView) { + self.traceView.size = (CGSize){self.consoleBGImageView.width - self.rotateButton.width,self.consoleBGImageView.height - self.rotateButton.height}; + } +} + +//中间操作台控制背景图片 +-(UIImage *)rotateBackgroundImage_normal { + if (!_rotateBackgroundImage_normal) { + return [self imageByInchesWithName:self.isPortrait?@"equipment_iocn_joystick.png":@"equipment_iocn_joystick.png"]; + } + return _rotateBackgroundImage_normal; +} +-(UIImage *)rotateBackgroundImage_active_up { + if (!_rotateBackgroundImage_active_up) { + return [self imageByInchesWithName:self.isPortrait?@"equipment_iocn_joystick":@"equipment_iocn_joystick"]; + } + return _rotateBackgroundImage_active_up; +} +-(UIImage *)rotateBackgroundImage_active_down { + if (!_rotateBackgroundImage_active_down) { + return [self imageByInchesWithName:self.isPortrait?@"equipment_iocn_joystick":@"equipment_iocn_joystick"]; + } + return _rotateBackgroundImage_active_down; +} +-(UIImage *)rotateBackgroundImage_active_left { + if (!_rotateBackgroundImage_active_left) { + return [self imageByInchesWithName:self.isPortrait?@"equipment_iocn_joystick":@"equipment_iocn_joystick"]; + } + return _rotateBackgroundImage_active_left; +} +-(UIImage *)rotateBackgroundImage_active_right { + if (!_rotateBackgroundImage_active_right) { + return [self imageByInchesWithName:self.isPortrait?@"equipment_iocn_joystick":@"equipment_iocn_joystick"]; + } + return _rotateBackgroundImage_active_right; +} +-(UIImage *)rotateCenterButtonImage_normal { + if (!_rotateCenterButtonImage_normal) { + return [self imageByInchesWithName:self.isPortrait?@"roundBall":@"roundBall"]; + } + return _rotateCenterButtonImage_normal; +} +-(UIImage *)rotateCenterButtonImage_active { + if (!_rotateCenterButtonImage_active) { + return [self imageByInchesWithName:self.isPortrait?@"roundBall":@"roundBall"]; + } + return _rotateCenterButtonImage_active; +} ++(UIImage *)colorizeImage:(UIImage *)baseImage withColor:(UIColor *)theColor { + if (theColor == nil) { + theColor = [UIColor whiteColor]; + } + CGRect rect = CGRectMake(0, 0, baseImage.size.width* baseImage.scale, baseImage.size.height* baseImage.scale); + UIGraphicsBeginImageContext(rect.size); + CGContextRef context = UIGraphicsGetCurrentContext(); + CGContextClipToMask(context, rect, baseImage.CGImage); + CGContextSetFillColorWithColor(context, [theColor CGColor]); + CGContextFillRect(context, rect); + UIImage *img = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + UIImage *flippedImage = [UIImage imageWithCGImage:img.CGImage scale:baseImage.scale orientation: UIImageOrientationDownMirrored]; + return flippedImage; +} + +@end + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/.svn/all-wcprops new file mode 100644 index 0000000..9b83def --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/.svn/all-wcprops @@ -0,0 +1,11 @@ +K 25 +svn:wc:ra_dav:version-url +V 166 +/svn/tccloudvideo/!svn/ver/9524/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 180 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/Contents.json +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/.svn/entries new file mode 100644 index 0000000..405f024 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/.svn/entries @@ -0,0 +1,233 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-30T14:31:27.310147Z +9524 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +newly_landscape_rotateBackgroundImage_active_down_4_7.imageset +dir + +newly_landscape_rotateBackgroundImage_normal_4.imageset +dir + +newly_protrait_rotateBackgroundImage_normal_4_7.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_5_5_en.imageset +dir + +newly_landscape_rotateCenterButtonImage_active_4_7-1.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_4_7_en.imageset +dir + +newly_landscape_rotateCenterButtonImage_active-en_5_5.imageset +dir + +newly_landscape_rotateBackgroundImage_active_right_5_5.imageset +dir + +newly_landscape_rotateCenterButtonImage_active_4_7.imageset +dir + +newly_protrait_rotateBackgroundImage_active_left_4.imageset +dir + +newly_protrait_rotateCenterButtonImage_normal-en_4.imageset +dir + +newly_protrait_rotateCenterButtonImage_normal_4.imageset +dir + +newly_protrait_rotateBackgroundImage_active_down_4_7.imageset +dir + +newly_landscape_rotateBackgroundImage_active_down_4.imageset +dir + +newly_protrait_rotateBackgroundImage_normal_4.imageset +dir + +newly_landscape_rotateBackgroundImage_active_up_4_7.imageset +dir + +newly_protrait_rotateBackgroundImage_active_right_5_5.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_4_en.imageset +dir + +newly_protrait_rotateCenterButtonImage_active_4_7.imageset +dir + +newly_landscape_rotateCenterButtonImage_active_4.imageset +dir + +newly_landscape_rotateBackgroundImage_active_left_5_5.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_5_5.imageset +dir + +Contents.json +file + + + + +2018-01-29T02:36:59.000000Z +31cc68f34934a99c0b0c1bebde56309c +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +62 + +newly_protrait_rotateBackgroundImage_active_down_4.imageset +dir + +newly_landscape_rotateBackgroundImage_normal_5_5.imageset +dir + +newly_protrait_rotateBackgroundImage_active_up_4_7.imageset +dir + +newly_landscape_rotateBackgroundImage_active_up_4.imageset +dir + +newly_protrait_rotateCenterButtonImage_active_4.imageset +dir + +newly_protrait_rotateCenterButtonImage_normal_5_5.imageset +dir + +newly_protrait_rotateCenterButtonImage_normal-en_5_5.imageset +dir + +newly_protrait_rotateBackgroundImage_active_left_5_5.imageset +dir + +newly_landscape_rotateBackgroundImage_active_down_5_5.imageset +dir + +newly_protrait_rotateBackgroundImage_normal_5_5.imageset +dir + +newly_protrait_rotateCollectionButtonImage_normal.imageset +dir + +newly_protrait_rotateBackgroundImage_active_up_4.imageset +dir + +newly_landscape_rotateCenterButtonImage_active_5_5.imageset +dir + +newly_landscape_rotateCenterButtonImage_active-en_4_7.imageset +dir + +newly_landscape_rotateBackgroundImage_active_right_4_7.imageset +dir + +newly_protrait_rotateCollectionAddButtonImage_normal.imageset +dir + +newly_protrait_rotateBackgroundImage_active_down_5_5.imageset +dir + +newly_landscape_rotateBackgroundImage_active_up_5_5.imageset +dir + +newly_protrait_rotateCenterButtonImage_active_5_5.imageset +dir + +newly_landscape_rotateCenterButtonImage_active-en_4.imageset +dir + +newly_landscape_rotateBackgroundImage_active_right_4.imageset +dir + +newly_protrait_rotateBackgroundImage_active_right_4_7.imageset +dir + +newly_protrait_rotateCollectionButtonImage_active.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_4_7.imageset +dir + +newly_landscape_rotateBackgroundImage_active_left_4_7.imageset +dir + +newly_landscape_rotateBackgroundImage_normal_4_7.imageset +dir + +newly_protrait_rotateBackgroundImage_active_up_5_5.imageset +dir + +newly_protrait_rotateBackgroundImage_active_right_4.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_4-1.imageset +dir + +newly_protrait_rotateCollectionAddButtonImage_active.imageset +dir + +newly_landscape_rotateCenterButtonImage_normal_4.imageset +dir + +newly_landscape_rotateBackgroundImage_active_left_4.imageset +dir + +newly_protrait_rotateBackgroundImage_active_left_4_7.imageset +dir + +newly_protrait_rotateCenterButtonImage_normal-en_4_7.imageset +dir + +newly_protrait_rotateCenterButtonImage_normal_4_7.imageset +dir + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/.svn/all-wcprops new file mode 100644 index 0000000..e6ab4e9 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 229 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_down_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 243 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_down_5_5.imageset/Contents.json +END +but@3x.png +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_down_5_5.imageset/but@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/.svn/entries new file mode 100644 index 0000000..0081764 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_down_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:43.000000Z +98d5d41113fd0ca66806b21e8ccac722 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +303 + +but@3x.png +file + + + + +2018-01-29T02:36:43.000000Z +25356155e0276d85d4b727d4db139b01 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +3638 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/Contents.json new file mode 100644 index 0000000..a82b7a5 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "but@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/but@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/but@3x.png new file mode 100644 index 0000000..691f0c2 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_down.imageset/but@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/.svn/all-wcprops new file mode 100644 index 0000000..0702a99 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 229 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_left_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 243 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_left_5_5.imageset/Contents.json +END +left@3x.png +K 25 +svn:wc:ra_dav:version-url +V 241 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_left_5_5.imageset/left@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/.svn/entries new file mode 100644 index 0000000..27166ea --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_left_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:32.000000Z +3117ddba8d3bb38628ff6f7d11e53d09 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +304 + +left@3x.png +file + + + + +2018-01-29T02:36:32.000000Z +f031039381ac5c4e21c3be6033deeb07 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +4954 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/Contents.json new file mode 100644 index 0000000..877cb87 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "left@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/left@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/left@3x.png new file mode 100644 index 0000000..73df268 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_left.imageset/left@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/.svn/all-wcprops new file mode 100644 index 0000000..812ff97 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 230 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_right_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 244 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_right_5_5.imageset/Contents.json +END +right@3x.png +K 25 +svn:wc:ra_dav:version-url +V 243 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_right_5_5.imageset/right@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/.svn/entries new file mode 100644 index 0000000..db9b4d0 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_right_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:26.000000Z +6a08ef3ca4d31e9b94e65bc2e1d6e695 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +305 + +right@3x.png +file + + + + +2018-01-29T02:36:26.000000Z +eae27332f18eb67699166c97812a4095 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +4466 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/Contents.json new file mode 100644 index 0000000..d10028b --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "right@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/right@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/right@3x.png new file mode 100644 index 0000000..ad42492 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_right.imageset/right@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/.svn/all-wcprops new file mode 100644 index 0000000..28c539e --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 227 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_up_5_5.imageset +END +top@3x.png +K 25 +svn:wc:ra_dav:version-url +V 238 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_up_5_5.imageset/top@3x.png +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 241 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_up_5_5.imageset/Contents.json +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/.svn/entries new file mode 100644 index 0000000..63eea90 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_active_up_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +top@3x.png +file + + + + +2018-01-29T02:36:49.000000Z +6f31e661dfbe4d75ad77f26947f8b20b +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +4398 + +Contents.json +file + + + + +2018-01-29T02:36:49.000000Z +2cdde6ce303ed153ea5c81cd86864d85 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +303 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/Contents.json new file mode 100644 index 0000000..0f8f8ad --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "top@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/top@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/top@3x.png new file mode 100644 index 0000000..0fe1d7c Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_active_up.imageset/top@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/.svn/all-wcprops new file mode 100644 index 0000000..96750a9 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 224 +/svn/tccloudvideo/!svn/ver/9521/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_normal_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 238 +/svn/tccloudvideo/!svn/ver/9521/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_normal_5_5.imageset/Contents.json +END +bg@3x.png +K 25 +svn:wc:ra_dav:version-url +V 234 +/svn/tccloudvideo/!svn/ver/9521/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_normal_5_5.imageset/bg@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/.svn/entries new file mode 100644 index 0000000..c999fc4 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateBackgroundImage_normal_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-30T14:25:00.182177Z +9521 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:36.000000Z +91818e8b3d5ca802e067490382626433 +2017-10-30T14:25:00.182177Z +9521 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +302 + +bg@3x.png +file + + + + +2018-01-29T02:36:36.000000Z +59cccbbaf6b7676c172812ae6f8c2775 +2017-10-30T14:25:00.182177Z +9521 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +3931 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/Contents.json new file mode 100644 index 0000000..e6e45cb --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "bg@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/bg@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/bg@3x.png new file mode 100644 index 0000000..58a1da5 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_ConsoleBackgroundImage_normal.imageset/bg@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/.svn/all-wcprops new file mode 100644 index 0000000..1e4f445 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 226 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_active_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_active_5_5.imageset/Contents.json +END +yt_btn@3x.png +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_active_5_5.imageset/yt_btn@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/.svn/entries new file mode 100644 index 0000000..0a7c996 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_active_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:45.000000Z +bb11ed56a815222e7a6e787ffbd97392 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +306 + +yt_btn@3x.png +file + + + + +2018-01-29T02:36:45.000000Z +9373b26c75f8287309fdc23df7a7d377 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +4169 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/Contents.json new file mode 100644 index 0000000..fce8630 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "圆形 (2).png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/圆形 (2).png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/圆形 (2).png new file mode 100644 index 0000000..fdaa1bf Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_active.imageset/圆形 (2).png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/.svn/all-wcprops new file mode 100644 index 0000000..de87396 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 226 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_normal_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_normal_5_5.imageset/Contents.json +END +yt_btn@3x.png +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_normal_5_5.imageset/yt_btn@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/.svn/entries new file mode 100644 index 0000000..84f5988 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_landscape_rotateCenterButtonImage_normal_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:35.000000Z +bb11ed56a815222e7a6e787ffbd97392 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +306 + +yt_btn@3x.png +file + + + + +2018-01-29T02:36:35.000000Z +9373b26c75f8287309fdc23df7a7d377 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +4169 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/Contents.json new file mode 100644 index 0000000..fce8630 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "圆形 (2).png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/圆形 (2).png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/圆形 (2).png new file mode 100644 index 0000000..fdaa1bf Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/landscape_rotateCenterButtonImage_normal.imageset/圆形 (2).png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/.svn/all-wcprops new file mode 100644 index 0000000..df6d54c --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 225 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 239 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active_5_5.imageset/Contents.json +END +ball@3x.png +K 25 +svn:wc:ra_dav:version-url +V 237 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active_5_5.imageset/ball@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/.svn/entries new file mode 100644 index 0000000..b03f887 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:50.000000Z +86437884817941ef757293d251b0455f +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +304 + +ball@3x.png +file + + + + +2018-01-29T02:36:50.000000Z +39efe6b3703c1ae9f04d5d4953beb1a6 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +13418 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/Contents.json new file mode 100644 index 0000000..164281b --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "圆形.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/圆形.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/圆形.png new file mode 100644 index 0000000..6001f3a Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_active.imageset/圆形.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/.svn/all-wcprops new file mode 100644 index 0000000..1c08449 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 225 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 239 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal_5_5.imageset/Contents.json +END +ball@3x.png +K 25 +svn:wc:ra_dav:version-url +V 237 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal_5_5.imageset/ball@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/.svn/entries new file mode 100644 index 0000000..9311e8a --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:43.000000Z +86437884817941ef757293d251b0455f +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +304 + +ball@3x.png +file + + + + +2018-01-29T02:36:43.000000Z +39efe6b3703c1ae9f04d5d4953beb1a6 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +13418 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/Contents.json new file mode 100644 index 0000000..164281b --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "圆形.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/圆形.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/圆形.png new file mode 100644 index 0000000..6001f3a Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/newly_protrait_rotateCenterButtonImage_normal.imageset/圆形.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/.svn/all-wcprops new file mode 100644 index 0000000..f7c1796 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 228 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_down_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 242 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_down_5_5.imageset/Contents.json +END +yt_bg_left@3x.png +K 25 +svn:wc:ra_dav:version-url +V 246 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_down_5_5.imageset/yt_bg_left@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/.svn/entries new file mode 100644 index 0000000..048fb19 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_down_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:49.000000Z +07c1375d75b4e7e24c07d528d23494c1 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +310 + +yt_bg_left@3x.png +file + + + + +2018-01-29T02:36:49.000000Z +5e7f5c89bf7bbd758a108995aee38615 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +23021 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/Contents.json new file mode 100644 index 0000000..85cc4a8 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "yt_bg_left@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/yt_bg_left@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/yt_bg_left@3x.png new file mode 100644 index 0000000..fb1f2f5 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_down.imageset/yt_bg_left@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/.svn/all-wcprops new file mode 100644 index 0000000..8cfcf2d --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 228 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_left_5_5.imageset +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 242 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_left_5_5.imageset/Contents.json +END +yt_bg_down@3x.png +K 25 +svn:wc:ra_dav:version-url +V 246 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_left_5_5.imageset/yt_bg_down@3x.png +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/.svn/entries new file mode 100644 index 0000000..6407161 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_left_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +Contents.json +file + + + + +2018-01-29T02:36:43.000000Z +5a82ed4c1391f747bcb819e4e95d03d2 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +310 + +yt_bg_down@3x.png +file + + + + +2018-01-29T02:36:43.000000Z +5ef8154e0cbaa7eb76215f34cc745456 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +28855 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/Contents.json new file mode 100644 index 0000000..ef54b24 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "yt_bg_down@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/yt_bg_down@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/yt_bg_down@3x.png new file mode 100644 index 0000000..ba10b01 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_left.imageset/yt_bg_down@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/.svn/all-wcprops new file mode 100644 index 0000000..60200ab --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 229 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_right_5_5.imageset +END +yt_bg_right@3x.png +K 25 +svn:wc:ra_dav:version-url +V 248 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_right_5_5.imageset/yt_bg_right@3x.png +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 243 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_right_5_5.imageset/Contents.json +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/.svn/entries new file mode 100644 index 0000000..8a681d0 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_right_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +yt_bg_right@3x.png +file + + + + +2018-01-29T02:36:32.000000Z +01cf33a34d8e548ea133fb04125bdf44 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +28686 + +Contents.json +file + + + + +2018-01-29T02:36:32.000000Z +95693aa30fc55c04bf3f35852e435671 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +311 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/Contents.json new file mode 100644 index 0000000..e898061 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "yt_bg_right@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/yt_bg_right@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/yt_bg_right@3x.png new file mode 100644 index 0000000..780e40e Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_right.imageset/yt_bg_right@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/.svn/all-wcprops new file mode 100644 index 0000000..8c2d72f --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 226 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_up_5_5.imageset +END +yt_bg_top@3x.png +K 25 +svn:wc:ra_dav:version-url +V 243 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_up_5_5.imageset/yt_bg_top@3x.png +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_up_5_5.imageset/Contents.json +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/.svn/entries new file mode 100644 index 0000000..92ea1ab --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_active_up_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +yt_bg_top@3x.png +file + + + + +2018-01-29T02:36:55.000000Z +9dd061fe61138231ea440c6886e8de94 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +23553 + +Contents.json +file + + + + +2018-01-29T02:36:55.000000Z +199b3773f7814ac0adf29ab59068050c +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +309 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/Contents.json new file mode 100644 index 0000000..d15e32f --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "yt_bg_top@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/yt_bg_top@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/yt_bg_top@3x.png new file mode 100644 index 0000000..d4700ce Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_active_up.imageset/yt_bg_top@3x.png differ diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/.svn/all-wcprops b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/.svn/all-wcprops new file mode 100644 index 0000000..5583a79 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/.svn/all-wcprops @@ -0,0 +1,17 @@ +K 25 +svn:wc:ra_dav:version-url +V 223 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_normal_5_5.imageset +END +yt_bg_nor@3x.png +K 25 +svn:wc:ra_dav:version-url +V 240 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_normal_5_5.imageset/yt_bg_nor@3x.png +END +Contents.json +K 25 +svn:wc:ra_dav:version-url +V 237 +/svn/tccloudvideo/!svn/ver/9434/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_normal_5_5.imageset/Contents.json +END diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/.svn/entries b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/.svn/entries new file mode 100644 index 0000000..6ece625 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/.svn/entries @@ -0,0 +1,96 @@ +10 + +dir +11290 +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo/04.SRC/mobile/iOS/LVCloudCamera/branches/4.1.4/LVCloudCamera/Module/CloudGradleRatateCircleView/LVCloudGradleRotateImageAsset.xcassets/newly_protrait_rotateBackgroundImage_normal_5_5.imageset +http://pengcl1@124.127.40.157:1035/svn/tccloudvideo + + + +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + +14bc015a-2994-4a5f-aa75-843653ab7711 + +yt_bg_nor@3x.png +file + + + + +2018-01-29T02:36:43.000000Z +f1758b6ac02de424da679e90438e35d8 +2017-10-25T09:41:14.985349Z +9434 +pengcl1 +has-props + + + + + + + + + + + + + + + + + + + + +7436 + +Contents.json +file + + + + +2018-01-29T02:36:43.000000Z +11db5b984a4277368da3643ac048858e +2017-10-25T09:41:14.985349Z +9434 +pengcl1 + + + + + + + + + + + + + + + + + + + + + +309 + diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/Contents.json b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/Contents.json new file mode 100644 index 0000000..cbfc053 --- /dev/null +++ b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "yt_bg_nor@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/yt_bg_nor@3x.png b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/yt_bg_nor@3x.png new file mode 100644 index 0000000..c2b58a1 Binary files /dev/null and b/Ifish/ZLRocker/ELPCircleRotateImageAsset.xcassets/protrait_ConsoleBackgroundImage_normal.imageset/yt_bg_nor@3x.png differ diff --git a/Ifish/ZLRocker/UIView+Sizes.h b/Ifish/ZLRocker/UIView+Sizes.h new file mode 100755 index 0000000..da65970 --- /dev/null +++ b/Ifish/ZLRocker/UIView+Sizes.h @@ -0,0 +1,90 @@ +/* + * RNSwipeViewController + * + * Created by Ryan Nystrom on 10/2/12. + * Copyright (c) 2012 Ryan Nystrom. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#import + +/** Helps clean up code for changing UIView frames. + + Instead of creating a CGRect struct, changing properties and reassigning. For example, moving a UIView newX points to the left: + + CGRect frame = view.frame; + frame.origin x = (CGFloat)newX + view.frame.size.width; + view.frame = frame; + + This can be cleaned up to: + + view.left += newX; + + Properties bottom and right also take into account the width of the UIView. + */ +@interface UIView (Sizes) + +///--------------------------------------------------------------------------------------- +/// @name Edges +///--------------------------------------------------------------------------------------- + +/** Get the left point of a view. */ +@property (nonatomic) CGFloat left; + +/** Get the top point of a view. */ +@property (nonatomic) CGFloat top; + +/** Get the right point of a view. */ +@property (nonatomic) CGFloat right; + +/** Get the bottom point of a view. */ +@property (nonatomic) CGFloat bottom; + +///--------------------------------------------------------------------------------------- +/// @name Dimensions +///--------------------------------------------------------------------------------------- + +/** Get the width of a view. */ +@property (nonatomic) CGFloat width; + +/** Get the height of a view. */ +@property (nonatomic) CGFloat height; + +///--------------------------------------------------------------------------------------- +/// @name Quick Access +///--------------------------------------------------------------------------------------- + +/** Get the origin of a view. */ +@property (nonatomic) CGPoint origin; + +/** Get the size of a view. */ +@property (nonatomic) CGSize size; + +///--------------------------------------------------------------------------------------- +/// @name Center +///--------------------------------------------------------------------------------------- + +/** Get the center.x of a view. */ +@property (nonatomic) CGFloat centerX; + +/** Get the center.y of a view. */ +@property (nonatomic) CGFloat centerY; + +@end diff --git a/Ifish/ZLRocker/UIView+Sizes.m b/Ifish/ZLRocker/UIView+Sizes.m new file mode 100755 index 0000000..15ad3e0 --- /dev/null +++ b/Ifish/ZLRocker/UIView+Sizes.m @@ -0,0 +1,135 @@ +/* + * RNSwipeViewController + * + * Created by Ryan Nystrom on 10/2/12. + * Copyright (c) 2012 Ryan Nystrom. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#import "UIView+Sizes.h" + +@implementation UIView (Sizes) + + +#pragma mark - Edges + +- (CGFloat)left { + return self.frame.origin.x; +} + +- (void)setLeft:(CGFloat)x { + CGRect frame = self.frame; + frame.origin.x = x; + self.frame = frame; +} + +- (CGFloat)top { + return self.frame.origin.y; +} + +- (void)setTop:(CGFloat)y { + CGRect frame = self.frame; + frame.origin.y = y; + self.frame = frame; +} + +- (CGFloat)right { + return self.frame.origin.x + self.frame.size.width; +} + +- (void)setRight:(CGFloat)right { + CGRect frame = self.frame; + frame.origin.x = right - frame.size.width; + self.frame = frame; +} + +- (CGFloat)bottom { + return self.frame.origin.y + self.frame.size.height; +} + +- (void)setBottom:(CGFloat)bottom { + CGRect frame = self.frame; + frame.origin.y = bottom - frame.size.height; + self.frame = frame; +} + +#pragma mark - Dimensions + +- (CGFloat)width { + return self.frame.size.width; +} + +- (void)setWidth:(CGFloat)width { + CGRect frame = self.frame; + frame.size.width = width; + self.frame = frame; +} + +- (CGFloat)height { + return self.frame.size.height; +} + +- (void)setHeight:(CGFloat)height { + CGRect frame = self.frame; + frame.size.height = height; + self.frame = frame; +} + +#pragma mark - Quick Access + +- (CGPoint)origin { + return self.frame.origin; +} + +- (void)setOrigin:(CGPoint)origin { + CGRect frame = self.frame; + frame.origin = origin; + self.frame = frame; +} + +- (CGSize)size { + return self.frame.size; +} + +- (void)setSize:(CGSize)size { + CGRect frame = self.frame; + frame.size = size; + self.frame = frame; +} + +#pragma mark - Center + +- (CGFloat)centerX{ + return self.center.x; +} + +- (void)setCenterX:(CGFloat)centerX{ + self.center = CGPointMake(centerX, self.center.y); +} + +- (CGFloat)centerY{ + return self.center.y; +} + +- (void)setCenterY:(CGFloat)centerY{ + self.center = CGPointMake(self.center.x, centerY); +} + +@end diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index 66cbcf1..6fa44d1 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -65,8 +65,9 @@ #import "Xuanduo2SettingController.h" #import "MessageAlertView.h" #import "CreatErWeiMaController.h" +#import "ELPCircleConsoleView.h" //上部分视频封装 下部分分段控制器 封装 （下一步代码优化） -@interface IfishP2PMonitorController () +@interface IfishP2PMonitorController () { CGFloat _horizontalScreenH; CGFloat _monitorInterfaceW;//rtsp监控界面弹出修改 @@ -107,6 +108,7 @@ Strong MessageAlertView *popView; @property (strong, nonatomic) UIView *shutterView; @property(nonatomic,strong) HaveHotCoolWenDuPicview *xuanduoPicView; +@property(nonatomic,strong) ELPCircleConsoleView *directionView; Weak UIView *remoteView;//显示player的载体 Strong UIImage *screenShotImage;//截图 @end @@ -485,6 +487,19 @@ Strong UIImage *screenShotImage;//截图 promptButton.tag = PROMPT_BUTTON_TAG; [promptButton addTarget:self action:@selector(onVerticalBtnPress:) forControlEvents:UIControlEventTouchUpInside]; [self.canvasView addSubview:promptButton]; + self.directionView=[[ELPCircleConsoleView alloc]init]; + self.directionView.frame=CGRectMake(0, 0, 200, 200); + self.directionView.delegate=self; + [self.canvasView addSubview:self.directionView]; + self.directionView.center=self.canvasView.center; + self.directionView.hidden=YES; + //self.directionView.image=LXImageWithImageName(@"equipment_iocn_joystick"); + +// [self.directionView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.center.mas_equalTo(self.canvasView); +// make.width.mas_equalTo(200); +// make.height.mas_equalTo(200); +// }]; self.promptButton = promptButton; //图片frame CGFloat progressView_wh = LOADINGPRESSVIEW_WIDTH_HEIGHT; @@ -520,7 +535,7 @@ Strong UIImage *screenShotImage;//截图 [pressView setHidden:YES]; self.pressView = pressView; - + [self.canvasView bringSubviewToFront:self.directionView]; //、横屏工具栏 CGFloat midtH=self.canvasView.frame.size.height/5; @@ -717,6 +732,37 @@ Strong UIImage *screenShotImage;//截图 [self.popView loadInfoWithTitle:titles Icons:titleImgs]; } +#pragma mark - 方向控制 +-(void)rotateCircleView:(ELPCircleConsoleView *)rotetaCircleView didRotateWithValueX:(NSString *)Xstr valueY:(NSString *)Ystr stop:(BOOL)needStop moveDirection:(ELPCircleConsoleMoveDirection)orientation{ + + //TODO for your own action method + if(orientation == ELPCircleConsoleMoveDirectionUp){ + [self.player p2pTurnDirection:GWP2PPTZDirectionUp]; + } + else if(orientation == ELPCircleConsoleMoveDirectionDown){ + [self.player p2pTurnDirection:GWP2PPTZDirectionDown]; + } + else if(orientation == ELPCircleConsoleMoveDirectionLeft){ + [self.player p2pTurnDirection:GWP2PPTZDirectionLeft]; + } + else if(orientation == ELPCircleConsoleMoveDirectionRight){ + [self.player p2pTurnDirection:GWP2PPTZDirectionRight]; + + } + else if(orientation == ELPCircleConsoleMoveDirectionUpStop){ + [self.player p2pTurnDirection:GWP2PPTZDirectionUp]; + } + else if(orientation == ELPCircleConsoleMoveDirectionDownStop){ + [self.player p2pTurnDirection:GWP2PPTZDirectionDown]; + } + else if(orientation == ELPCircleConsoleMoveDirectionLeftStop){ + [self.player p2pTurnDirection:GWP2PPTZDirectionLeft]; + } + else if(orientation == ELPCircleConsoleMoveDirectionRightStop){ + [self.player p2pTurnDirection:GWP2PPTZDirectionRight]; + } +} + //判断摄像头是否有关系设备 #pragma mark - 判断摄像头是否有关系设备 @@ -3001,6 +3047,8 @@ GWP2PCallErrorNotSupport, [self didHiddenResolutionInterface]; } + +#pragma mark - 自带方向滑动 //上滑动 - (void)swipeUp:(id)sender { @@ -3481,6 +3529,9 @@ GWP2PCallErrorNotSupport, self.promptButton.frame = CGRectMake(0.0, 0.0, self.canvasView.frame.size.width, self.canvasView.frame.size.height); //上面的canvasView重新add了remoteView [self.canvasView bringSubviewToFront:self.promptButton]; + self.directionView.center=self.canvasView.center; + [self.canvasView bringSubviewToFront:self.directionView]; + //旋转图片 CGFloat tipHeight = LOADINGPRESSVIEW_WIDTH_HEIGHT; self.yProgressView.frame = CGRectMake((self.canvasView.frame.size.width-LOADINGPRESSVIEW_WIDTH_HEIGHT)/2, (self.canvasView.frame.size.height-tipHeight)/2, LOADINGPRESSVIEW_WIDTH_HEIGHT, LOADINGPRESSVIEW_WIDTH_HEIGHT); @@ -3595,8 +3646,8 @@ GWP2PCallErrorNotSupport, //左边的按住说话弹出的声音图标 //进入横屏时，调整frame self.pressView.frame = CGRectMake(10, height-PRESS_LAYOUT_WIDTH_AND_HEIGHT-BOTTOM_BAR_HEIGHT, PRESS_LAYOUT_WIDTH_AND_HEIGHT/2, PRESS_LAYOUT_WIDTH_AND_HEIGHT); - - + self.directionView.center=self.canvasView.center; + [self.canvasView bringSubviewToFront:self.directionView]; //设置横屏底部工具栏5秒隐藏 [self hideBootommViewAfterSecondes]; @@ -4586,6 +4637,10 @@ GWP2PCallErrorNotSupport, [self.navigationController pushViewController:cameraShopVC animated:YES]; } + else if (indexPath.row ==8) + { + self.directionView.hidden=!self.directionView.isHidden; + } } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m index 90c4170..f8fc251 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishcameraBottomHView/CameraBottomHView.m @@ -68,10 +68,10 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell"; ////录制回放功能打开 //_dataImgArray = @[LXImageWithImageName(@"devicename_iocn_screenshots.png"),LXImageWithImageName(@"devicename_iocn_gallery.png"),LXImageWithImageName(@"devicename_iocn_rec.png"),LXImageWithImageName(@"devicename_iocn_playback.png"),LXImageWithImageName(@"devicename_iocn_care.png"),LXImageWithImageName(@"devicename_iocn_look.png"),LXImageWithImageName(@"devicename_iocn_Ilookat.png"),LXImageWithImageName(@"devicename_iocn_look.png"),LXImageWithImageName(@"devicename_iocn_look.png")]; //equipment_iocn_playback - _dataImgArray = @[LXImageWithImageName(@"equipment_iocn_printscreen"),LXImageWithImageName(@"equipment_iocn_gallery"),LXImageWithImageName(@"equipment_iocn_care"),LXImageWithImageName(@"equipment_iocn_look"),LXImageWithImageName(@"equipment_iocn_mylook"),LXImageWithImageName(@"equipment_iocn_share"),LXImageWithImageName(@"equipment_iocn_videorecord"),LXImageWithImageName(@"equipment_iocn_videoback")]; + _dataImgArray = @[LXImageWithImageName(@"equipment_iocn_printscreen"),LXImageWithImageName(@"equipment_iocn_gallery"),LXImageWithImageName(@"equipment_iocn_care"),LXImageWithImageName(@"equipment_iocn_look"),LXImageWithImageName(@"equipment_iocn_mylook"),LXImageWithImageName(@"equipment_iocn_share"),LXImageWithImageName(@"equipment_iocn_videorecord"),LXImageWithImageName(@"equipment_iocn_videoback"),LXImageWithImageName(@"equipment_iocn_joystickicon")]; //_dataNameArray = @[@"截图",@"图库",@"录制",@"回放",@"我的看护",@"爱鱼看看",@"我的看看",@"",@""]; - _dataNameArray = @[@"截图",@"图库",@"我的看护",@"爱鱼看看",@"我的看看",@"分享爱鱼奇",@"视频录制",@"视频回放"]; + _dataNameArray = @[@"截图",@"图库",@"我的看护",@"爱鱼看看",@"我的看看",@"分享爱鱼奇",@"视频录制",@"视频回放",@"方向控制"]; } #pragma mark - UICollectionViewDataSource @@ -84,7 +84,7 @@ static NSString *bootomRecCellIdentifier = @"IfishRecVideoViewCell"; - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ //return 9; - return 8; + return 9; } #pragma mark 设置item内容 diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/equipment_iocn_joystick.png b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/equipment_iocn_joystick.png new file mode 100644 index 0000000..b938e1f Binary files /dev/null and b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/equipment_iocn_joystick.png differ diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/equipment_iocn_joystickicon.png b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/equipment_iocn_joystickicon.png new file mode 100644 index 0000000..7346021 Binary files /dev/null and b/Ifish/controllers/IfishYooseeFile/IfishYooseeSource/IFISHYooseeImg.bundle/images/equipment_iocn_joystickicon.png differ