-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tapd : http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192859882785 设计图:https://codesign.qq.com/s/x1DWk9JNgl9GnMm Change-Id: Id5982510430e62f2c7768a8d6ae577154a3ad577
- Loading branch information
ccharlesren
committed
Nov 3, 2020
1 parent
070fc3a
commit a580445
Showing
30 changed files
with
548 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} | ||
} |
22 changes: 22 additions & 0 deletions
22
Source/LinkApp/Assets.xcassets/common/addIntelligent_Device.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "addIntelligent_Device@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "addIntelligent_Device@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+4.58 KB
...ets.xcassets/common/addIntelligent_Device.imageset/addIntelligent_Device@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.73 KB
...ets.xcassets/common/addIntelligent_Device.imageset/addIntelligent_Device@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Source/LinkApp/Assets.xcassets/common/empty_noTask.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "empty_noTask@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "empty_noTask@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+56.6 KB
Source/LinkApp/Assets.xcassets/common/empty_noTask.imageset/empty_noTask@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+95.7 KB
Source/LinkApp/Assets.xcassets/common/empty_noTask.imageset/empty_noTask@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Source/LinkApp/Assets.xcassets/common/empty_placeHold.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "empty_placeHold@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "empty_placeHold@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+59.8 KB
.../LinkApp/Assets.xcassets/common/empty_placeHold.imageset/empty_placeHold@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+107 KB
.../LinkApp/Assets.xcassets/common/empty_placeHold.imageset/empty_placeHold@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Source/LinkApp/Assets.xcassets/common/intelligentDefaultTabbar.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "intelligentDefaultTabbar@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "intelligentDefaultTabbar@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+3.58 KB
...assets/common/intelligentDefaultTabbar.imageset/intelligentDefaultTabbar@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.64 KB
...assets/common/intelligentDefaultTabbar.imageset/intelligentDefaultTabbar@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Source/LinkApp/Assets.xcassets/common/intelligentSelectTabbar.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "intelligentSelectTabbar@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "intelligentSelectTabbar@3x.png", | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+4.27 KB
...xcassets/common/intelligentSelectTabbar.imageset/intelligentSelectTabbar@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.06 KB
...xcassets/common/intelligentSelectTabbar.imageset/intelligentSelectTabbar@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions
18
Source/LinkApp/Classes/AppConfig/AppUIConfig/TIoTCustomSheetView.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
// | ||
// TIoTCustomSheetView.h | ||
// LinkApp | ||
// | ||
// Created by ccharlesren on 2020/11/2. | ||
// Copyright © 2020 Tencent. All rights reserved. | ||
// | ||
|
||
#import <UIKit/UIKit.h> | ||
|
||
NS_ASSUME_NONNULL_BEGIN | ||
|
||
@interface TIoTCustomSheetView : UIView | ||
|
||
|
||
@end | ||
|
||
NS_ASSUME_NONNULL_END |
106 changes: 106 additions & 0 deletions
106
Source/LinkApp/Classes/AppConfig/AppUIConfig/TIoTCustomSheetView.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
// | ||
// TIoTCustomSheetView.m | ||
// LinkApp | ||
// | ||
// Created by ccharlesren on 2020/11/2. | ||
// Copyright © 2020 Tencent. All rights reserved. | ||
// | ||
|
||
#import "TIoTCustomSheetView.h" | ||
#import "UIView+XDPExtension.h" | ||
|
||
@interface TIoTCustomSheetView () | ||
@property (nonatomic, strong) UIView *bottomView; | ||
@property (nonatomic, strong) UIView *actionBottomView; | ||
@property (nonatomic, strong) UIView *upperPartContentView; | ||
@property (nonatomic, strong) UIView *lowerPartContentView; | ||
@end | ||
|
||
@implementation TIoTCustomSheetView | ||
|
||
- (instancetype)initWithFrame:(CGRect)frame { | ||
self = [super initWithFrame:frame]; | ||
if (self) { | ||
[self setupSubViews]; | ||
} | ||
return self; | ||
} | ||
|
||
- (void)setupSubViews { | ||
|
||
CGFloat kInterval = 15; | ||
CGFloat kHeightWidth = 50; | ||
CGFloat kActionBottonHeight = 175; | ||
if (@available(iOS 11.0, *)) { | ||
kActionBottonHeight = kActionBottonHeight + [UIApplication sharedApplication].delegate.window.safeAreaInsets.bottom; | ||
} | ||
|
||
UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(dismissView)]; | ||
[self addGestureRecognizer:tapGesture]; | ||
|
||
|
||
[self addSubview:self.bottomView]; | ||
[self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { | ||
make.top.leading.right.bottom.equalTo(self); | ||
}]; | ||
|
||
[self.bottomView addSubview:self.actionBottomView]; | ||
[self.actionBottomView mas_makeConstraints:^(MASConstraintMaker *make) { | ||
make.right.bottom.left.equalTo(self); | ||
make.height.mas_equalTo(kActionBottonHeight); | ||
}]; | ||
|
||
[self changeViewRectConnerWithView:self.actionBottomView withRect:CGRectMake(0, 0, kScreenWidth, kActionBottonHeight) roundCorner:UIRectCornerTopLeft|UIRectCornerTopRight withRadius:CGSizeMake(12, 12)]; | ||
|
||
} | ||
|
||
- (void)dismissView { | ||
[self dismissSharedView]; | ||
} | ||
|
||
- (void)dismissSharedView { | ||
[self removeFromSuperview]; | ||
} | ||
|
||
#pragma mark - lazy load | ||
- (UIView *)bottomView { | ||
if (!_bottomView) { | ||
_bottomView = [[UIView alloc]init]; | ||
_bottomView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5]; | ||
} | ||
return _bottomView; | ||
} | ||
|
||
- (UIView *)actionBottomView { | ||
if (!_actionBottomView) { | ||
_actionBottomView = [[UIView alloc]init]; | ||
_actionBottomView.backgroundColor = [UIColor whiteColor]; | ||
} | ||
return _actionBottomView; | ||
} | ||
|
||
- (UIView *)upperPartContentView { | ||
if (!_upperPartContentView) { | ||
_upperPartContentView = [[UIView alloc]init]; | ||
_upperPartContentView.backgroundColor = [UIColor whiteColor]; | ||
} | ||
return _upperPartContentView; | ||
} | ||
|
||
- (UIView *)lowerPartContentView { | ||
if (!_lowerPartContentView) { | ||
_lowerPartContentView = [[UIView alloc]init]; | ||
_lowerPartContentView.backgroundColor = [UIColor whiteColor]; | ||
} | ||
return _lowerPartContentView; | ||
} | ||
|
||
/* | ||
// Only override drawRect: if you perform custom drawing. | ||
// An empty implementation adversely affects performance during animation. | ||
- (void)drawRect:(CGRect)rect { | ||
// Drawing code | ||
} | ||
*/ | ||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.