Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
@CharlesCao0
CharlesCao0 committed May 3, 2018
1 parent 968ec73 commit 83a72c8
Show file tree
Hide file tree
Showing 12 changed files with 233 additions and 384 deletions.
6 changes: 0 additions & 6 deletions Word.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@
56CCA5E8201B16050097DCAC /* LGNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56CCA5E7201B16050097DCAC /* LGNavigationController.m */; };
56CCA5ED201B29A60097DCAC /* LGStudyTypeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56CCA5EC201B29A60097DCAC /* LGStudyTypeController.m */; };
56D3283A2079AE620041502B /* LGPeripheryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56D328392079AE620041502B /* LGPeripheryController.m */; };
56D3283D2079B8A40041502B /* LGReportSelectTimeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 56D3283C2079B8A40041502B /* LGReportSelectTimeController.m */; };
56D328402079E6BE0041502B /* LGPeripheryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 56D3283F2079E6BE0041502B /* LGPeripheryModel.m */; };
56D328432079FCAF0041502B /* LGPublicCourseCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 56D328422079FCAF0041502B /* LGPublicCourseCollectionCell.m */; };
56D328462079FD7C0041502B /* LGPeripherySectionHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 56D328452079FD7C0041502B /* LGPeripherySectionHeader.m */; };
Expand Down Expand Up @@ -646,8 +645,6 @@
56CCA5EC201B29A60097DCAC /* LGStudyTypeController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LGStudyTypeController.m; sourceTree = "<group>"; };
56D328382079AE620041502B /* LGPeripheryController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LGPeripheryController.h; sourceTree = "<group>"; };
56D328392079AE620041502B /* LGPeripheryController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LGPeripheryController.m; sourceTree = "<group>"; };
56D3283B2079B8A40041502B /* LGReportSelectTimeController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LGReportSelectTimeController.h; sourceTree = "<group>"; };
56D3283C2079B8A40041502B /* LGReportSelectTimeController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LGReportSelectTimeController.m; sourceTree = "<group>"; };
56D3283E2079E6BE0041502B /* LGPeripheryModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LGPeripheryModel.h; sourceTree = "<group>"; };
56D3283F2079E6BE0041502B /* LGPeripheryModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LGPeripheryModel.m; sourceTree = "<group>"; };
56D328412079FCAF0041502B /* LGPublicCourseCollectionCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LGPublicCourseCollectionCell.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -919,8 +916,6 @@
568C8C9920732DC7009668AD /* LGEstimateResultController.m */,
56ABC90A2074633100F328A8 /* LGReportController.h */,
56ABC90B2074633100F328A8 /* LGReportController.m */,
56D3283B2079B8A40041502B /* LGReportSelectTimeController.h */,
56D3283C2079B8A40041502B /* LGReportSelectTimeController.m */,
);
path = Controller;
sourceTree = "<group>";
Expand Down Expand Up @@ -2109,7 +2104,6 @@
568C8C9D20732EE4009668AD /* LGEstimateResultCell.m in Sources */,
5612BFB22021AC3E0038D653 /* LGProgressView.m in Sources */,
56A8883B200CA53400847BE6 /* AppDelegate.mm in Sources */,
56D3283D2079B8A40041502B /* LGReportSelectTimeController.m in Sources */,
560699DF2057BC6D00574437 /* LGPKRankHeadView.m in Sources */,
5638863A207C557300C05E01 /* LGSignModel.m in Sources */,
567FDF0C206C7748007FFFB2 /* LGClockListController.m in Sources */,
Expand Down
Binary file modified Word.xcworkspace/xcuserdata/C.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
25 changes: 25 additions & 0 deletions Word.xcworkspace/xcuserdata/C.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,30 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Word/Main/WordReport/View/LGReportLineChartView.m"
timestampString = "547065685.69327"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "349"
endingLineNumber = "349"
landmarkName = "-createItemDate:color:"
landmarkType = "7">
<Actions>
<BreakpointActionProxy
ActionExtensionID = "Xcode.BreakpointAction.Log">
<ActionContent
message = ""
conveyanceType = "0">
</ActionContent>
</BreakpointActionProxy>
</Actions>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
32 changes: 16 additions & 16 deletions Word/InterfaceBuilder/ReciteWords.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
Expand Down Expand Up @@ -4915,10 +4915,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="siy-Ji-C2g">
<rect key="frame" x="0.0" y="393" width="375" height="161"/>
<rect key="frame" x="0.0" y="378" width="375" height="176"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vjg-Bs-59Z">
<rect key="frame" x="0.0" y="42" width="94" height="109"/>
<rect key="frame" x="0.0" y="57" width="94" height="109"/>
<subviews>
<button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NuN-3a-gCj">
<rect key="frame" x="28" y="15" width="38" height="38"/>
Expand Down Expand Up @@ -4948,7 +4948,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Uf-QB-N3H">
<rect key="frame" x="94" y="42" width="93.5" height="109"/>
<rect key="frame" x="94" y="57" width="93.5" height="109"/>
<subviews>
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pw0-jR-rP7">
<rect key="frame" x="27.5" y="15" width="38" height="38"/>
Expand Down Expand Up @@ -4977,7 +4977,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BML-rx-w8H">
<rect key="frame" x="187.5" y="42" width="94" height="109"/>
<rect key="frame" x="187.5" y="57" width="94" height="109"/>
<subviews>
<button opaque="NO" tag="102" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nxm-0P-wCn">
<rect key="frame" x="28" y="15" width="38" height="38"/>
Expand Down Expand Up @@ -5006,7 +5006,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fDi-Z5-Wdz">
<rect key="frame" x="281.5" y="42" width="93.5" height="109"/>
<rect key="frame" x="281.5" y="57" width="93.5" height="109"/>
<subviews>
<button opaque="NO" tag="103" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AA9-0x-fGr">
<rect key="frame" x="27.5" y="15" width="38" height="38"/>
Expand Down Expand Up @@ -5069,7 +5069,7 @@
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="share_recite_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="WbJ-VT-u0q">
<rect key="frame" x="0.0" y="0.0" width="375" height="393"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="378"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7t5-qS-Xb6">
<rect key="frame" x="5" y="25" width="44" height="44"/>
Expand All @@ -5083,7 +5083,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xGv-kB-Mb6">
<rect key="frame" x="32.5" y="79" width="310" height="304"/>
<rect key="frame" x="32.5" y="79" width="310" height="289"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年5月2日" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cnz-Xp-OaP">
<rect key="frame" x="106" y="13" width="98" height="18"/>
Expand All @@ -5092,35 +5092,35 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eLo-Vn-mNF">
<rect key="frame" x="0.0" y="223" width="310" height="81"/>
<rect key="frame" x="0.0" y="212" width="310" height="77"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="diO-MN-rfu">
<rect key="frame" x="154.5" y="20.5" width="0.5" height="40"/>
<rect key="frame" x="154.5" y="19.5" width="0.5" height="38"/>
<color key="backgroundColor" red="0.88619953393936157" green="0.88632416725158691" blue="0.88616031408309937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="0.5" id="EUp-Z3-bNE"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日背单词" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k8i-Pd-2Rv">
<rect key="frame" x="155.5" y="15.5" width="154.5" height="17"/>
<rect key="frame" x="155.5" y="14.5" width="154.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.47843137250000001" green="0.47843137250000001" blue="0.47843137250000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已坚持天数" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULK-4Z-80t">
<rect key="frame" x="0.0" y="15.5" width="154.5" height="17"/>
<rect key="frame" x="0.0" y="14.5" width="154.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.47843137250000001" green="0.47843137250000001" blue="0.47843137250000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ly4-gA-Wsr">
<rect key="frame" x="155" y="44.5" width="155" height="21"/>
<rect key="frame" x="155" y="41.5" width="155" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.2156862745" green="0.73725490199999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zop-iz-XA5">
<rect key="frame" x="0.0" y="44" width="154.5" height="22"/>
<rect key="frame" x="0.0" y="41" width="154.5" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" red="0.2156862745" green="0.73725490199999999" blue="0.52156862749999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -5146,7 +5146,7 @@
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="y3q-aL-gv1">
<rect key="frame" x="0.0" y="31" width="310" height="192"/>
<rect key="frame" x="0.0" y="31" width="310" height="181"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="d7A-x7-cYs">
<size key="itemSize" width="50" height="50"/>
Expand Down
Loading

0 comments on commit 83a72c8

Please sign in to comment.