Skip to content

Commit 510a3ea

Browse files
author
Jasper
committed
增加二维码
1 parent 4e61df7 commit 510a3ea

File tree

11 files changed

+438
-35
lines changed

11 files changed

+438
-35
lines changed

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift.xcodeproj/project.pbxproj

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
A3EB573B1FA1D41D00A58278 /* CycleBannerViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3EB57391FA1D41D00A58278 /* CycleBannerViewItem.swift */; };
6969
A3FDF5BD1F8B2432009E5F68 /* DeviceAuthentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FDF5BC1F8B2432009E5F68 /* DeviceAuthentication.swift */; };
7070
A3FDF5BF1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FDF5BE1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift */; };
71+
A41FB26E1FE8E58F00A75434 /* QRCodeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A41FB26D1FE8E58F00A75434 /* QRCodeGenerator.swift */; };
72+
A41FB2701FE8EC9000A75434 /* QRCodeTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A41FB26F1FE8EC9000A75434 /* QRCodeTestViewController.swift */; };
73+
A4482EE11FE26BAB004B8771 /* BaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4482EE01FE26BAB004B8771 /* BaseViewModel.swift */; };
74+
A4874DFF1FE2797B002C978F /* SimpleTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4874DFD1FE2797B002C978F /* SimpleTableView.swift */; };
75+
A4874E001FE2797B002C978F /* SimpleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4874DFE1FE2797B002C978F /* SimpleTableViewCell.swift */; };
76+
A4874E041FE3A829002C978F /* EventListenerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4874E031FE3A829002C978F /* EventListenerTests.swift */; };
7177
/* End PBXBuildFile section */
7278

7379
/* Begin PBXContainerItemProxy section */
@@ -161,6 +167,12 @@
161167
A3EB57391FA1D41D00A58278 /* CycleBannerViewItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CycleBannerViewItem.swift; sourceTree = "<group>"; };
162168
A3FDF5BC1F8B2432009E5F68 /* DeviceAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAuthentication.swift; sourceTree = "<group>"; };
163169
A3FDF5BE1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAuthenticationTests.swift; sourceTree = "<group>"; };
170+
A41FB26D1FE8E58F00A75434 /* QRCodeGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeGenerator.swift; sourceTree = "<group>"; };
171+
A41FB26F1FE8EC9000A75434 /* QRCodeTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeTestViewController.swift; sourceTree = "<group>"; };
172+
A4482EE01FE26BAB004B8771 /* BaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewModel.swift; sourceTree = "<group>"; };
173+
A4874DFD1FE2797B002C978F /* SimpleTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleTableView.swift; sourceTree = "<group>"; };
174+
A4874DFE1FE2797B002C978F /* SimpleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimpleTableViewCell.swift; sourceTree = "<group>"; };
175+
A4874E031FE3A829002C978F /* EventListenerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListenerTests.swift; sourceTree = "<group>"; };
164176
/* End PBXFileReference section */
165177

166178
/* Begin PBXFrameworksBuildPhase section */
@@ -221,6 +233,9 @@
221233
61091D6F1CDAFCB0008B7EA3 /* CYUtils */ = {
222234
isa = PBXGroup;
223235
children = (
236+
A41FB26C1FE8E56400A75434 /* QRCode */,
237+
A4874DFC1FE2793B002C978F /* SimpleTableView */,
238+
A4482EDF1FE26B95004B8771 /* MVVM */,
224239
A39A31631FB03B9800CAC143 /* Model */,
225240
A3EB57371FA1D41D00A58278 /* CycleBanner */,
226241
A3FDF5BB1F8B2420009E5F68 /* DeviceAuth */,
@@ -355,6 +370,7 @@
355370
isa = PBXGroup;
356371
children = (
357372
A3FDF5BE1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift */,
373+
A4874E031FE3A829002C978F /* EventListenerTests.swift */,
358374
A37AEA4E1F468898007B3C23 /* CYUtilProjectSwiftTests.swift */,
359375
A37AEA501F468898007B3C23 /* Info.plist */,
360376
);
@@ -422,6 +438,7 @@
422438
A32F8C9E1F31CBC2003BA93B /* FloatingViewTestViewController.swift */,
423439
A36B943C1F4E80A200F14AAB /* AnimationTestTableViewController.swift */,
424440
A36B943E1F4E813900F14AAB /* AnimationTest */,
441+
A41FB26F1FE8EC9000A75434 /* QRCodeTestViewController.swift */,
425442
);
426443
path = Test;
427444
sourceTree = "<group>";
@@ -462,6 +479,31 @@
462479
path = DeviceAuth;
463480
sourceTree = "<group>";
464481
};
482+
A41FB26C1FE8E56400A75434 /* QRCode */ = {
483+
isa = PBXGroup;
484+
children = (
485+
A41FB26D1FE8E58F00A75434 /* QRCodeGenerator.swift */,
486+
);
487+
path = QRCode;
488+
sourceTree = "<group>";
489+
};
490+
A4482EDF1FE26B95004B8771 /* MVVM */ = {
491+
isa = PBXGroup;
492+
children = (
493+
A4482EE01FE26BAB004B8771 /* BaseViewModel.swift */,
494+
);
495+
path = MVVM;
496+
sourceTree = "<group>";
497+
};
498+
A4874DFC1FE2793B002C978F /* SimpleTableView */ = {
499+
isa = PBXGroup;
500+
children = (
501+
A4874DFD1FE2797B002C978F /* SimpleTableView.swift */,
502+
A4874DFE1FE2797B002C978F /* SimpleTableViewCell.swift */,
503+
);
504+
path = SimpleTableView;
505+
sourceTree = "<group>";
506+
};
465507
/* End PBXGroup section */
466508

