Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
caonongyun authored and caonongyun committed Jun 7, 2017
1 parent 5c59095 commit e29cfd0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 26 deletions.
17 changes: 4 additions & 13 deletions zhuishushenqi.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
B22182CB1DA40588002458D2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B22182CA1DA40588002458D2 /* SystemConfiguration.framework */; };
B22182CD1DA4058E002458D2 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B22182CC1DA4058E002458D2 /* libsqlite3.tbd */; };
B22182CF1DA40594002458D2 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B22182CE1DA40594002458D2 /* libz.tbd */; };
B22204901EE859E9008E1902 /* BookCommentViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B222048F1EE859E9008E1902 /* BookCommentViewCell.xib */; };
B22269D61EA0C70A008FD314 /* QSBook.swift in Sources */ = {isa = PBXBuildFile; fileRef = B22269D31EA0C70A008FD314 /* QSBook.swift */; };
B22269D71EA0C70A008FD314 /* QSChapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B22269D41EA0C70A008FD314 /* QSChapter.swift */; };
B22269D81EA0C70A008FD314 /* QSPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B22269D51EA0C70A008FD314 /* QSPage.swift */; };
Expand Down Expand Up @@ -211,7 +212,6 @@
B2B4BC3E1E7EA4AB000CC201 /* BookCommentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2B4BA7B1E7EA4A8000CC201 /* BookCommentCell.swift */; };
B2B4BC3F1E7EA4AB000CC201 /* BookCommentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2B4BA7C1E7EA4A8000CC201 /* BookCommentCell.xib */; };
B2B4BC401E7EA4AB000CC201 /* BookCommentViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2B4BA7D1E7EA4A8000CC201 /* BookCommentViewCell.swift */; };
B2B4BC411E7EA4AB000CC201 /* BookCommentViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2B4BA7E1E7EA4A8000CC201 /* BookCommentViewCell.xib */; };
B2B4BC431E7EA4AB000CC201 /* BookDetailHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2B4BA801E7EA4A8000CC201 /* BookDetailHeader.swift */; };
B2B4BC441E7EA4AB000CC201 /* BookDetailHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = B2B4BA811E7EA4A8000CC201 /* BookDetailHeader.xib */; };
B2B4BC461E7EA4AB000CC201 /* CategoryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2B4BA831E7EA4A8000CC201 /* CategoryTableViewCell.swift */; };
Expand Down Expand Up @@ -508,6 +508,7 @@
B22182CA1DA40588002458D2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
B22182CC1DA4058E002458D2 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
B22182CE1DA40594002458D2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
B222048F1EE859E9008E1902 /* BookCommentViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookCommentViewCell.xib; sourceTree = "<group>"; };
B22269D31EA0C70A008FD314 /* QSBook.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QSBook.swift; sourceTree = "<group>"; };
B22269D41EA0C70A008FD314 /* QSChapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QSChapter.swift; sourceTree = "<group>"; };
B22269D51EA0C70A008FD314 /* QSPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QSPage.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -697,7 +698,6 @@
B2B4BA7B1E7EA4A8000CC201 /* BookCommentCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookCommentCell.swift; sourceTree = "<group>"; };
B2B4BA7C1E7EA4A8000CC201 /* BookCommentCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookCommentCell.xib; sourceTree = "<group>"; };
B2B4BA7D1E7EA4A8000CC201 /* BookCommentViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookCommentViewCell.swift; sourceTree = "<group>"; };
B2B4BA7E1E7EA4A8000CC201 /* BookCommentViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookCommentViewCell.xib; sourceTree = "<group>"; };
B2B4BA801E7EA4A8000CC201 /* BookDetailHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookDetailHeader.swift; sourceTree = "<group>"; };
B2B4BA811E7EA4A8000CC201 /* BookDetailHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookDetailHeader.xib; sourceTree = "<group>"; };
B2B4BA831E7EA4A8000CC201 /* CategoryTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CategoryTableViewCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1559,7 +1559,7 @@
B2B4BA7B1E7EA4A8000CC201 /* BookCommentCell.swift */,
B2B4BA7C1E7EA4A8000CC201 /* BookCommentCell.xib */,
B2B4BA7D1E7EA4A8000CC201 /* BookCommentViewCell.swift */,
B2B4BA7E1E7EA4A8000CC201 /* BookCommentViewCell.xib */,
B222048F1EE859E9008E1902 /* BookCommentViewCell.xib */,
B2B4BA801E7EA4A8000CC201 /* BookDetailHeader.swift */,
B2B4BA811E7EA4A8000CC201 /* BookDetailHeader.xib */,
B2B4BA831E7EA4A8000CC201 /* CategoryTableViewCell.swift */,
Expand Down Expand Up @@ -1646,15 +1646,6 @@
path = YTK;
sourceTree = "<group>";
};
B2B4BB261E7EA4AA000CC201 /* YYKit */ = {
isa = PBXGroup;
children = (
B2B4BB241E7EA4AA000CC201 /* YTKKeyValueStore.h */,
B2B4BB251E7EA4AA000CC201 /* YTKKeyValueStore.m */,
);
path = YTK;
sourceTree = "<group>";
};
B2B4BB261E7EA4AA000CC201 /* YYKit */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2325,6 +2316,7 @@
B2B4BC381E7EA4AB000CC201 /* Chapters.json in Resources */,
B2B4BC361E7EA4AB000CC201 /* ChapterInfo.json in Resources */,
B29B4FA31E8257BC008852E3 /* DynamicCell.xib in Resources */,
B22204901EE859E9008E1902 /* BookCommentViewCell.xib in Resources */,
B2B4BC211E7EA4AB000CC201 /* TopicDetailHeaderCell.xib in Resources */,
B2FB920D1EB1EEDF000C990A /* LICENSE in Resources */,
B2B4BC3F1E7EA4AB000CC201 /* BookCommentCell.xib in Resources */,
Expand All @@ -2336,7 +2328,6 @@
B2B4BC4C1E7EA4AB000CC201 /* HotCommentCell.xib in Resources */,
B2B4BD5E1E7EA931000CC201 /* LICENSE in Resources */,
B2B4BC471E7EA4AB000CC201 /* CategoryTableViewCell.xib in Resources */,
B2B4BC411E7EA4AB000CC201 /* BookCommentViewCell.xib in Resources */,
B2B4BC491E7EA4AB000CC201 /* ChangeSourceCell.xib in Resources */,
B2B4BC1D1E7EA4AB000CC201 /* ThemeTopicCell.xib in Resources */,
B203BB691E9E142C00F9C052 /* QSHistoryCell.xib in Resources */,
Expand Down
Binary file modified zhuishushenqi/TXTReader/.DS_Store
View file
Binary file not shown.
1 change: 0 additions & 1 deletion zhuishushenqi/TXTReader/Views/BookCommentViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ enum CommentType {
}

