Skip to content

Commit 30c3ad6

Browse files
committed
App Store V1.3.1
1 parent 3727152 commit 30c3ad6

21 files changed

+42
-41
lines changed

EspBlufi.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@
10361036
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10371037
CODE_SIGN_ENTITLEMENTS = EspBlufi/EspBlufi.entitlements;
10381038
CODE_SIGN_STYLE = Automatic;
1039-
CURRENT_PROJECT_VERSION = 0.1.6;
1039+
CURRENT_PROJECT_VERSION = 0.4.0;
10401040
DEVELOPMENT_TEAM = QWXF6GB4AV;
10411041
ENABLE_BITCODE = NO;
10421042
GCC_PREFIX_HEADER = "$(SRCROOT)/EspBlufi/ESPPch/PrefixHeader.pch";
@@ -1051,7 +1051,7 @@
10511051
"$(inherited)",
10521052
"$(PROJECT_DIR)/BlufiLibrary/Security/openssl",
10531053
);
1054-
MARKETING_VERSION = 1.2.0;
1054+
MARKETING_VERSION = 1.3.1;
10551055
PRODUCT_BUNDLE_IDENTIFIER = com.espressif.EspBlufi;
10561056
PRODUCT_NAME = "$(TARGET_NAME)";
10571057
TARGETED_DEVICE_FAMILY = 1;
@@ -1064,7 +1064,7 @@
10641064
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10651065
CODE_SIGN_ENTITLEMENTS = EspBlufi/EspBlufi.entitlements;
10661066
CODE_SIGN_STYLE = Automatic;
1067-
CURRENT_PROJECT_VERSION = 0.1.6;
1067+
CURRENT_PROJECT_VERSION = 0.4.0;
10681068
DEVELOPMENT_TEAM = QWXF6GB4AV;
10691069
ENABLE_BITCODE = NO;
10701070
GCC_PREFIX_HEADER = "$(SRCROOT)/EspBlufi/ESPPch/PrefixHeader.pch";
@@ -1079,7 +1079,7 @@
10791079
"$(inherited)",
10801080
"$(PROJECT_DIR)/BlufiLibrary/Security/openssl",
10811081
);
1082-
MARKETING_VERSION = 1.2.0;
1082+
MARKETING_VERSION = 1.3.1;
10831083
PRODUCT_BUNDLE_IDENTIFIER = com.espressif.EspBlufi;
10841084
PRODUCT_NAME = "$(TARGET_NAME)";
10851085
TARGETED_DEVICE_FAMILY = 1;
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
{
22
"images" : [
33
{
4-
"size" : "20x20",
4+
"filename" : "40画板 1.png",
55
"idiom" : "iphone",
6-
"filename" : "ic_launcher 2-1.png",
7-
"scale" : "2x"
6+
"scale" : "2x",
7+
"size" : "20x20"
88
},
99
{
10-
"size" : "20x20",
10+
"filename" : "60画板 1.png",
1111
"idiom" : "iphone",
12-
"filename" : "ic_launcher 3.png",
13-
"scale" : "3x"
12+
"scale" : "3x",
13+
"size" : "20x20"
1414
},
1515
{
16-
"size" : "29x29",
16+
"filename" : "58画板 1.png",
1717
"idiom" : "iphone",
18-
"filename" : "ic_launcher 3-1.png",
19-
"scale" : "2x"
18+
"scale" : "2x",
19+
"size" : "29x29"
2020
},
2121
{
22-
"size" : "29x29",
22+
"filename" : "87画板 1.png",
2323
"idiom" : "iphone",
24-
"filename" : "ic_launcher 4.png",
25-
"scale" : "3x"
24+
"scale" : "3x",
25+
"size" : "29x29"
2626
},
2727
{
28-
"size" : "40x40",
28+
"filename" : "80画板 1.png",
2929
"idiom" : "iphone",
30-
"filename" : "ic_launcher 4-1.png",
31-
"scale" : "2x"
30+
"scale" : "2x",
31+
"size" : "40x40"
3232
},
3333
{
34-
"size" : "40x40",
34+
"filename" : "120画板 1.png",
3535
"idiom" : "iphone",
36-
"filename" : "ic_launcher 5.png",
37-
"scale" : "3x"
36+
"scale" : "3x",
37+
"size" : "40x40"
3838
},
3939
{
40-
"size" : "60x60",
40+
"filename" : "120画板 1-1.png",
4141
"idiom" : "iphone",
42-
"filename" : "ic_launcher 2.png",
43-
"scale" : "2x"
42+
"scale" : "2x",
43+
"size" : "60x60"
4444
},
4545
{
46-
"size" : "60x60",
46+
"filename" : "180画板 1.png",
4747
"idiom" : "iphone",
48-
"filename" : "ic_launcher 2-2.png",
49-
"scale" : "3x"
48+
"scale" : "3x",
49+
"size" : "60x60"
5050
},
5151
{
52-
"size" : "1024x1024",
52+
"filename" : "1024-0画板 1.png",
5353
"idiom" : "ios-marketing",
54-
"filename" : "1024*1024.jpg",
55-
"scale" : "1x"
54+
"scale" : "1x",
55+
"size" : "1024x1024"
5656
}
5757
],
5858
"info" : {
59-
"version" : 1,
60-
"author" : "xcode"
59+
"author" : "xcode",
60+
"version" : 1
6161
}
62-
}
62+
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

EspBlufi/ESPUI/PickerChoiceView.m

+8-7
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ - (instancetype)initWithFrame:(CGRect)frame{
124124
//选择器
125125
self.pickerV = [[UIPickerView alloc]init];
126126
self.pickerV.backgroundColor = UICOLOR_RGBA(248, 248, 248, 1);
127+
self.pickerV.delegate = self;
128+
self.pickerV.dataSource = self;
127129
[self.bgV addSubview:self.pickerV];
128130
[self.pickerV mas_makeConstraints:^(MASConstraintMaker *make) {
129131

@@ -133,11 +135,6 @@ - (instancetype)initWithFrame:(CGRect)frame{
133135
make.right.mas_equalTo(0);
134136

135137
}];
136-
self.pickerV.delegate = self;
137-
self.pickerV.dataSource = self;
138-
139-
140-
141138
}
142139
return self;
143140
}
@@ -528,8 +525,12 @@ - (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSIn
528525

529526
- (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{
530527

531-
((UIView *)[pickerView.subviews objectAtIndex:1]).backgroundColor = [UIColor lightGrayColor];
532-
((UIView *)[pickerView.subviews objectAtIndex:2]).backgroundColor = [UIColor lightGrayColor];
528+
if (@available(iOS 14.0, *)) {
529+
((UIView *)[pickerView.subviews objectAtIndex:0]).backgroundColor = [UIColor clearColor];
530+
} else {
531+
((UIView *)[pickerView.subviews objectAtIndex:1]).backgroundColor = [UIColor lightGrayColor];
532+
((UIView *)[pickerView.subviews objectAtIndex:2]).backgroundColor = [UIColor lightGrayColor];
533+
}
533534

534535
UILabel *label = [[UILabel alloc] init];
535536
label.textAlignment = NSTextAlignmentCenter;

0 commit comments

Comments
 (0)