Skip to content

Commit

Permalink
替换掉报错的PNG图片
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhengwenming
zhengwenming committed Dec 6, 2016
1 parent 50f268b commit e0dcaa9
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 11 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
12 changes: 8 additions & 4 deletions 倒计时.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
37590F621D2CC46600467010 /* CountDownInCellViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 37590F601D2CC46600467010 /* CountDownInCellViewController.xib */; };
37590F661D2D16AE00467010 /* CountDownCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 37590F641D2D16AE00467010 /* CountDownCell.m */; };
37590F671D2D16AE00467010 /* CountDownCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 37590F651D2D16AE00467010 /* CountDownCell.xib */; };
37590F691D2D195B00467010 /* shop.png in Resources */ = {isa = PBXBuildFile; fileRef = 37590F681D2D195B00467010 /* shop.png */; };
376105D01D2B529300DF3435 /* CountDownViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 376105CE1D2B529300DF3435 /* CountDownViewController.m */; };
376105D71D2B646D00DF3435 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 376105D61D2B646D00DF3435 /* Main.storyboard */; };
376105F01D2B6C4400DF3435 /* MASCompositeConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 376105DA1D2B6C4400DF3435 /* MASCompositeConstraint.m */; };
Expand All @@ -31,6 +30,8 @@
70A541661C3E736A00EE3E17 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 70A541651C3E736A00EE3E17 /* ViewController.m */; };
70A5416B1C3E736A00EE3E17 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 70A5416A1C3E736A00EE3E17 /* Assets.xcassets */; };
70A5416E1C3E736A00EE3E17 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 70A5416C1C3E736A00EE3E17 /* LaunchScreen.storyboard */; };
BFB1F4EB1DF6AC63005DB822 /* shop@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BFB1F4E91DF6AC63005DB822 /* shop@2x.png */; };
BFB1F4EC1DF6AC63005DB822 /* shop@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BFB1F4EA1DF6AC63005DB822 /* shop@3x.png */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -40,7 +41,6 @@
37590F631D2D16AE00467010 /* CountDownCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountDownCell.h; sourceTree = "<group>"; };
37590F641D2D16AE00467010 /* CountDownCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountDownCell.m; sourceTree = "<group>"; };
37590F651D2D16AE00467010 /* CountDownCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CountDownCell.xib; sourceTree = "<group>"; };
37590F681D2D195B00467010 /* shop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shop.png; sourceTree = "<group>"; };
376105CD1D2B529300DF3435 /* CountDownViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountDownViewController.h; sourceTree = "<group>"; };
376105CE1D2B529300DF3435 /* CountDownViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountDownViewController.m; sourceTree = "<group>"; };
376105D61D2B646D00DF3435 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -81,6 +81,8 @@
70A5416A1C3E736A00EE3E17 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
70A5416D1C3E736A00EE3E17 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
70A5416F1C3E736A00EE3E17 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BFB1F4E91DF6AC63005DB822 /* shop@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop@2x.png"; sourceTree = "<group>"; };
BFB1F4EA1DF6AC63005DB822 /* shop@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop@3x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -180,7 +182,8 @@
70A5415E1C3E736A00EE3E17 /* Supporting Files */ = {
isa = PBXGroup;
children = (
37590F681D2D195B00467010 /* shop.png */,
BFB1F4E91DF6AC63005DB822 /* shop@2x.png */,
BFB1F4EA1DF6AC63005DB822 /* shop@3x.png */,
37B431ED1D2E72DD00AA5DB5 /* countDown.gif */,
70A5415F1C3E736A00EE3E17 /* main.m */,
);
Expand Down Expand Up @@ -246,10 +249,11 @@
files = (
376105D71D2B646D00DF3435 /* Main.storyboard in Resources */,
70A5416E1C3E736A00EE3E17 /* LaunchScreen.storyboard in Resources */,
BFB1F4EC1DF6AC63005DB822 /* shop@3x.png in Resources */,
70A5416B1C3E736A00EE3E17 /* Assets.xcassets in Resources */,
37590F671D2D16AE00467010 /* CountDownCell.xib in Resources */,
37590F691D2D195B00467010 /* shop.png in Resources */,
37B431EE1D2E72DD00AA5DB5 /* countDown.gif in Resources */,
BFB1F4EB1DF6AC63005DB822 /* shop@2x.png in Resources */,
37590F621D2CC46600467010 /* CountDownInCellViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Binary file modified ...odeproj/project.xcworkspace/xcuserdata/wenming.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
10 changes: 4 additions & 6 deletions 倒计时/CountDownCell.xib
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand All @@ -13,23 +14,20 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="99"/>
<frame key="frameInset" width="320" height="99.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zvy-dW-RN6">
<rect key="frame" x="104" y="8" width="208" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="改商品已过期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JmZ-sR-eAb">
<rect key="frame" x="109" y="52" width="203" height="31"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shop.png" translatesAutoresizingMaskIntoConstraints="NO" id="Ut6-ec-Sk6">
<rect key="frame" x="8" y="6" width="88" height="88"/>
<constraints>
<constraint firstAttribute="width" secondItem="Ut6-ec-Sk6" secondAttribute="height" multiplier="1:1" id="kYo-IG-qSu"/>
</constraints>
Expand Down
2 changes: 1 addition & 1 deletion 倒计时/CountDownInCellViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ -(NSString *)getNowTimeWithString:(NSString *)aTimeString{
- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"cell中倒计时";
dataSource = @[@"2016-10-24 22:23:49",@"2016-10-25 14:23:43",@"2016-10-26 14:23:14",@"2016-10-27 14:23:41",@"2016-10-28 14:11:46",@"2016-10-29 14:23:23",@"2016-10-30 14:23:43",@"2016-11-01 14:12:45",@"2016-11-02 14:23:22",@"2016-11-03 14:23:40",@"2016-11-04 14:13:40",@"2016-11-05 14:23:45",@"2016-11-06 14:23:45",@"2016-11-07 14:14:41",@"2016-11-08 14:23:50",@"2016-11-09 14:23:45",@"2016-11-10 14:15:42",@"2016-11-11 14:23:51",@"2016-11-12 14:28:45",@"2016-11-13 14:16:43",@"2016-11-14 14:23:52",@"2016-11-15 14:29:45",@"2016-11-16 14:17:44",@"2016-11-17 14:23:53",@"2016-11-18 14:30:45",@"2016-11-19 14:18:45",@"2016-11-20 14:23:54",@"2016-11-21 14:31:01",@"2016-11-22 14:19:30",@"2016-11-23 14:23:55",@"2016-11-24 14:32:02",@"2016-11-25 14:20:31",@"2016-11-26 14:23:56",@"2016-11-27 14:33:03",@"2016-11-28 14:21:12",@"2016-11-29 14:23:45",@"2016-11-30 14:34:04",@"2016-11-31 14:23:32",@"2016-11-01 14:23:49",@"2016-11-02 14:04:05",@"2016-12-03 14:23:05",@"2016-12-04 14:24:09",@"2016-12-05 14:14:06",@"2016-12-06 14:24:02",@"2016-12-07 14:24:10",@"2016-12-08 14:24:07",@"2016-12-09 14:25:01",@"2016-12-10 14:24:11",@"2016-12-11 14:34:08",@"2016-12-12 14:26:03",];
dataSource = @[@"2016-12-06 14:24:02",@"2016-12-07 14:24:10",@"2016-12-08 14:24:07",@"2016-12-09 14:25:01",@"2016-12-10 14:24:11",@"2016-12-11 14:34:08",@"2016-12-12 14:26:03",@"2016-12-13 22:23:49",@"2016-12-14 14:23:43",@"2016-12-15 14:23:14",@"2016-12-16 14:23:41",@"2016-12-17 14:11:46",@"2016-12-18 14:23:23",@"2016-12-19 14:23:43",@"2016-12-20 14:12:45",@"2016-12-21 14:23:22",@"2016-12-22 14:23:40",@"2016-12-23 14:13:40",@"2016-12-24 14:23:45",@"2016-12-25 14:23:45",@"2016-12-26 14:14:41",@"2016-12-27 14:23:50",@"2016-12-28 14:23:45",@"2016-12-29 14:15:42",@"2016-12-30 14:23:51",@"2017-01-01 14:28:45",@"2017-01-02 14:16:43",@"2017-01-03 14:23:52",@"2017-01-04 14:29:45",@"2017-01-05 14:17:44",@"2017-01-06 14:23:53",@"2017-01-07 14:30:45",@"2017-01-08 14:18:45",@"2017-01-09 14:23:54",@"2017-01-10 14:31:01",@"2017-02-01 14:19:30",@"2017-02-02 14:23:55",@"2017-02-03 14:32:02",@"2017-02-04 14:20:31",@"2017-03-01 14:23:56",@"2017-03-02 14:33:03",@"2017-03-03 14:21:12",@"2017-03-07 14:23:45",@"2017-04-02 14:34:04",@"2017-04-03 14:23:32",@"2017-04-04 14:23:49",@"2017-04-05 14:04:05",@"2017-05-05 14:23:05",@"2017-06-02 14:24:09",@"2017-07-05 14:14:06"];
self.countDown = [[CountDown alloc] init];
__weak __typeof(self) weakSelf= self;
///每秒回调一次
Expand Down
Binary file removed 倒计时/shop.png
View file
Binary file not shown.
Binary file added 倒计时/shop@2x.png
View file
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 倒计时/shop@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e0dcaa9

Please sign in to comment.