class BookCommentViewCell: UITableViewCell {
//<<<<<<< HEAD
@IBOutlet weak var readerIcon: UIImageView!
@IBOutlet weak var floor: UILabel!
@IBOutlet weak var readerName: UILabel!
Expand Down
12 changes: 0 additions & 12 deletions zhuishushenqi/TXTReader/Views/BookCommentViewCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,11 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<<<<<<< HEAD
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="BookCommentViewCell" rowHeight="108" id="KGk-i7-Jjw" customClass="BookCommentViewCell" customModule="zhuishushenqi" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="108"/>
<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="107.5"/>
=======
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="BookCommentViewCell" rowHeight="117" id="KGk-i7-Jjw" customClass="BookCommentViewCell" customModule="zhuishushenqi" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="117"/>
<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="116"/>
>>>>>>> 876a9ee6afa162f4fb71eff5fa02f2e0dbe52ae2
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QeB-yE-rZN">
Expand Down Expand Up @@ -91,7 +83,6 @@
<constraint firstItem="lSA-U6-ijw" firstAttribute="top" secondItem="MLz-On-Qo3" secondAttribute="bottom" constant="5" id="yQi-id-rSf"/>
</constraints>
</tableViewCellContentView>
<<<<<<< HEAD
<connections>
<outlet property="content" destination="MLz-On-Qo3" id="Enh-kW-REm"/>
<outlet property="createTime" destination="UFf-29-ohD" id="AWO-q8-Rp5"/>
Expand All @@ -102,9 +93,6 @@
<outlet property="reply" destination="lSA-U6-ijw" id="HaQ-ye-2lH"/>
</connections>
<point key="canvasLocation" x="105" y="159"/>
=======
<point key="canvasLocation" x="105" y="163.5"/>
>>>>>>> 876a9ee6afa162f4fb71eff5fa02f2e0dbe52ae2
</tableViewCell>
</objects>
</document>

0 comments on commit e29cfd0

Please sign in to comment.