From 9e38f03dd1a8c96a911403331d4409b26310bd5f Mon Sep 17 00:00:00 2001
From: Sandy <1074472615@qq.com>
Date: Wed, 8 Feb 2017 17:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=88=86=E6=8F=90=E7=8E=B0=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Car Release.plist | 4 +-
Car.xcodeproj/project.pbxproj | 57 ++++
.../Contents.json" | 6 +
.../wechat.imageset/Contents.json" | 23 ++
.../wechat.imageset/wechat.png" | Bin 0 -> 3220 bytes
.../wechat.imageset/wechat@2x.png" | Bin 0 -> 5751 bytes
.../wechat.imageset/wechat@3x.png" | Bin 0 -> 8412 bytes
.../Contents.json" | 23 ++
...0\347\216\260\345\233\276\346\240\207.png" | Bin 0 -> 1497 bytes
...47\216\260\345\233\276\346\240\207@2x.png" | Bin 0 -> 2273 bytes
...47\216\260\345\233\276\346\240\207@3x.png" | Bin 0 -> 2756 bytes
Car/Base.lproj/Main.storyboard | 250 +++++++++++++++++-
.../ViewConstrollers/AccountViewController.h | 13 +
.../ViewConstrollers/AccountViewController.m | 78 ++++++
.../ViewControllers/LeftTableViewController.m | 5 +-
.../WatchLoginViewController.m | 62 +++--
Car/URL.h | 5 -
Car/tools/BaseClass/BaseViewController.m | 4 +-
18 files changed, 481 insertions(+), 49 deletions(-)
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/Contents.json"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/Contents.json"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat.png"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat@2x.png"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat@3x.png"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/Contents.json"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.png"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207@2x.png"
create mode 100644 "Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207@3x.png"
create mode 100644 Car/CodeClass/Account/ViewConstrollers/AccountViewController.h
create mode 100644 Car/CodeClass/Account/ViewConstrollers/AccountViewController.m
diff --git a/Car Release.plist b/Car Release.plist
index ffd7dc6..03b8074 100644
--- a/Car Release.plist
+++ b/Car Release.plist
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.1</string>
+ <string>1.0.2</string>
<key>CFBundleVersion</key>
- <string>1.0.1</string>
+ <string>1.0.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
diff --git a/Car.xcodeproj/project.pbxproj b/Car.xcodeproj/project.pbxproj
index d8025af..dd88303 100644
--- a/Car.xcodeproj/project.pbxproj
+++ b/Car.xcodeproj/project.pbxproj
@@ -21,6 +21,8 @@
8F42C00A1E10BC5400A54D40 /* OrderListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C0091E10BC5400A54D40 /* OrderListTableViewCell.m */; };
8F42C00D1E10BF2900A54D40 /* OrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C00C1E10BF2900A54D40 /* OrderListModel.m */; };
8F725CB31E120649006B597D /* OrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F725CB21E120649006B597D /* OrderDetailViewController.m */; };
+ 8F791BF51E4B0E89005FCB92 /* AccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */; };
+ 8F791BF61E4B0E89005FCB92 /* AccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */; };
8F8105651E10ECC3009A2AB3 /* UIView+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105641E10ECC3009A2AB3 /* UIView+Category.m */; };
8F8105681E10F58A009A2AB3 /* OrderListFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105671E10F58A009A2AB3 /* OrderListFilterViewController.m */; };
8F81056E1E110174009A2AB3 /* DateTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F81056D1E110174009A2AB3 /* DateTextField.m */; };
@@ -166,6 +168,8 @@
8F42C00C1E10BF2900A54D40 /* OrderListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderListModel.m; sourceTree = "<group>"; };
8F725CB11E120649006B597D /* OrderDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderDetailViewController.h; sourceTree = "<group>"; };
8F725CB21E120649006B597D /* OrderDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderDetailViewController.m; sourceTree = "<group>"; };
+ 8F791BF31E4B0E89005FCB92 /* AccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountViewController.h; sourceTree = "<group>"; };
+ 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountViewController.m; sourceTree = "<group>"; };
8F8105631E10ECC3009A2AB3 /* UIView+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Category.h"; sourceTree = "<group>"; };
8F8105641E10ECC3009A2AB3 /* UIView+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Category.m"; sourceTree = "<group>"; };
8F8105661E10F58A009A2AB3 /* OrderListFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderListFilterViewController.h; sourceTree = "<group>"; };
@@ -341,6 +345,56 @@
path = Cells;
sourceTree = "<group>";
};
+ 8F791BED1E4B0E66005FCB92 /* Account（公分æ现） */ = {
+ isa = PBXGroup;
+ children = (
+ 8F791BEE1E4B0E66005FCB92 /* Cells */,
+ 8F791BEF1E4B0E66005FCB92 /* Models */,
+ 8F791BF01E4B0E66005FCB92 /* ViewConstrollers */,
+ 8F791BF11E4B0E66005FCB92 /* ViewModels */,
+ 8F791BF21E4B0E66005FCB92 /* Views */,
+ );
+ name = "Account（公分æ现）";
+ path = Account;
+ sourceTree = "<group>";
+ };
+ 8F791BEE1E4B0E66005FCB92 /* Cells */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ path = Cells;
+ sourceTree = "<group>";
+ };
+ 8F791BEF1E4B0E66005FCB92 /* Models */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ path = Models;
+ sourceTree = "<group>";
+ };
+ 8F791BF01E4B0E66005FCB92 /* ViewConstrollers */ = {
+ isa = PBXGroup;
+ children = (
+ 8F791BF31E4B0E89005FCB92 /* AccountViewController.h */,
+ 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */,
+ );
+ path = ViewConstrollers;
+ sourceTree = "<group>";
+ };
+ 8F791BF11E4B0E66005FCB92 /* ViewModels */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ path = ViewModels;
+ sourceTree = "<group>";
+ };
+ 8F791BF21E4B0E66005FCB92 /* Views */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ path = Views;
+ sourceTree = "<group>";
+ };
8F97C2AF1E0CC4BE00D8A57D = {
isa = PBXGroup;
children = (
@@ -415,6 +469,7 @@
8F97C2EE1E0CCD2B00D8A57D /* CodeClass */ = {
isa = PBXGroup;
children = (
+ 8F791BED1E4B0E66005FCB92 /* Account（公分æ现） */,
8F97C3171E0CEBA900D8A57D /* Main */,
8F97C3091E0CE83B00D8A57D /* LeftView */,
8F97C2EF1E0CCD6500D8A57D /* Login */,
@@ -939,6 +994,7 @@
8FC2BDBE1E12840300A879C1 /* LBXScanViewStyle.m in Sources */,
8F725CB31E120649006B597D /* OrderDetailViewController.m in Sources */,
8F42BFFB1E0D208C00A54D40 /* GlobalInstance.m in Sources */,
+ 8F791BF51E4B0E89005FCB92 /* AccountViewController.m in Sources */,
8F8105681E10F58A009A2AB3 /* OrderListFilterViewController.m in Sources */,
8FED4FC51E1252F200591647 /* CalculateHelper.m in Sources */,
8FFE3D9A1E13A8AA00BEB6A6 /* car_objc_json_client.m in Sources */,
@@ -1013,6 +1069,7 @@
8FFE3DF81E14AC6700BEB6A6 /* LBXScanViewStyle.m in Sources */,
8FFE3DF91E14AC6700BEB6A6 /* OrderDetailViewController.m in Sources */,
8FFE3DFA1E14AC6700BEB6A6 /* GlobalInstance.m in Sources */,
+ 8F791BF61E4B0E89005FCB92 /* AccountViewController.m in Sources */,
8FFE3DFB1E14AC6700BEB6A6 /* OrderListFilterViewController.m in Sources */,
8FFE3DFC1E14AC6700BEB6A6 /* CalculateHelper.m in Sources */,
8FFE3DFD1E14AC6700BEB6A6 /* car_objc_json_client.m in Sources */,
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/Contents.json" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/Contents.json"
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/Contents.json"
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/Contents.json" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/Contents.json"
new file mode 100644
index 0000000..d395595
--- /dev/null
+++ "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/Contents.json"
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "wechat.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "wechat@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "wechat@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat.png" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat.png"
new file mode 100644
index 0000000000000000000000000000000000000000..573b4d5847a523330d5058eed37476b4c4bfeac8
GIT binary patch
literal 3220
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
GDEu#yX>u3<
literal 0
HcmV?d00001
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat@2x.png" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..d080e672ad2803b02bc4b0f4cc64128a0abd6fda
GIT binary patch
literal 5751
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
literal 0
HcmV?d00001
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat@3x.png" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/wechat.imageset/wechat@3x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..a4e2726c4c2eee878d80fccdf592b98c29a4182a
GIT binary patch
literal 8412
zcmaKScRZWz`?lR8YHw{()RrK%sacd-iN<Or5qs~wrDjp3DN4-}LTqY_)taSI)zX0?
zHS4je^i7}N_xb+bKi=oP|Hysa=Y1T<Ij-~0^|`Mk#r)1KCI&tR3JMA)BSSq)3JOYT
z^7!B)9r=@_HY!Fw@doO{0<C<U14H2cC<<*S9|TI!$P4a*vP8k1!u(#L)F~*a#oZvV
zK$xkCD$>VG7XAk#8|vjtW>Zk8YlZs4kshc(K?KUh&09lwr?XdB(9KCh_%7HKXzHtr
za&<Ed_eWWU-+>^*J&-C+!djYw>Y=J+0WVY_Trkwj(>p*lR73c0T~+e<k6BJw@NY<<
zhlcR~1O+oS7u5CfM+t&uZ^$5lH<SdGRAfP5B_%~AX+e1)2rLIwkW&E4$SbHS0#y~|
z1^;shlfC&nIjdUg8T`i=`AS3BH89XuRZcD>Bt$kuLDt9LMGmB*q9O;Bmy?&5AtPi0
z!n_0Fp)%e9*Zxt^Lj@rH-FySxe7pt!D8dmwL4g{=<VgP~1ux(K%6bR<r%dF6$%Vpw
z<v_B)KPmkKG&TMIL%qEIiw+31ME!5P|4-onNSH55&Jq>i6XcI1Pn`3$KdyXLb^THB
zKp%gIkB{d+RWx_?3G@kY_3;(d)&09_g5sudq?`92qr~4VQ&UwV?|?wKHxgx}ry)$%
zk#%!(Qq|MbR#FBk>FI+FKp>F*4P|{5B^`YbNKsx-52OuN{D-UOgADRQc?bT(b^2ef
z{=ahnG=!Hg*|Q$X-z^yBWZ>`PCHQyZs&4-ti_X95{fF!H@3H9qD_4#jjNG5;{lBLB
z9}~HU{tW-yyyT1jwm-_7-1GkA=5D=KE=NIe+1N-=8xp#(`Ru}D2y`yVOv&-49wc8d
z`Mm)hb$mQ;^8|v96STHj|1iv;PjM9EH_jU{AV8siYbco)grpd{5%*kNFyQcITlrRR
z%}ea}q==mlpKK$*ffdnf-3vRz0g?+3tGOOs#6h0nRIBrvv_4ej)g3ieL@`CTx_<7C
zwwQpPRpwXcTdcX@++VuqpPjUj0#0Le3QJp^{f(x4CbRU7E8M|QB_avye%e&y{{EuY
z3)HiiHmM)r07$WIRB8A-_eWqgox%rbVxVL#=m2tHd0>u1+F8mrV$LEu!Mi-Rjy~9X
z7TxYKlb<ET6s3ESEp_fz#9^!{WQ@k&Qwp{PSqr&ZRdhF_?Pux}iV}DS({Mqnh1UzL
zh0N0uWPPjZ==s&f(FW`YWEs*F7RJJ7{quQRTc>*jF&{8eT#E?8VEWHppqVw>ccc1u
zvqY*sOMfXA1NXV3&}B~dtQV2``@;GJn}M$z&lhe5J;&In&jg0so!K44lf;ON1MhFK
zfpU2_sgRB*Lc}LnMpx_XrfiZe$fM8uu9uLrK`z;0w&RT*ClK{W8T2e^Im9mk#SxLh
zTNQIZsL)*koivUA(S#;Rf~<ZJpbnw0tthE0o>Wz0>o}U)^H})uXw#HI=pRKG8{AMB
z_L(C+@e5)ubg{;^SV+j`My)1d_=Q;N)4k>Sl!DJ)n_|wvdv4JC=tQSi_~`?}{978(
zven?#pVdVc84XGTI`Lp>C-uJcw`xD$d5I2cxo<LEklN@}5D*a|3;^D0L9f<avIZ|#
z1JGVWo`XFG#G)^PJ^Wm)<Bq_nDqo-m#Ftuia4GA~U73L_mQMf=eGoM%^J3eS6Ky$3
z<?cbNdjLA&*b#=YP&GDbRJl~;!d|<qgHHZ1Z(0uT7&k^#cHc_1A?P+v2!ePmkDSF_
zVRdn|#hA12W3zgsSTF0cL22YhpYJq&hEAU+t8zuM6>CU|PhZve;?Koro$C2KT-St3
zLnqbEtE3_*2~#1Ph|cA?URA`dz;9?MAs|udYoLUVM{_E{ZU@znbl|VKX9DM%E5WfP
z&*4KuKU$$+%!_zEiedHa3hETzj?*|ar$p82QT~~c;p1Np2jv*!g+w&;#=IOFE43BM
zU}z!;-cLi!{b1#@&e4AJ;K6GB>KuIv^~(2KlQNaK5;!=;3i^(5gxk;`lJZ`r;hL^C
zK{BZcx~8xqLJMTih_C-Rqf3xXjj5h=YBx%K4$YL&xFye_SUWsU;y~vsQ&|rczXnd@
z`MzFNl=>>jldl{Pe-0<os??%EgM$|5y0fM5)tf_~#(3|2jdR-?0Xlua|HOK8&C!TN
z$6{~WDFEIp)<U62)waOqL3Z1DkJjtD*)jy3uNoZ5Ff?4WD9&^?lhKMFHH^m(ugZdk
zs4niY)+Wc8V^(jlqmxz{?LdWt0dtm%!U8c&3wTG!Zzpjh!A*CcK9QRQ+dJdI7nZUO
z4GTrZG??f|@shPRP*A!^-wthRtNeYto9Li)>{VSus*3Jzp}X=N+tY7LnQKzszZGDM
zNtOT|VoBGCibMgB!gE)BM8^A{2;*#2H*A=LcpE{YimuLw$7DVp9G&eYKh1ku`g?g;
zB=pI&<S(#vWSkFM4pN*Z%YfU67F2N-#X2>js=zUE)25MAJ`fj)S`K_bN)Rr}q<xCX
zI?>vTP`{}3?K&jKjXOG+KHJQdK=JU5HbQ{E+FN|4wvQP*Hdy}Yva_AD&_0gDLX^Y`
z>F0A|YQiDVvW3Z3Sd^1RM1pgkJu?&I+0OuVt#9wK1ZY8(*yBCTby>s>H-6$&+`X%1
zo=3k`i94t+X6x)D7Aw(Lx58^4zHm5pfn9^(G&Gm0u^G_2HC%ds6(I*#7>oI*gW{~O
zi9ru7Cera0=()MhqG6{h%$~~E6u6hCoa24%C*}2|37(~huEg9SHiy1!P?sFtT1X4d
z{!?Gxvou%UXdbRPdxy<EzjN<i@v9@pycnZ!saOw0I|kI<-Urz1C>nMSQKPvjpj5j!
zxWh29mQroT9isI52v7s7%+hOMF|qx%?v^ggA?x9{fcN!}yyE)XAV^!MIH`iQ<;n<y
z=+c_#uF5*w(l@vCm-J1KRlQ)!Dw;1c`YBH9>7(W%K~P-OiZ1AT#v?@Y$U6?(nKVYf
zNqm0V?*p2hJIDL?{!+YiWE`mQVrbWYpqN{9{;wG6ErJGtPcYgAKKS@od7{=nwHY$E
z`OPF-Q~1)|I|!*U4Z@G^%FnkXBELb*kOzJY#VU)-9yK_Uxoxr<Iw{K0BO*Go$@19b
zey2)r`R>yujozL+5E&hQKLTE7KDF=H$Dtg9qsodk5aIPvcj!jB4{TJ2Wq_)K)9QHq
zQqiz`1&5|WB2Cz>HwH6GwbUZ%%_BT6Fqtn?_KUNy1EUiCcPg<So*Gh*9>Ik&hP5d#
zFW-ra*(*b=arCU0lzYOZr1S|3@>y#4AC`%B;5b}!w?DfT&avkBUw_MQR0x2`7^xYJ
z;OS_B)1_du##H0AKMUhmsEouOs5s9ZURvkVJqo_NVDtl>)ZE%h6I$q!_MVzcspnmj
zZph&vjpl{#PZll&XKcxc_z`rrw<@UBC#?}T#71l$dB%V?@}kxvLG<*?r8&pN#8RQ%
z#SO#TMss9mk+oIf3irNB2*m9bk5Q+v(+xD#`yP?|21I-ox5TmMuwZ0Zif-}xJd)-u
z^g7h*YJ-gi%FeGOwj?gX)1yXTZzn~+^eF9>J-_6co5U;Lxli&l<@#;AtPwBnH>4l+
zr+@Cpu8Dpmy)!&be>}4)D?H3q|3tx8_oMx<``tSkaIf43<R{&6^rsJ-N!FYBg6hmj
zb#ak!Tw?Fp1>DRC?#rfJh3Ti|ma6vsm)HopI*GtA4_B!@i;yTwE^4NIUZ<p&iOYkJ
zOLg)tlxse{`vQvQ-0$|1Dv?ZRu>C~hBgUZMt7{UCzRQZ^{C1J%Ct+jh7>F*e_JOO+
zp81<#lc2haq*O5+51Y<wL@D+<!CasPT*3KvGKjv$%{oz!N(`Qd;Q6}6=D#oYickFP
zu!6)W#ld`1Qj}E|^ANgN5b1Hc=!WX-zq|#cln-*$md=~*nq(PqfpzmTu!#eULI%^@
zOdGYbhxv$)xq#}?d|am=MQFZ#$YT<t0oI(PmgoF@I_L@W0CEgkO(XbR!1qkPu(ILd
zElpAWI*}Bdtqrgv%9<(ON1nXaV8Tsx3e>1KS5x;|C&%wgfM(?0X6fN?*!v<Wy}hQb
zJcOqw+H32q--;Ut$4vrRZfSqt5F_HSW{C6J;KOej6MKe^DP7LunAA<S`P#+db7}Bx
zk{R~u5a2vU##!6n+u1*r6m`lYF@v{8@FXK06;3!2hmi)0I@;f>9$<*aFa;u!4_bhE
zSdjrO*|EWaWycYSFA`#xmhzI+WDGA8uw)vwBW{)ndmDPy;J9brvgIj8nl;KZbD)Jv
z3Tj<2mo{RD82&z-_Wlw$0ln&DBgsbB<mo|T19_Carp<lS%ANzKI{g_r;hCE8wi|b+
zS!O~BVuroK+2o0g=3=V3+^Zl$YkqJdTvPlyQZDd&RwNtk&AA+)@mt~rsm%!6XR^*s
znvJgMt#mgYIOyn<URahNJ@yTLDkGV$#?<^8VV#VECg6blDFD{dJ@j60hY-ItfAj-G
z9rapO?fjmf0=F5mMmBE}(SWt$<~roPS!i2T9d{G0M7y(dK#>odLh-`(!b4NVnwCv&
zmNBZjG8;}BWN^$~A)m2;xz7nF4+(h8Ozt49yfA<@C;Ie_n0*1T{l(CD-eqx<IEZAy
zy!Tg^xxua-(=Vm2{rkoU3Xc@vO?8MdKZ}8fW6XzV+HS4U0MvU&A?ef=#2b?DUVE^v
z=#*$m2{fn@12)^q+g0`SQJD`$d2{4grRp*IhdlG_Tz_)xYOg5GCdyO1a5Jcmqt}@K
zHVbg}LGF?`seysOqXt_JDg@W<50(L{fwlL;&JAgv|72<HGLilQ=0WyTjdnt$6cVd>
z-nk(T-L70?RPs~vg7xlqWy>F%j>jrjzIEX|$zQECf^(&9bj)7xcqz-?6!T_-WRoju
z@09q~B_DI<qr`O*38=a%=UnJ6NLUkqrK=f?k0Y+%WlB>UFtWPI_w^oPhJ~AY&axZ(
z5@swlZ2ahgM;ov*^s#d51U>rT@)WZ~b_6tPNP0!O5*maC*97sX`t+Hi$}tmj4)*f3
zwnhAwR8JPvc762KxvL$-swP>P=>m-sp2sWYy%1PWg`2La2<gXz)p-&m#j2Nz5YB)I
zkf(NYD;~^%w5yhli-kuG?Q5rgHY6qs7qzuxJOLpW+h!7nuN;asN9Uu#No#Q&aO=BV
zd+MH)+Ro#;JdKY1;T>zUsw2Q!v#?8sl!sC?wfKQEFx+BEdU~L>^!GLTOw$3prsFT8
zD-Sty?5aVBTsa|K8oGHB4_U1GTD=~j!B7(ouns9+n(+zuURMsJEU_uphIUBfURGkO
z_390+UP610s^i&2mO)VhZ4!(|HU7(M^(s9@p_DJNg>X}+@f6w?icFssl?l(gd!gtw
znE5zegszg=0REm!R|<wUKB3(Aq^i({$+_K7!*+pxDbJ68E-gLiTmQoc=a!-B3NF?O
zJhG22)Dm=6H!m+M)-osA1vUb#>yQ?o9~%^fh)$$(Q08ek_HNAi@p6Uc`Atf@R2R9e
zs1Onvb&T994`SWR+5sK_WTBCH=zbSDO3%l?9jgr4Up~k*O0-dRg}tZa|8$f$Q1G;k
z+X^3>RT(Q>pIMWaxqvtC+|(FWvJ#L?+AqNgIkPLI<!1S>3s#as-ly<?zn{zuYJK|U
zo5AFfyoG~PqPWM0g8NP4Oy4z!!R(O|&c%+J_|(f|+%W$%J$f`ZTHg%@yZMuKnNJ;9
z^OW|A)|-3wiFy+otM+zG8KximF?38^2N|-vp+3YD0DDTd9aKsm1yceQ^~aZXjBtbs
z*hyuDm8j_IBb?lbTQiA!wP*liQ_>W$Qd|CG(Wgj9jX5lU-6&QQfxYv@3-(!ZSV0;8
zjWj@&S?2kxfqW;c2|FC@pu|9UdEW$jpY4+2=#%=_N2LgCDFkRDq7D4ZH!a^f&7X;p
z_`KdxJ%O^|L%qzdawEEK7?{m*TtG@h6x;t<ZF)u)k|iixX^<q1(_~%~pNpR4uSe&;
z#k*X|HjnnvqzF*Ne3pyAQ(%K5sQj;qPs!CLe|4N`aUBY4fDXSy!@^B40Ft$xLYOhg
zv@!Bm`OB9aN7wHBNWoBHPTHrDO+WQbmQJ!C_4a&2AQ~M9nnT!g^!sjQO|Ww|kJu)7
zCxfA#<QFiRwKol4=mMT{Wb4+LGcpEpSkZZcqIbG!b4`Dkmexw0I~VACbwyR|*1AMl
zb0}D;PAgbx+6E!%>um;moRg1RTHG1EP#O;F^ci06XA7;3$;FOeSI|_M#cLaWi|%%&
z#kt3-fht*5zGfeo{4RT%e8THBQT5iyTH;pUGr8#z=j%9EdGh9+*G;02x>xuj_HGP1
zv*{X)(%cjqqlN^Gg=Tg_&P0CKRx^%s<?x^3<d>-Fx~nny*_yFjzn_!KEE_}Fd%6Ug
z;<MI_G#NcA0oR<ccD);Gtyq<OP_vX?b-SY};~6u6Xl;#BL5sGAozQCZNo_Yd{6w$E
z?NKpjZj2_|>1W<Rklf<p4lG!EJ^?^Eml)NRM@CuX@%99rnBOAdv3EHZaG#eu1_e*s
zd6tf9sTRMzwdDnMtx2`2ZBf5i<sXw2%~{dFzSy9?7dz+MQ!4yy2%vsCoB`^Vn*(dC
zPy0n9CR8rf?XB1&8y!3SnWWy;pJzmWR&V2WJ-;e~a*i@dQTEA0D)<+|#=!4#_M;#i
z=%kfs!uo~D0FOAKSZWRRD<*;_DSKyH!RxSPljkXQJ1#|q`(Dj<?fxBTS|D<C=5RaS
ze?RAkI@;}r?3F84A93+v51$5DKWt&)A*f0-5C$lB<hGe0Y`P_Tm@{<^G0#Pq>hRId
z%5;P5)&0|u!}YG6dR(pZDxdYXY_w!|ztIoqfHnhf@qV)p$8v-ZIf=uRz3zs0_?BC1
zUC%JIJt%&zn|>45H<<6liA2?}hIvX&$<F;81UIEbg~)EnB*Jklvk}aPyInh+xo|ia
zLxEXurI|8;{ZVh~KE+g~S0<)s^uc?z4k^b?v4;Q&<>71U>N}mTZNAy!0LDm<ojdy*
zoOggdeNP<ur!tw`;Ie7Q8WtU^0v9qlrGCCkou_HYnja}`=jr^YEJ>h(tqenVy?5=4
zJ}rN(XZU=aCAZOjvG*dg%7Upuk?IQ2PO|if;C}9)uDSC;&kaVgY|}PP-eSaJKBAZ`
z*r)vv_dPn0ASv5`o$Xz}I-$yFCly?&^I>OL-rAbFKjC!-ZI|9B-?|{$){E=PeiKXX
zy@?a~ySCDW&(_;*R@bG(F8`1;4fP5+U09}4Uh}Zd*jfO&6Y`M-o5gR`EWcz>W#YI$
z?_Fw88jaRhZ_CBBBqYB%VB5*BtJ1#nvu)^cs84N6QiG)QZywbBChePR5d{1DD#q?Z
zp0<PSbB%vx>AiZQM*o3-fi8T!dvLRx@H$!=qu;1zLL(!@m}cHrn>{$Wro%DX5mSe0
z$z)#0W53akG~gLR03#L%t)r@R;dK!;+i7JYDw6oWxN{hs{C*me&_pTfk);XA!07=#
z>FBx_l24dQx7p@U@fgzOfFzNA#SbsNlCJ=m>0^Vkuhqy8Gl!atOA@tszRycE6MFN%
z2vNp*?=j?pVlK}7wS9Xw^_dx?`f%!`2nSY*{W$A`t8Fze*W?bCERa~2OCM!E+58Rk
zErriI0?umBcBuv;b_@r~JZ5mYf?Gd%84G7+W7v{nKfk%TxL^&#fZcm4;MoAYJ&NIK
zYEm?8R4I2aGkxdBub$KrA<8#(@)gX(sZJu25d~|4Y&}!^r>y`c`ef{D4y|8OA7=PQ
z_RYDfNCiIfWsk^lTG(v#Jz<Jqu3zm)PMQNy(kEBgw^JkMcFjQ>Ztb}*0-ZrLA_}I`
z56-zBzgaRd+3>Yg-&a@ZO{77=C<-dywP+cg_=Zr@r*z0J#r3wz$Urdn`T`(aO}tcW
zEWPaus6N=71j1j%Y%NSu>S1EyfXTZN<s!Bm;X{d{nyzNa-T5hU6_Qmn0k7}0$;jke
z6PmrtBTNm&BfpGEvpxD=|7xEoC=Se*<2(rY1DuKiNkgbMM)z}{L_!_g^%AG?mX3l`
zP;FJtb+$>DP(wkJy?*?z()MrwG%M2033&Thg`i9ICF&|5ZLxoN!}4>(E3yv7$H-5I
z{rLIIo`t!L>W3gQ<TGv||5a~?H*E7#o)63iq%J~nZ;F?yGvVB-inLclCdJZg@^Ez~
z48>XAOIr!^d_>|#Cx=ev)bal@&YH9s6pi3(;ljFl>fa{FTA$kg)-sr)%G4n2vSfyp
zdP@yMgTIAIrre{w!aw%M^frhvu+&c}5p^iAr%++KLzUSrGM=ITi-xiIzV9M_chydl
zw(KQjoGtDWb`t9VSxe#FJzd&k?|kU~N<CA^=X|#7Fy+BV@^W`FrB^g@`RrPbr$c{L
zoi)>w-b&<Ccks)}9Y<#kuOknQQ=hw%v!A~;SuCDMYg~aGtR0xCFX#0Jc9XZ4gB#S2
z!>D9xBMqRED(ng2RdbCp&5ArFswz{+vH3dhfanX!*SoN|nuG7>14C&_+uM#1gWP4S
znh4Uby4QT%Z=p~x&bDkXXdgbB#i}{jBbqt+dV1||Ms6mlx^2N5W=qfcD)YJaL2qpX
zs_qlRC5V!9S)H&ipS*B+Ew){WQ~A|Ds~_4LpC^^J&Ek`<KL`1({r(=UGAEi|riM|F
z1Qf-5dG!j5|0Xuq#f5V*kAY1{??u@yFvf9~q<k-|UhEHW@PX^Uzx>ymDt~D_PPBSo
zfnoZ`OVc2lUgkk~G}M7OO<gDBkzA^Fv21{c^YGo}?Gl@zi68)_U!hcU&_VZiG;|wb
z!3Xtoy#FNtK<&o?2mnkSJ->}6zTFngzy=xsX$CE1=jMnZnmlvcqMBE2E|Om|J!1`^
zeDehdnuMDI)CLDTI%dAF@WF2J7F%-8OdJwS0MhR?xZp#-m#uZqCyp?fXpeu2!I1sx
zDkv2v{gtJ@s?KNAsE%ijf)D!D@$$P3vg7ihn8&Sk=ezImu8_S1rZ?j!cV@o1gKOTU
zhLtj+p}lH`WyXh-!2rTdOByx1I}(SlWO?RdRqq#d4tnxbT8NH}VflIK9?dZAQ+PRW
zb`Ooy5*8--pdrK}1hy;7Nd;>B>4~9Xhkd0p)UrFSnW-k%{W>3%6j`I10vDu@=OxV=
zM_DYO!D$AofO(`cnrw_UJ?3HfNmL>TduLo1sQvl0L=Y5!A$3=FWuf&+@mr>aU=ct6
z42=GmX*}5w(8MWZkwDxW$=#<@l%8R^RV}6f5cxW%CN}?V8gKaa`MM;Xz6*#$gv$4F
z$>2w&)gD%+w3THCq9Z6_FHw<mlX<YQqOB}cfsadq=8&(bADAWIm;SlTqMMf~O_A=0
z^Wp$7ODvY}Y4#k;b9nafC~hh|y+lwHsDm&ZG9?HP#de+WBo_CXX9?d-sk8bTiX;nh
zdA^v}7UokI)h-}rv&}j&F{M2oV8)sbNmGc3STvQwvnzqREu5xlZ<lA<CsNV+ufZ~0
zPNI&<q);Qri7R9@($=nK+eKWSkt?ZGY<;?1lbrl(%F_WlY@L(1{K(GX$NSG#9?akk
zJD$5<9F~39@LTLl!mB5I#3-W}AXA#&kRfQ<Rtw0XogjVXd(C;l@Pk>r;bV22tr<AG
z<RV-7^wP}(Bik4XGIZhvmdPtEEs=o2Zb7svPHvIQCh$wl*~H^+Fl+Y(H37PmR~)Kx
zTUuze{?`>sV*WtJY|oEuY#Zs)-E%=cu9N~d>=yJwvQ4M{FE^V5ww%#7ysj`232)0F
ztHlZPQ0?19<GM2oMd?R@9v;k~v8$R0<wBPWd|X1#;Q~mz>rDmgif3-HL>^#Ha{6Pb
z8d<I!k*s!FuH@DiaMnf^=?G<QA~Z-QV@yJFu(rDt&T7dlt*ilQ!D5(N6lIm>v(fs7
z(dI%t61Rc6K}Dnpv<S2nB4bPtE(cl-z16c{YVBHr8(PBYp;~00Lwhxt23*S^fU2zX
zSb^|Jd~%#?2A^!!<=&Zg8FE^6g*C_U;b5A=_Xbzk;4QqD)8p>_Hmj|g@cGu^#(@Z|
z6eObB+Ugnq@?MAqZfijMZu4cUiLv6u0R*-OQTervQ(>8hN_;yuJZpJKWKwr8bAhht
zoe|h%yk{ac`8QetCt+ahHQ_{#ByW=Zi&nw=;zjk7PM7L?Y*uck`lmaVKg{9W{k|Rx
z7JH3YW~Q{P71--wudJl!FV2ogST2ckQ?1lj$+6Nnp0WssgAz=t;%Z|OW|2li*nKq!
zVrn*v&)?@0<3*si?htV==1p4SF}a7pdQPu*?qR1*Wl?uj#;r{)qQsozq!o?EmESh=
zWQG)i*R)&J-c_U@y~c(2f+pBUxwwQfW^IWEErHL9RhsM?@7?t-0*hmol@P=E_836l
z@s-BDBDh_?DZJU8JD8qc$fzM5L-|)(!89kDRZhxzIb0Gwgknl`O8e*>&<xp@-fO9@
z4=2y(BU4}z8f-tWvFk}+e>;e%M$XVP;pwX$M5BC{89_Mlm?D_Lu~+OyevH-UFpP%7
z1GN4{BmQw;M43wKPXMdJ=r%+ujcluC&T|3eCcWZVo5f!gs!OO7YD5OMISi9GIu_!{
z_x)I<^9G*(szlIjG?1bq$n_pXWl2y~d_Q{p_{O8(X0enMYyP6BCsY?3|NP&;NdJyr
JosMJt{{cKZdjtRg
literal 0
HcmV?d00001
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/Contents.json" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/Contents.json"
new file mode 100644
index 0000000..fc63bf8
--- /dev/null
+++ "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/Contents.json"
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "工分æçŽ°å›¾æ ‡.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "工分æçŽ°å›¾æ ‡@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "工分æçŽ°å›¾æ ‡@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.png" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.png"
new file mode 100644
index 0000000000000000000000000000000000000000..addd87d3c4d6fd930dfc49f12121ad29a5af8032
GIT binary patch
literal 1497
zcmeAS@N?(olHy`uVBq!ia0vp^B0wy|!3HD~Z_Q5tQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07??FOLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&rCPjz|361+)~fb
z)ZE;}Tt~skz|d6Rz*yhdK-b9F%EZ9R#7F@Olz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09sGdR=~G<*}2
zGxI=#nqXbNzE+-j#U+V($*G<$wn{*A^fEJ3tehO(OdXvp3|&p#ObrcP%`99k&7E8g
z4NZ((TnrseO<;Om@{>z*Q}aq-dQ%X3jd1D(C5YStpv^9+MVV!(DQ-pixe8#9TV-N#
zi;Ih^rKzQX8PGgK>~4YRO~LIJ1DtNr2RcR{6un5%4HE*UArKRuc!3;v@=whJruiaZ
z;x<jV|Ac{o$=%b%F{I+woN4hHeStE^=YM~>RLm_~SV<^%>&$7~Q=TN5drgwQJZXo3
z`ITGq#g=ZH=n<n3+*RcMZ`r~yk2^E=i)SCzQwu(2^m+Tw??118U%C9U<@w#^`+w~@
zf7|l>&v~E!o%{ah+-&L0SV7A|iCGKycO}Ta3AoSsgZb<S@ok6iet9s*eFNV-Cz;ga
z<q=HsmwNX(o_`n=V&S(dDe#yU-+_Lfjs68^u21CWsbHUbLEwcw_xx_bEf(zgOgneW
zN=;F{!IV4iTfKqsu`W>?zV$Y5lNC4W9DG_J`HbzCZvp?E87K7Cx3+H(S;oGhbKR*2
zGn-aV{cwr%hrzVcDCZ{b2fM-od}JDZ*CnjEY-p`zS5#nkvRr9L@Xq4L+H;z8qmDXC
zeA*Mv);{Tx!PMu`Gv4p{B4t*=;<aVbTEE}<5jop#z7X7;yjAX0qUx8XsY@eY?PvWO
z@GxS-MLRS0bFZpj1Xzh3I?5BT7AT+1n)l^Z=Ik%RZV7yMrgOikp4ydbm6de!Xz#@-
z4;F;YxO{A8g*i{grjjYoL%%PxkS+6?cTlM!>15b%(HDWDv)C`sDSW&!t?2N(DYK&z
z<Gn8Q)HBK*G&{c|QMl&K%MG%z%GEcHn(*<bsCK7rxL;m7<H6PgeK*fbPWyTO#kbey
z*%`%Y7015J*r<C`e}S1oj%6L^{smF@cw(ieR)#*P-PE;y&drk%p$F>A+~03HDa`nr
z^X<hahs3sszuWQjwZ<F0g4$gl1J&P_yx@8<Emmp^=TxipOK1J*E=sLudw0_9{w1dW
atP%_wS=FHmPGyrpg{`NnpUXO@geCw$20iWo
literal 0
HcmV?d00001
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207@2x.png" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..9185a6290ce1d0dd0fce3f040e20485bd79b5813
GIT binary patch
literal 2273
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
literal 0
HcmV?d00001
diff --git "a/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207@3x.png" "b/Car/Assets.xcassets/\345\205\254\345\210\206\346\217\220\347\216\260/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207.imageset/\345\267\245\345\210\206\346\217\220\347\216\260\345\233\276\346\240\207@3x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..4bced33c44d79fc790000d364fbdc91825ad8e1f
GIT binary patch
literal 2756
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
literal 0
HcmV?d00001
diff --git a/Car/Base.lproj/Main.storyboard b/Car/Base.lproj/Main.storyboard
index fb0d88c..2e00027 100644
--- a/Car/Base.lproj/Main.storyboard
+++ b/Car/Base.lproj/Main.storyboard
@@ -7,6 +7,7 @@
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+ <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -722,7 +723,7 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="cXM-5C-QrS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-287" y="1415"/>
+ <point key="canvasLocation" x="-222" y="1415"/>
</scene>
<!--åŠ æ²¹å•-->
<scene sceneID="Ujh-8H-jYk">
@@ -1109,7 +1110,7 @@
</connections>
</tapGestureRecognizer>
</objects>
- <point key="canvasLocation" x="486" y="2096"/>
+ <point key="canvasLocation" x="486" y="2118"/>
</scene>
<!--Bill List View Controller-->
<scene sceneID="cPU-nz-qim">
@@ -1131,7 +1132,7 @@
<rect key="frame" x="0.0" y="28" width="375" height="30"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WXk-60-mnv" id="Hdv-Fv-6SO">
- <rect key="frame" x="0.0" y="0.0" width="375" height="29"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="29.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" tag="1111" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kb-L7-Q1S">
@@ -1161,7 +1162,7 @@
<rect key="frame" x="0.0" y="58" width="375" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="agP-LF-ma6" id="X7Q-g8-dvJ">
- <rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分结算" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4g-d8-qvx">
@@ -1972,7 +1973,242 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="0MH-i3-O2Z" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-954" y="2120"/>
+ <point key="canvasLocation" x="-954" y="2118"/>
+ </scene>
+ <!--Account View Controller-->
+ <scene sceneID="39e-7h-0ZC">
+ <objects>
+ <viewController storyboardIdentifier="AccountViewController" id="wJQ-XJ-kfS" customClass="AccountViewController" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="m08-Dl-xNw"/>
+ <viewControllerLayoutGuide type="bottom" id="iZz-pX-fcp"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="9rB-Zq-WmE">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="wechat" translatesAutoresizingMaskIntoConstraints="NO" id="MbU-Ge-nZL">
+ <rect key="frame" x="130" y="87" width="114" height="93"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="114" id="S6P-JJ-5Lb"/>
+ <constraint firstAttribute="height" constant="93" id="dVX-xD-7Kg"/>
+ </constraints>
+ </imageView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0yF-fV-b9c">
+ <rect key="frame" x="20" y="204" width="335" height="0.0"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2t0-vQ-Pt1">
+ <rect key="frame" x="20" y="417" width="335" height="50"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="50" id="cCO-mS-dji"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="20"/>
+ <state key="normal" title="ç«‹å³ç»‘定" backgroundImage="btn_abled"/>
+ <state key="disabled" backgroundImage="btn_disabled"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <real key="value" value="5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ </button>
+ <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFill" image="login_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Mtt-an-81f">
+ <rect key="frame" x="0.0" y="554" width="375" height="113"/>
+ </imageView>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDM-M0-XVm">
+ <rect key="frame" x="0.0" y="20" width="375" height="375"/>
+ <subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ikj-Bd-SMC">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分总é¢ï¼ˆåˆ†ï¼‰ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3CH-uk-ab4">
+ <rect key="frame" x="16" y="0.0" width="140" height="50"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="140" id="1C9-V3-a74"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.63179747495554428" green="0.63179747495554428" blue="0.63179747495554428" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shc-Fb-T6n">
+ <rect key="frame" x="156" y="0.0" width="203" height="50"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="shc-Fb-T6n" firstAttribute="top" secondItem="Ikj-Bd-SMC" secondAttribute="top" id="0kE-18-wka"/>
+ <constraint firstItem="3CH-uk-ab4" firstAttribute="top" secondItem="Ikj-Bd-SMC" secondAttribute="top" id="5cD-pu-cPn"/>
+ <constraint firstAttribute="bottom" secondItem="3CH-uk-ab4" secondAttribute="bottom" id="Zjv-rB-Daq"/>
+ <constraint firstAttribute="trailing" secondItem="shc-Fb-T6n" secondAttribute="trailing" constant="16" id="aBT-nZ-VtR"/>
+ <constraint firstAttribute="height" constant="50" id="aIT-fx-BPE"/>
+ <constraint firstItem="3CH-uk-ab4" firstAttribute="leading" secondItem="Ikj-Bd-SMC" secondAttribute="leading" constant="16" id="dTd-hW-WiQ"/>
+ <constraint firstAttribute="bottom" secondItem="shc-Fb-T6n" secondAttribute="bottom" id="pJw-Cp-0ob"/>
+ <constraint firstItem="shc-Fb-T6n" firstAttribute="leading" secondItem="3CH-uk-ab4" secondAttribute="trailing" id="yTs-TZ-qne"/>
+ </constraints>
+ </view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kzF-jP-QSk">
+ <rect key="frame" x="0.0" y="50" width="375" height="50"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å¯å…‘æ¢å…¬åˆ†ï¼ˆåˆ†ï¼‰ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Imm-ya-fEn">
+ <rect key="frame" x="16" y="0.0" width="156" height="50"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="156" id="bF8-za-194"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gcf-Tq-L2E">
+ <rect key="frame" x="172" y="0.0" width="187" height="50"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="gcf-Tq-L2E" secondAttribute="bottom" id="CmW-54-WMc"/>
+ <constraint firstAttribute="bottom" secondItem="Imm-ya-fEn" secondAttribute="bottom" id="Dcw-Eu-B8a"/>
+ <constraint firstAttribute="trailing" secondItem="gcf-Tq-L2E" secondAttribute="trailing" constant="16" id="Eqt-qP-R7l"/>
+ <constraint firstItem="Imm-ya-fEn" firstAttribute="top" secondItem="kzF-jP-QSk" secondAttribute="top" id="VGa-l5-Gqp"/>
+ <constraint firstItem="gcf-Tq-L2E" firstAttribute="top" secondItem="kzF-jP-QSk" secondAttribute="top" id="bqH-3U-WOU"/>
+ <constraint firstItem="gcf-Tq-L2E" firstAttribute="leading" secondItem="Imm-ya-fEn" secondAttribute="trailing" id="efV-9v-EV7"/>
+ <constraint firstItem="Imm-ya-fEn" firstAttribute="leading" secondItem="kzF-jP-QSk" secondAttribute="leading" constant="16" id="gV2-JG-CP6"/>
+ <constraint firstAttribute="height" constant="50" id="tzW-rK-6c3"/>
+ </constraints>
+ </view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pwV-fr-77X">
+ <rect key="frame" x="0.0" y="120" width="375" height="130"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="本次兑æ¢å…¬åˆ†" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kX-H2-UPG">
+ <rect key="frame" x="16" y="0.0" width="343" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="qzV-P2-d2w"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
+ <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JgD-Na-DHg">
+ <rect key="frame" x="16" y="40" width="343" height="60"/>
+ <subviews>
+ <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="工分æçŽ°å›¾æ ‡" translatesAutoresizingMaskIntoConstraints="NO" id="gaN-oA-ouX">
+ <rect key="frame" x="0.0" y="13" width="27" height="34"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="34" id="94q-Sc-Vfe"/>
+ <constraint firstAttribute="width" constant="27" id="npG-8x-hgD"/>
+ </constraints>
+ </imageView>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="700" placeholder="请输入" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oSv-7Y-OGG">
+ <rect key="frame" x="43" y="0.0" width="300" height="60"/>
+ <nil key="textColor"/>
+ <fontDescription key="fontDescription" type="system" pointSize="25"/>
+ <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
+ </textField>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RZ5-gY-1St">
+ <rect key="frame" x="0.0" y="59" width="343" height="1"/>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="1" id="hYi-TC-usy"/>
+ </constraints>
+ </view>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="RZ5-gY-1St" secondAttribute="trailing" id="7ca-Yj-eR3"/>
+ <constraint firstItem="oSv-7Y-OGG" firstAttribute="top" secondItem="JgD-Na-DHg" secondAttribute="top" id="8Th-on-OZy"/>
+ <constraint firstItem="oSv-7Y-OGG" firstAttribute="leading" secondItem="gaN-oA-ouX" secondAttribute="trailing" constant="16" id="96x-SC-TCp"/>
+ <constraint firstAttribute="bottom" secondItem="oSv-7Y-OGG" secondAttribute="bottom" id="Gei-wR-VuW"/>
+ <constraint firstAttribute="trailing" secondItem="oSv-7Y-OGG" secondAttribute="trailing" id="Odi-Jn-E28"/>
+ <constraint firstAttribute="height" constant="60" id="Wk4-Dk-bjA"/>
+ <constraint firstAttribute="bottom" secondItem="RZ5-gY-1St" secondAttribute="bottom" id="g59-fc-gFy"/>
+ <constraint firstItem="gaN-oA-ouX" firstAttribute="leading" secondItem="JgD-Na-DHg" secondAttribute="leading" id="l0L-hB-ZMA"/>
+ <constraint firstItem="RZ5-gY-1St" firstAttribute="leading" secondItem="JgD-Na-DHg" secondAttribute="leading" id="s4l-8Q-o1w"/>
+ <constraint firstItem="gaN-oA-ouX" firstAttribute="centerY" secondItem="JgD-Na-DHg" secondAttribute="centerY" id="thT-Gp-RO7"/>
+ </constraints>
+ </view>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å¯¹åº”é‡‘é¢ 700.00å…ƒ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IyB-f2-cFo">
+ <rect key="frame" x="16" y="100" width="343" height="30"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="JgD-Na-DHg" firstAttribute="top" secondItem="3kX-H2-UPG" secondAttribute="bottom" constant="10" id="83t-ln-VcR"/>
+ <constraint firstAttribute="trailing" secondItem="JgD-Na-DHg" secondAttribute="trailing" constant="16" id="AwO-Yp-xXU"/>
+ <constraint firstItem="3kX-H2-UPG" firstAttribute="leading" secondItem="pwV-fr-77X" secondAttribute="leading" constant="16" id="Hxw-Tc-f1S"/>
+ <constraint firstItem="3kX-H2-UPG" firstAttribute="top" secondItem="pwV-fr-77X" secondAttribute="top" id="Wf7-28-hqL"/>
+ <constraint firstAttribute="height" constant="130" id="YQf-HS-79r"/>
+ <constraint firstAttribute="trailing" secondItem="IyB-f2-cFo" secondAttribute="trailing" constant="16" id="ays-03-cIk"/>
+ <constraint firstItem="IyB-f2-cFo" firstAttribute="top" secondItem="JgD-Na-DHg" secondAttribute="bottom" id="ccU-nz-adO"/>
+ <constraint firstAttribute="bottom" secondItem="IyB-f2-cFo" secondAttribute="bottom" id="eiX-HL-bsR"/>
+ <constraint firstAttribute="trailing" secondItem="3kX-H2-UPG" secondAttribute="trailing" constant="16" id="hjP-5i-x1Z"/>
+ <constraint firstItem="IyB-f2-cFo" firstAttribute="leading" secondItem="pwV-fr-77X" secondAttribute="leading" constant="16" id="mha-GN-X3A"/>
+ <constraint firstItem="JgD-Na-DHg" firstAttribute="leading" secondItem="pwV-fr-77X" secondAttribute="leading" constant="16" id="sBM-zb-0RJ"/>
+ </constraints>
+ </view>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="说明：å¯å…‘æ¢å·¥åˆ†æ˜¯æŒ‡æ‰€æœ‰å·¥åˆ†æ€»é¢ä¸ç»åŽå°å®¡æ ¸é€šè¿‡ ç›®å‰èƒ½ç”¨çš„工分。 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odP-oU-v4Q">
+ <rect key="frame" x="16" y="254" width="343" height="36"/>
+ <fontDescription key="fontDescription" type="system" pointSize="15"/>
+ <color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" red="0.92156862745098034" green="0.92156862745098034" blue="0.94509803921568625" alpha="1" colorSpace="calibratedRGB"/>
+ <constraints>
+ <constraint firstItem="Ikj-Bd-SMC" firstAttribute="top" secondItem="ZDM-M0-XVm" secondAttribute="top" id="7Ad-R3-BH9"/>
+ <constraint firstItem="odP-oU-v4Q" firstAttribute="top" secondItem="pwV-fr-77X" secondAttribute="bottom" constant="4" id="AyA-9m-m2l"/>
+ <constraint firstItem="pwV-fr-77X" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="Ckn-vE-9fU"/>
+ <constraint firstAttribute="trailing" secondItem="kzF-jP-QSk" secondAttribute="trailing" id="Gme-Vl-gMc"/>
+ <constraint firstItem="Ikj-Bd-SMC" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="I0D-9H-6b3"/>
+ <constraint firstAttribute="trailing" secondItem="pwV-fr-77X" secondAttribute="trailing" id="Pp8-uj-Paf"/>
+ <constraint firstAttribute="trailing" secondItem="Ikj-Bd-SMC" secondAttribute="trailing" id="U1E-wr-f4N"/>
+ <constraint firstItem="odP-oU-v4Q" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" constant="16" id="W5c-On-wlh"/>
+ <constraint firstItem="pwV-fr-77X" firstAttribute="top" secondItem="kzF-jP-QSk" secondAttribute="bottom" constant="20" id="ifA-2M-v8o"/>
+ <constraint firstAttribute="trailing" secondItem="odP-oU-v4Q" secondAttribute="trailing" constant="16" id="kts-NS-Kba"/>
+ <constraint firstItem="kzF-jP-QSk" firstAttribute="top" secondItem="Ikj-Bd-SMC" secondAttribute="bottom" id="qen-lo-vLw"/>
+ <constraint firstItem="kzF-jP-QSk" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="xO3-y7-WDt"/>
+ </constraints>
+ </view>
+ </subviews>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+ <constraints>
+ <constraint firstItem="Mtt-an-81f" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" id="0Zn-uG-1mk"/>
+ <constraint firstItem="MbU-Ge-nZL" firstAttribute="centerY" secondItem="9rB-Zq-WmE" secondAttribute="centerY" multiplier="0.4" id="4XB-YY-c2a"/>
+ <constraint firstAttribute="trailing" secondItem="0yF-fV-b9c" secondAttribute="trailing" constant="20" id="4Y9-96-4cd"/>
+ <constraint firstItem="ZDM-M0-XVm" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" id="8pF-d2-vFf"/>
+ <constraint firstItem="0yF-fV-b9c" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" constant="20" id="ATI-an-DBW"/>
+ <constraint firstItem="iZz-pX-fcp" firstAttribute="top" secondItem="2t0-vQ-Pt1" secondAttribute="bottom" constant="200" id="DCh-X8-qKE"/>
+ <constraint firstItem="iZz-pX-fcp" firstAttribute="top" secondItem="Mtt-an-81f" secondAttribute="bottom" id="FTb-Rs-4je"/>
+ <constraint firstAttribute="trailing" secondItem="ZDM-M0-XVm" secondAttribute="trailing" id="OMC-g2-aYR"/>
+ <constraint firstItem="ZDM-M0-XVm" firstAttribute="top" secondItem="m08-Dl-xNw" secondAttribute="bottom" id="OX2-x2-g15"/>
+ <constraint firstItem="2t0-vQ-Pt1" firstAttribute="leading" secondItem="9rB-Zq-WmE" secondAttribute="leading" constant="20" id="UnX-GI-23i"/>
+ <constraint firstItem="MbU-Ge-nZL" firstAttribute="centerX" secondItem="9rB-Zq-WmE" secondAttribute="centerX" id="aNT-iB-NrZ"/>
+ <constraint firstAttribute="trailing" secondItem="2t0-vQ-Pt1" secondAttribute="trailing" constant="20" id="cCX-eL-dj3"/>
+ <constraint firstAttribute="trailing" secondItem="Mtt-an-81f" secondAttribute="trailing" id="j6Y-YT-8km"/>
+ <constraint firstItem="2t0-vQ-Pt1" firstAttribute="top" secondItem="ZDM-M0-XVm" secondAttribute="bottom" constant="22" id="mYJ-kO-Zth"/>
+ <constraint firstItem="0yF-fV-b9c" firstAttribute="top" secondItem="MbU-Ge-nZL" secondAttribute="bottom" constant="24" id="sBX-WV-gdN"/>
+ </constraints>
+ </view>
+ <connections>
+ <outlet property="labelInfo" destination="IyB-f2-cFo" id="wCh-3H-mHf"/>
+ <outlet property="labelToWechatInfo" destination="0yF-fV-b9c" id="Afe-j8-UoZ"/>
+ <outlet property="labelTotalScore" destination="Ikj-Bd-SMC" id="3c0-LY-F4q"/>
+ <outlet property="labelValidScore" destination="gcf-Tq-L2E" id="pd9-CJ-fFi"/>
+ <outlet property="scoreView" destination="ZDM-M0-XVm" id="vOR-xY-WSn"/>
+ <outlet property="textFieldScore" destination="oSv-7Y-OGG" id="Yjl-0u-our"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="aAC-pl-TYF" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-964" y="2776.4617691154426"/>
</scene>
<!--Watch Login View Controller-->
<scene sceneID="IfM-Jf-5An">
@@ -2054,7 +2290,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="k1K-ML-jIs" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="-298.39999999999998" y="2117.9910044977514"/>
+ <point key="canvasLocation" x="-222" y="2118"/>
</scene>
</scenes>
<resources>
@@ -2081,6 +2317,8 @@
<image name="right_arrow" width="32" height="32"/>
<image name="scan_icon" width="25" height="23"/>
<image name="state_used" width="57" height="57"/>
+ <image name="wechat" width="100" height="81"/>
+ <image name="工分æçŽ°å›¾æ ‡" width="20" height="28"/>
<image name="引导页1" width="360" height="640"/>
<image name="引导页2" width="360" height="640"/>
<image name="引导页3" width="360" height="640"/>
diff --git a/Car/CodeClass/Account/ViewConstrollers/AccountViewController.h b/Car/CodeClass/Account/ViewConstrollers/AccountViewController.h
new file mode 100644
index 0000000..82baef4
--- /dev/null
+++ b/Car/CodeClass/Account/ViewConstrollers/AccountViewController.h
@@ -0,0 +1,13 @@
+//
+// AccountViewController.h
+// Car
+//
+// Created by Javen on 2017/2/8.
+// Copyright © 2017å¹´ 上海勾芒信æ¯ç§‘技. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface AccountViewController : BaseViewController
+
+@end
diff --git a/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m b/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m
new file mode 100644
index 0000000..6baafc8
--- /dev/null
+++ b/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m
@@ -0,0 +1,78 @@
+//
+// AccountViewController.m
+// Car
+//
+// Created by Javen on 2017/2/8.
+// Copyright © 2017å¹´ 上海勾芒信æ¯ç§‘技. All rights reserved.
+//
+
+#import "AccountViewController.h"
+
+@interface AccountViewController ()
+
+/**
+ 工分总é¢
+ */
+@property (weak, nonatomic) IBOutlet UIView *labelTotalScore;
+
+/**
+ å¯æ¢å…¬åˆ†
+ */
+@property (weak, nonatomic) IBOutlet UILabel *labelValidScore;
+
+/**
+ 公分
+ */
+@property (weak, nonatomic) IBOutlet UITextField *textFieldScore;
+
+/**
+ 工分æ现说明
+ */
+@property (weak, nonatomic) IBOutlet UILabel *labelInfo;
+
+/**
+ æ醒绑定微信æ示
+ */
+@property (weak, nonatomic) IBOutlet UILabel *labelToWechatInfo;
+@property (weak, nonatomic) IBOutlet UIView *scoreView;
+
+@end
+
+@implementation AccountViewController
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+// self.scoreView.hidden = YES;
+ self.title = @"工分æ现";
+ [self configUI];
+ // Do any additional setup after loading the view.
+}
+
+- (void)configUI {
+ //未绑定微信的底部的æ示
+ NSString *contentStr = @"亲，您还没有绑定微信哦，工分æ现需è¦å…ˆç»‘定微信哦，我们的æ现金é¢ä¼šæ到微信钱包ä¸ã€‚ ";
+ NSRange range = [contentStr rangeOfString:@"æ现金é¢ä¼šæ到微信钱包ä¸"];
+ NSMutableAttributedString *str = [[NSMutableAttributedString alloc]initWithString:contentStr];
+ //设置：在0-3个å•ä½é•¿åº¦å†…的内容显示æˆçº¢è‰²
+ [str addAttribute:NSForegroundColorAttributeName value:kMainColor range:range];
+ self.labelToWechatInfo.attributedText = str;
+
+
+}
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+}
+*/
+
+@end
diff --git a/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m b/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
index 162fccd..05474e9 100644
--- a/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
+++ b/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
@@ -11,7 +11,7 @@
#import "ModifyPswTableViewController.h"
#import "BillListViewController.h"
#import "ScanViewController.h"
-#import <AudioToolbox/AudioToolbox.h>
+#import "AccountViewController.h"
@interface LeftTableViewController ()
@property (weak, nonatomic) IBOutlet UIImageView *imgUserIcon;
@property (weak, nonatomic) IBOutlet UILabel *labelName;
@@ -57,7 +57,8 @@
BillListViewController *billVC = [BillListViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
[kGlobal.mainNaVC pushViewController:billVC animated:YES];
}else if (indexPath.row == 1) {//账户
- [MBProgressHUD j_textOnly:@"æ£åœ¨å¼€å‘ä¸~"];
+ AccountViewController *accoutVC = [AccountViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
+ [kGlobal.mainNaVC pushViewController:accoutVC animated:YES];
}else if (indexPath.row == 2) {//æ ¸é”€å¡åˆ¸
[self scanCard];
diff --git a/Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m b/Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m
index 2668b87..730d26f 100644
--- a/Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m
+++ b/Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m
@@ -16,39 +16,37 @@
- (void)viewDidLoad {
[super viewDidLoad];
- self.title = @"授æƒç™»å½•";
+ self.title = @"授æƒç™»å½•";
// Do any additional setup after loading the view.
}
- (IBAction)actionLogin:(id)sender {
- [self httpAllowLogin];
+ [self httpAllowLogin];
}
- (void)httpAllowLogin {
-
- NSDictionary *param = @{@"deviceId":self.device,
- @"token":self.token};
- WS(weakSelf);
- [kHttp GET:kWatchLogin parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
- if (kRsSuccess(response)) {
- [MBProgressHUD j_success:@"登录æˆåŠŸï¼" complete:^{
- //è¿žç»è¿”回两级
- long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
- [weakSelf.navigationController
- popToViewController:[weakSelf.navigationController.viewControllers
- objectAtIndex:index - 2]
- animated:YES];
- }];
-
- }else{
- kShowRsMsg(response);
-
- }
-
- }];
+
+ NSDictionary *param = @{@"deviceId":self.device,
+ @"token":self.token};
+ WS(weakSelf);
+ [kHttp GET:kWatchLogin parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
+ if (kRsSuccess(response)) {
+ [MBProgressHUD j_success:@"登录æˆåŠŸï¼" complete:^{
+ //è¿žç»è¿”回两级
+ long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
+ [weakSelf.navigationController popToViewController:[weakSelf.navigationController.viewControllers objectAtIndex:index - 2]
+ animated:YES];
+ }];
+
+ }else{
+ kShowRsMsg(response);
+
+ }
+
+ }];
}
- (IBAction)actionCancel:(id)sender {
- [self.navigationController popViewControllerAnimated:YES];
+ [self.navigationController popViewControllerAnimated:YES];
}
@@ -59,13 +57,13 @@
}
/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
- // Get the new view controller using [segue destinationViewController].
- // Pass the selected object to the new view controller.
-}
-*/
+ #pragma mark - Navigation
+
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
@end
diff --git a/Car/URL.h b/Car/URL.h
index 0d711f8..5e47275 100644
--- a/Car/URL.h
+++ b/Car/URL.h
@@ -17,14 +17,9 @@ static NSString *const VersionName = @"车æ—通æ£å¼ç‰ˆ";
static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
#endif
-
-
-
-
/** è¯·æ±‚åŸºå‡†åœ°å€ */
#define REST_BASE_URL [NSString stringWithFormat:@"%@/car-web/app", BASE_IP]
-
static NSString *const kLoginUrl = @"stationUser/login";
static NSString *const kUpgradeUrl = @"stationUser/getUpgrade";
static NSString *const kModifyPswUrl = @"stationUser/modifyPassword";
diff --git a/Car/tools/BaseClass/BaseViewController.m b/Car/tools/BaseClass/BaseViewController.m
index 38c944a..d1ea484 100644
--- a/Car/tools/BaseClass/BaseViewController.m
+++ b/Car/tools/BaseClass/BaseViewController.m
@@ -17,8 +17,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
- self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
- self.view.backgroundColor = [UIColor colorWithWhite:0.965 alpha:1.000];
+ self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
+ self.view.backgroundColor = [UIColor colorWithRed:0.94 green:0.94 blue:0.96 alpha:1.00];
// Do any additional setup after loading the view.
}
--
2.18.1