Skip to content

Commit d3d935a

Browse files
mgfjxmgfjx
committed
2.1.1
1 parent 0a5f150 commit d3d935a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+404
-136
lines changed

‎JAVBus.xcodeproj/project.pbxproj

+36-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
/* Begin PBXBuildFile section */
1010
20FA9D8906F3E0738C121653 /* libPods-JAVBus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4355E13C10486BC7E5DF018B /* libPods-JAVBus.a */; };
1111
2D44C94825D5212D005E7AE3 /* TagLinkListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D44C94725D5212D005E7AE3 /* TagLinkListController.m */; };
12+
2D44FC3125E36964001BCC6F /* UIImageView+Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D44FC3025E36964001BCC6F /* UIImageView+Runtime.m */; };
1213
2D49EC3025D39C0700B2A7E6 /* BaseItemListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D49EC2F25D39C0700B2A7E6 /* BaseItemListController.m */; };
14+
2DC277C625F1809100D03413 /* test.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DC277C525F1809100D03413 /* test.swift */; };
15+
2DC277C825F1810800D03413 /* UIColor+Dark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DC277C725F1810800D03413 /* UIColor+Dark.swift */; };
16+
2DDD83DD266D1D2300A04D66 /* NetImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DDD83DC266D1D2300A04D66 /* NetImageView.m */; };
1317
9A4B0DA3D54BB094B29C64D5 /* libPods-JAVBusUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8115FEBAB3603AB5CB74D91E /* libPods-JAVBusUITests.a */; };
1418
AFBB54BCC9FC8A3F8371087C /* libPods-JAVBusTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B086890A2D06BA45EF4AAC7C /* libPods-JAVBusTests.a */; };
1519
EC0BC44321C2394900A6E50E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EC0BC44221C2394900A6E50E /* AppDelegate.m */; };
@@ -129,8 +133,15 @@
129133
/* Begin PBXFileReference section */
130134
2D44C94625D5212D005E7AE3 /* TagLinkListController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TagLinkListController.h; sourceTree = "<group>"; };
131135
2D44C94725D5212D005E7AE3 /* TagLinkListController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TagLinkListController.m; sourceTree = "<group>"; };
136+
2D44FC2F25E36964001BCC6F /* UIImageView+Runtime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImageView+Runtime.h"; sourceTree = "<group>"; };
137+
2D44FC3025E36964001BCC6F /* UIImageView+Runtime.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+Runtime.m"; sourceTree = "<group>"; };
132138
2D49EC2E25D39C0700B2A7E6 /* BaseItemListController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseItemListController.h; sourceTree = "<group>"; };
133139
2D49EC2F25D39C0700B2A7E6 /* BaseItemListController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseItemListController.m; sourceTree = "<group>"; };
140+
2DC277C425F1809000D03413 /* JAVBus-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JAVBus-Bridging-Header.h"; sourceTree = "<group>"; };
141+
2DC277C525F1809100D03413 /* test.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = test.swift; sourceTree = "<group>"; };
142+
2DC277C725F1810800D03413 /* UIColor+Dark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Dark.swift"; sourceTree = "<group>"; };
143+
2DDD83DB266D1D2300A04D66 /* NetImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetImageView.h; sourceTree = "<group>"; };
144+
2DDD83DC266D1D2300A04D66 /* NetImageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NetImageView.m; sourceTree = "<group>"; };
134145
40ED61FAFF4ADBE0F300A854 /* Pods-JAVBusTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JAVBusTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JAVBusTests/Pods-JAVBusTests.release.xcconfig"; sourceTree = "<group>"; };
135146
4355E13C10486BC7E5DF018B /* libPods-JAVBus.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JAVBus.a"; sourceTree = BUILT_PRODUCTS_DIR; };
136147
5C70DFAD6B40A9D114CB27E7 /* Pods-JAVBusUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JAVBusUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JAVBusUITests/Pods-JAVBusUITests.release.xcconfig"; sourceTree = "<group>"; };
@@ -401,6 +412,7 @@
401412
isa = PBXGroup;
402413
children = (
403414
EC0BC47B21C2587900A6E50E /* PrefixHeader.pch */,
415+
2DC277C525F1809100D03413 /* test.swift */,
404416
EC0BC47C21C259E200A6E50E /* Defines */,
405417
EC0BC47F21C25B5000A6E50E /* Category */,
406418
ECA79166241613E600EDFF51 /* Common */,
@@ -420,6 +432,7 @@
420432
EC0BC44C21C2394B00A6E50E /* LaunchScreen.storyboard */,
421433
EC0BC44F21C2394B00A6E50E /* Info.plist */,
422434
EC0BC45021C2394B00A6E50E /* main.m */,
435+
2DC277C425F1809000D03413 /* JAVBus-Bridging-Header.h */,
423436
);
424437
path = JAVBus;
425438
sourceTree = "<group>";
@@ -459,6 +472,7 @@
459472
EC0BC48221C25B5000A6E50E /* NSString+XExtend.m */,
460473
EC0BC48C21C25B5000A6E50E /* UIColor+Hex.h */,
461474
EC0BC48321C25B5000A6E50E /* UIColor+Hex.m */,
475+
2DC277C725F1810800D03413 /* UIColor+Dark.swift */,
462476
EC0BC48621C25B5000A6E50E /* SQPrintJsonLog.h */,
463477
EC0BC48F21C25B5000A6E50E /* SQPrintJsonLog.m */,
464478
EC0BC49421C25B5000A6E50E /* NSObject+runtimeCopy.h */,
@@ -479,6 +493,8 @@
479493
EC0BC49521C25B5000A6E50E /* NSString+RegExp.m */,
480494
EC5F0590241D16590055B6B5 /* NSString+XLHelper.h */,
481495
EC5F0591241D16590055B6B5 /* NSString+XLHelper.m */,
496+
2D44FC2F25E36964001BCC6F /* UIImageView+Runtime.h */,
497+
2D44FC3025E36964001BCC6F /* UIImageView+Runtime.m */,
482498
);
483499
path = Category;
484500
sourceTree = "<group>";
@@ -601,6 +617,8 @@
601617
ECAE241B241A1B8A0050FA8A /* GGDriveFileCell.xib */,
602618
ECAE241E241A77A20050FA8A /* DropBoxManager.h */,
603619
ECAE241F241A77A20050FA8A /* DropBoxManager.m */,
620+
2DDD83DB266D1D2300A04D66 /* NetImageView.h */,
621+
2DDD83DC266D1D2300A04D66 /* NetImageView.m */,
604622
);
605623
path = Common;
606624
sourceTree = "<group>";
@@ -768,6 +786,7 @@
768786
TargetAttributes = {
769787
EC0BC43D21C2394900A6E50E = {
770788
CreatedOnToolsVersion = 9.3;
789+
LastSwiftMigration = 1240;
771790
};
772791
EC0BC45521C2394B00A6E50E = {
773792
CreatedOnToolsVersion = 9.3;
@@ -940,6 +959,7 @@
940959
ECCCE41C21E42F48006833FE /* MovieCachedController.m in Sources */,
941960
EC5F058F241D14C40055B6B5 /* MagneticModel.m in Sources */,
942961
EC0BC4BD21C2653500A6E50E /* NJKWebViewProgress.m in Sources */,
962+
2DC277C825F1810800D03413 /* UIColor+Dark.swift in Sources */,
943963
EC94A1FE21DCA1BA00C1BBCD /* ZHChineseConvert.m in Sources */,
944964
ECAE241C241A1B8A0050FA8A /* GGDriveFileCell.m in Sources */,
945965
EC94A1FB21DC52F000C1BBCD /* PublicDialogManager.m in Sources */,
@@ -960,7 +980,9 @@
960980
EC0BC49E21C25B5000A6E50E /* SQPrintJsonLog.m in Sources */,
961981
ECF9458F21D60AE00043E898 /* RecommendModel.m in Sources */,
962982
EC0BC4BE21C2653500A6E50E /* NJKWebViewProgressView.m in Sources */,
983+
2DC277C625F1809100D03413 /* test.swift in Sources */,
963984
EC0BC49D21C25B5000A6E50E /* UIAlertView+ActionBlock.m in Sources */,
985+
2DDD83DD266D1D2300A04D66 /* NetImageView.m in Sources */,
964986
ECD99AD921C697540043DB0C /* ActressDetailController.m in Sources */,
965987
ECD99AF021C7EDB90043DB0C /* MovieListModel.m in Sources */,
966988
EC73609721DA5C280031DFE0 /* ActressSearchCell.m in Sources */,
@@ -989,6 +1011,7 @@
9891011
ECD99AD621C6891A0043DB0C /* HtmlToJsonManager.m in Sources */,
9901012
EC0BC49721C25B5000A6E50E /* NSString+XExtend.m in Sources */,
9911013
EC0BC4A821C25DAB00A6E50E /* ActressCodeController.m in Sources */,
1014+
2D44FC3125E36964001BCC6F /* UIImageView+Runtime.m in Sources */,
9921015
ECF79B3321DDE2F7008C097D /* MovieCollectionController.m in Sources */,
9931016
ECD4F4FB241795AA0076269B /* GoogleSignInManager.m in Sources */,
9941017
ECA791692416141300EDFF51 /* VideoPlayerManager.m in Sources */,
@@ -1167,6 +1190,7 @@
11671190
buildSettings = {
11681191
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
11691192
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1193+
CLANG_ENABLE_MODULES = YES;
11701194
CODE_SIGN_STYLE = Automatic;
11711195
DEVELOPMENT_TEAM = CFSS55J6SN;
11721196
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1177,9 +1201,12 @@
11771201
"$(inherited)",
11781202
"@executable_path/Frameworks",
11791203
);
1180-
MARKETING_VERSION = 2.1.0;
1204+
MARKETING_VERSION = 2.1.1;
11811205
PRODUCT_BUNDLE_IDENTIFIER = com.xiexiaolong.JAVBus;
11821206
PRODUCT_NAME = "$(TARGET_NAME)";
1207+
SWIFT_OBJC_BRIDGING_HEADER = "JAVBus/JAVBus-Bridging-Header.h";
1208+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1209+
SWIFT_VERSION = 5.0;
11831210
TARGETED_DEVICE_FAMILY = "1,2";
11841211
};
11851212
name = Debug;
@@ -1190,6 +1217,7 @@
11901217
buildSettings = {
11911218
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
11921219
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1220+
CLANG_ENABLE_MODULES = YES;
11931221
CODE_SIGN_STYLE = Automatic;
11941222
DEVELOPMENT_TEAM = CFSS55J6SN;
11951223
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1200,9 +1228,11 @@
12001228
"$(inherited)",
12011229
"@executable_path/Frameworks",
12021230
);
1203-
MARKETING_VERSION = 2.1.0;
1231+
MARKETING_VERSION = 2.1.1;
12041232
PRODUCT_BUNDLE_IDENTIFIER = com.xiexiaolong.JAVBus;
12051233
PRODUCT_NAME = "$(TARGET_NAME)";
1234+
SWIFT_OBJC_BRIDGING_HEADER = "JAVBus/JAVBus-Bridging-Header.h";
1235+
SWIFT_VERSION = 5.0;
12061236
TARGETED_DEVICE_FAMILY = "1,2";
12071237
};
12081238
name = Release;
@@ -1211,6 +1241,7 @@
12111241
isa = XCBuildConfiguration;
12121242
baseConfigurationReference = D9174191B1E5409EE51BCC81 /* Pods-JAVBusTests.debug.xcconfig */;
12131243
buildSettings = {
1244+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12141245
BUNDLE_LOADER = "$(TEST_HOST)";
12151246
CODE_SIGN_STYLE = Automatic;
12161247
INFOPLIST_FILE = JAVBusTests/Info.plist;
@@ -1230,6 +1261,7 @@
12301261
isa = XCBuildConfiguration;
12311262
baseConfigurationReference = 40ED61FAFF4ADBE0F300A854 /* Pods-JAVBusTests.release.xcconfig */;
12321263
buildSettings = {
1264+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12331265
BUNDLE_LOADER = "$(TEST_HOST)";
12341266
CODE_SIGN_STYLE = Automatic;
12351267
INFOPLIST_FILE = JAVBusTests/Info.plist;
@@ -1249,6 +1281,7 @@
12491281
isa = XCBuildConfiguration;
12501282
baseConfigurationReference = C21BD270C8EDE3D7C2D4F1CD /* Pods-JAVBusUITests.debug.xcconfig */;
12511283
buildSettings = {
1284+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12521285
CODE_SIGN_STYLE = Automatic;
12531286
INFOPLIST_FILE = JAVBusUITests/Info.plist;
12541287
LD_RUNPATH_SEARCH_PATHS = (
@@ -1267,6 +1300,7 @@
12671300
isa = XCBuildConfiguration;
12681301
baseConfigurationReference = 5C70DFAD6B40A9D114CB27E7 /* Pods-JAVBusUITests.release.xcconfig */;
12691302
buildSettings = {
1303+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12701304
CODE_SIGN_STYLE = Automatic;
12711305
INFOPLIST_FILE = JAVBusUITests/Info.plist;
12721306
LD_RUNPATH_SEARCH_PATHS = (

‎JAVBus/Actress/ActressCell.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
@interface ActressCell : UICollectionViewCell
1212

13-
@property (weak, nonatomic) IBOutlet UIImageView *imageView;
13+
@property (weak, nonatomic) IBOutlet NetImageView *imageView;
1414
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
1515

16-
@property (nonatomic, copy) void (^longPressCallback)() ;
16+
@property (nonatomic, copy) void (^longPressCallback)(void) ;
1717

1818
@end

‎JAVBus/Actress/ActressCell.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ - (void)awakeFromNib {
1414
[super awakeFromNib];
1515
// Initialization code
1616

17-
self.layer.borderColor = [UIColor colorWithHexString:@"#eeeeee"].CGColor;
17+
self.layer.borderColor = [UIColor dynamicProviderWithDarkStr:@"#333333" lightStr:@"#eeeeee"].CGColor;
1818
self.layer.borderWidth = 0.5;
1919
self.layer.cornerRadius = 5;
2020
self.layer.masksToBounds = YES;
2121

22-
self.titleLabel.backgroundColor = [UIColor colorWithHexString:@"#606060"];
22+
self.titleLabel.backgroundColor = [UIColor dynamicProviderWithDarkStr:@"#222222" lightStr:@"#606060"];
2323

2424
UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPress:)];
2525
[self addGestureRecognizer:longPress];

‎JAVBus/Actress/ActressCell.xib

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3-
<device id="retina4_7" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
9-
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
107
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
118
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
129
</dependencies>
@@ -20,7 +17,7 @@
2017
<rect key="frame" x="0.0" y="0.0" width="173" height="225"/>
2118
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2219
<subviews>
23-
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3ym-gf-6dM">
20+
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3ym-gf-6dM" customClass="NetImageView">
2421
<rect key="frame" x="0.0" y="0.0" width="174" height="171.5"/>
2522
</imageView>
2623
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ESq-2B-9qZ">
@@ -32,6 +29,7 @@
3229
</label>
3330
</subviews>
3431
</view>
32+
<viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
3533
<constraints>
3634
<constraint firstItem="ESq-2B-9qZ" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="4a7-gj-kFV"/>
3735
<constraint firstItem="ESq-2B-9qZ" firstAttribute="top" secondItem="3ym-gf-6dM" secondAttribute="bottom" constant="-2.5" id="Cl4-Fq-rUH"/>
@@ -42,7 +40,6 @@
4240
<constraint firstAttribute="trailing" secondItem="ESq-2B-9qZ" secondAttribute="trailing" id="nkG-MA-Tio"/>
4341
<constraint firstAttribute="trailing" secondItem="3ym-gf-6dM" secondAttribute="trailing" constant="-1" id="zja-Rt-sRL"/>
4442
</constraints>
45-
<viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
4643
<size key="customSize" width="173" height="225"/>
4744
<connections>
4845
<outlet property="imageView" destination="3ym-gf-6dM" id="MOG-q1-dM9"/>

‎JAVBus/Actress/ActressDetailCell.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@interface ActressDetailCell ()
1212

13-
@property (weak, nonatomic) IBOutlet UIImageView *imageView;
13+
@property (weak, nonatomic) IBOutlet NetImageView *imageView;
1414
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
1515
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *heightConstraint;
1616
@property (weak, nonatomic) IBOutlet UILabel *numberLabel;
@@ -26,12 +26,12 @@ @implementation ActressDetailCell
2626
- (void)awakeFromNib {
2727
[super awakeFromNib];
2828

29-
self.layer.borderColor = [UIColor colorWithHexString:@"#f1f2f3"].CGColor;
29+
self.layer.borderColor = [UIColor dynamicProviderWithDarkStr:@"#333333" lightStr:@"#f1f2f3"].CGColor;
3030
self.layer.borderWidth = 0.5;
3131
self.layer.cornerRadius = 5;
3232
self.layer.masksToBounds = YES;
3333

34-
self.backgroundColor = [UIColor colorWithHexString:@"#f0f0f0"];
34+
self.backgroundColor = [UIColor dynamicProviderWithDarkStr:@"#222222" lightStr:@"#f0f0f0"];
3535

3636
self.numberLabel.layer.cornerRadius = self.numberLabel.height/8;
3737
self.numberLabel.layer.masksToBounds = YES;

0 commit comments

Comments
 (0)