467509
/* Begin PBXNativeTarget section */
@@ -572,6 +614,7 @@
572614
buildActionMask = 2147483647;
573615
files = (
574616
A30EA3D21CFED40F006FEF23 /* CYAudioPlayUtils.swift in Sources */,
617+
A4482EE11FE26BAB004B8771 /* BaseViewModel.swift in Sources */,
575618
A36B94401F4E815D00F14AAB /* AnimatedImageTestViewController.swift in Sources */,
576619
A36B943B1F4E7F8900F14AAB /* CYAnimatedImageView.swift in Sources */,
577620
A345C5FC1DEBDE2F0094AF5A /* CYBaseProgressBar.swift in Sources */,
@@ -590,6 +633,7 @@
590633
A3CCAF311D17A56000A40969 /* CYJSJSONParametersSerialization.swift in Sources */,
591634
A37D5B481ED7037500A63AB9 /* SendRedPacketView.swift in Sources */,
592635
A39A31651FB03BCF00CAC143 /* BaseModel.swift in Sources */,
636+
A4874E001FE2797B002C978F /* SimpleTableViewCell.swift in Sources */,
593637
A37D5B461ED7036200A63AB9 /* SendRedPacketViewController.swift in Sources */,
594638
A3EB573B1FA1D41D00A58278 /* CycleBannerViewItem.swift in Sources */,
595639
A3B7009B1E1B500B00823B7B /* ProgressWebTestViewController.swift in Sources */,
@@ -614,15 +658,18 @@
614658
A33913D31CF4282700C8C147 /* Array+CYUtils.swift in Sources */,
615659
A3E2530A1CFD976F002F8E18 /* ObjectiveCTestObject.m in Sources */,
616660
A385A6A51ED150C40022C2EB /* CYRedPacketDetailHeaderView.swift in Sources */,
661+
A41FB2701FE8EC9000A75434 /* QRCodeTestViewController.swift in Sources */,
617662
A385A6AC1ED16A8E0022C2EB /* CYRedPacketViewModel.swift in Sources */,
618663
A34F17F11EF8B78200538F20 /* HerizontalTableViewTestViewController.swift in Sources */,
619664
A371504D1F3875350079E9C5 /* WebViewProgress.swift in Sources */,
620665
A36B943D1F4E80A200F14AAB /* AnimationTestTableViewController.swift in Sources */,
621666
A33913CE1CF3EE4400C8C147 /* Dictionary+CYUtils.swift in Sources */,
622667
A3B700981E1B449C00823B7B /* CYProgressWebView.swift in Sources */,
668+
A41FB26E1FE8E58F00A75434 /* QRCodeGenerator.swift in Sources */,
623669
A385A6A71ED1585B0022C2EB /* CYRedPacketDetailCell.swift in Sources */,
624670
A3BA5F1C1E67ED8200B31B8C /* CYProgressWebViewController.swift in Sources */,
625671
A3EB573A1FA1D41D00A58278 /* CycleBannerView.swift in Sources */,
672+
A4874DFF1FE2797B002C978F /* SimpleTableView.swift in Sources */,
626673
A33E4B3D1D06ABDC001B0AB1 /* CYJSCommonActionRequestUtils.swift in Sources */,
627674
A385A69F1ED138EA0022C2EB /* UIWindow+CYAlertWindow.swift in Sources */,
628675
);
@@ -632,6 +679,7 @@
632679
isa = PBXSourcesBuildPhase;
633680
buildActionMask = 2147483647;
634681
files = (
682+
A4874E041FE3A829002C978F /* EventListenerTests.swift in Sources */,
635683
A37AEA4F1F468898007B3C23 /* CYUtilProjectSwiftTests.swift in Sources */,
636684
A3FDF5BF1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift in Sources */,
637685
);

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/Base.lproj/Main.storyboard

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="TKH-iX-u9i">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="TKH-iX-u9i">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
1111
<scenes>
@@ -14,7 +14,7 @@
1414
<objects>
1515
<navigationController id="TKH-iX-u9i" sceneMemberID="viewController">
1616
<navigationBar key="navigationBar" contentMode="scaleToFill" id="h6n-gb-sBq">
17-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
17+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
1818
<autoresizingMask key="autoresizingMask"/>
1919
</navigationBar>
2020
<connections>
@@ -40,7 +40,7 @@
4040
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
4141
<autoresizingMask key="autoresizingMask"/>
4242
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KYB-1c-PkA" id="6w2-Qo-VMQ">
43-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
43+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
4444
<autoresizingMask key="autoresizingMask"/>
4545
<subviews>
4646
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="ProgressWebTest" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cpq-Rm-7b2">
@@ -57,7 +57,7 @@
5757
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
5858
<autoresizingMask key="autoresizingMask"/>
5959
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s1A-Pw-IeU" id="Qic-ye-2nP">
60-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
60+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
6161
<autoresizingMask key="autoresizingMask"/>
6262
<subviews>
6363
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="CycleBannerView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1i-8E-uAo">
@@ -74,7 +74,7 @@
7474
<rect key="frame" x="0.0" y="88" width="375" height="44"/>
7575
<autoresizingMask key="autoresizingMask"/>
7676
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Rkj-21-MBP" id="irs-h2-OAe">
77-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
77+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
7878
<autoresizingMask key="autoresizingMask"/>
7979
<subviews>
8080
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="RedPacket" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nmW-Bf-clA">
@@ -91,7 +91,7 @@
9191
<rect key="frame" x="0.0" y="132" width="375" height="44"/>
9292
<autoresizingMask key="autoresizingMask"/>
9393
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="60b-cg-8AH" id="PZv-eC-c2Z">
94-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
94+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
9595
<autoresizingMask key="autoresizingMask"/>
9696
<subviews>
9797
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="HerizontalTableView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyN-qB-gGV">
@@ -108,7 +108,7 @@
108108
<rect key="frame" x="0.0" y="176" width="375" height="44"/>
109109
<autoresizingMask key="autoresizingMask"/>
110110
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pdq-Ts-N1v" id="tWs-hs-pnL">
111-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
111+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
112112
<autoresizingMask key="autoresizingMask"/>
113113
<subviews>
114114
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="FloatingView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5xD-yi-oyW">
@@ -125,7 +125,7 @@
125125
<rect key="frame" x="0.0" y="220" width="375" height="44"/>
126126
<autoresizingMask key="autoresizingMask"/>
127127
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JFB-ij-Ob7" id="Lvc-u0-Plu">
128-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
128+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
129129
<autoresizingMask key="autoresizingMask"/>
130130
<subviews>
131131
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="WebViewController" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hcX-Ob-Ktj">
@@ -142,7 +142,7 @@
142142
<rect key="frame" x="0.0" y="264" width="375" height="44"/>
143143
<autoresizingMask key="autoresizingMask"/>
144144
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="B1N-vS-Sen" id="JLs-83-JsD">
145-
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
145+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
146146
<autoresizingMask key="autoresizingMask"/>
147147
<subviews>
148148
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="AnimationTestTableViewController" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qQ8-Cv-RE6">
@@ -155,6 +155,23 @@
155155
</subviews>
156156
</tableViewCellContentView>
157157
</tableViewCell>
158+
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="DlI-3G-x7m">
159+
<rect key="frame" x="0.0" y="308" width="375" height="44"/>
160+
<autoresizingMask key="autoresizingMask"/>
161+
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DlI-3G-x7m" id="7pQ-i7-6Qq">
162+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
163+
<autoresizingMask key="autoresizingMask"/>
164+
<subviews>
165+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="QRCode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hgq-0p-Ux5">
166+
<rect key="frame" x="24" y="11" width="323" height="21"/>
167+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
168+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
169+
<nil key="textColor"/>
170+
<nil key="highlightedColor"/>
171+
</label>
172+
</subviews>
173+
</tableViewCellContentView>
174+
</tableViewCell>
158175
</cells>
159176
</tableViewSection>
160177
</sections>

0 commit comments

Comments
 (0)