From 37b9334fda1e296b835ea9d01971f5ae1d72bee5 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Fri, 19 Feb 2021 15:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/placeholder.webp | Bin 0 -> 10322 bytes lib/const/api.dart | 9 ++ lib/models/common/img_model.dart | 27 ++++++ lib/models/user/user_info_model.dart | 124 ++++++++++++++++++++++++ lib/models/user/user_profile_model.dart | 41 ++++++++ lib/provider/user_provider.dart | 38 +++++++- lib/ui/home/home_page.dart | 42 ++++---- lib/ui/home/personal_draw.dart | 27 +++--- lib/ui/login/login_sms_page.dart | 3 +- 9 files changed, 276 insertions(+), 35 deletions(-) create mode 100644 assets/placeholder.webp create mode 100644 lib/models/common/img_model.dart create mode 100644 lib/models/user/user_info_model.dart create mode 100644 lib/models/user/user_profile_model.dart diff --git a/assets/placeholder.webp b/assets/placeholder.webp new file mode 100644 index 0000000000000000000000000000000000000000..0b27014f2ff1113ea93f06a97431196f1272d4a5 GIT binary patch literal 10322 zcmeHsWl&wsw(SNs?h;&sySr;}ci32PcXx*nG`PD<@ZjzQcXtg=aQ6Gok9SY*JLjvq z|6aXUr>nbbb=6#}y62j6j4`WKWu&BJX#fB%Nik(jWgcw=004mY*Qf>lql?NbOXvKx zg20&uN5Z99t(8p6noJM1=aN4QL+DsP#epCH@Ag2jeL3o1`z8&i1^`(0A+jOp>VS1X zAv~loF*2YqJ2Vhr%*ePE91oj2C)^U*HqQpu4cG>|UNpQ;J;aR|T6rJ%*o?(eY!Saa z96QLq%)HJ$fkh05x>Ew`-lv|RPiq^lARh7+wXP<~0@m)--c!TDv)$)DkO7R~52su2 zM`;0Tf>OQ4;-;7r9R?%R>7JeON^I9Yq&a50zeNSc2hW4OQopPKZ<%rG;SUX%|6}$a zhx|VrAt=36{ry$1PdsD>`(CTP@%U9r^SP9au+A@g!e=m63jaR#@p?myeogCmZA&H) z(n8A}x3dv+O>VRO2>#OOY8Ioo^})K=T$NCw}x8-gZTX< z>lAifSPj3|2SSzK6`u}E?QV=8X7pyL{ksekL;#OVFsE%*vo+8eM4gMvOnuRsPXv-9 z9S9-*ZEh0BL<}d$`hwMjNbnk`@9n1fC5KZAWNI2Ms+GyiS2 z@94gWb`81TP_v&$*@U$Ig~+ zbSOWpD5Wz6e{R9DN`{(5w#_)kY>y(v3_7IX)8V##3JR(6pWZPdRDKzW><+xi_hkAc zo#TwkxNw^{=lOvJ&;h!(h_fOW-;F{ARctHuszGSgtNB!8T0OIrjsqs(qoOsFNR#S< z{zORy`3GY~kuoxo4kN`pXwz0vTj2QwZLSUv&mlU-oJM>qCPe#ET@4_i=yy{4uUty0 zeoeX3+E6FmQ8LkSY=|zs7>1p0izi>iTUMb^jur>Row#jI&y3pWPN|gB#)$$iLS@%i z76g75OUNVbld;|`IiW9;k5&JL$Ttt$T%Pb@>TOkBpBg4^C^V`pcNzRamG2U zY*%2>3)07&9?|!g4e%-<#fT#^O@0>^;-r^4nX!YTjdzx@uxuW7p~tC(AzcH&je#tW zAH;C|Td~pBF}$9qYIe|~kPd&sXkqq7%{BfJBxB)48`#8{u3J=*)S(~_b5q`kU*nD+ zuQ!*p!%}ae!^{CM6#3)sl^>~cl2(E`NT=3ZCOi>S76WG>Izm)Ee7 zU_xnbEpCT>-%D!Y0HaL9R!PoNW!`_150y1jn=!i7pn}mvt9zkRj6A~p!CG?dG$ywA zh1_7g%&GRQWSUel<%0`A4kIwMpWm(C`yWzk24D`W(&tnD-fxFfV_# z>Ly!OU?fs1;2fb!-k#W`6=*eKEQmD_iaEY;0VjUCR(#d|=kK|S%}}twEqrpq-4Y}C zftR}Hk3xKYbkD*?vn)Dzwu+BpNNrDdOvCiliZ@96lamDE5LN&)oPrv6LmO>c?gQ37pj3a;5YZ_zx=mL#VJV14kn2J0o z&YWSUe4Dt^W+WIG&$Uz2EXp^*E6FTgYE&hfR19n36+mj&daV3o7aIAWsEiIR_``xx z`L^LuIL`)c2-edn_=D&r*V$^15%e&(}f>bAbQZ? z%`~HTwi#o#h70i3)oO&ptP?JT!_4b|<(s86A|Mr!ZZKKJ9Gl4TFIan4gSXObdn^e4 z3w8tNnb+Nhe^FkLft3j^p%JX2^mIwn4oI3KH#BiW-D0(sr_Wt~P4ke6#Y4M;Jrzu5 zSUXHL&MSLjXUBHD|0?XPU8OP!+`q;=@DA=qss(HV(@F>|g}6g{eTXl-EV+ivz4=@S z#8HRuVdO~K-%m?g`$la4tr|>S>Ka5N25Bwa`x*XY(y@H`JPLyNh?w)=0r(GvS#C%B z7uh1_<*I43%l_N1Qhf(uzn?CgE?uW9HgTin%lJuQUvFLoz6rV4LDePJE{ekRgR%l;H<11lTbd@*A*N&9!Ic0I*eN`?36 zYF~~EM`tbO)h#GM4fuIHByWnZykP#%MEgG++aL9VoSEjSEIWzv?$5AxwKnfBK-3zcQZs!kV7kb1%MG|WWX9WP7Rj5?~{9N?N5 zu-Xt6b%%Eq0(~!d29W6xG!p$L3z>y1ew$GXB?&=A(_Q_@9)`7USuVXN$Lhx=qBYAy z*k2oURHT!_XarsE6yROwKUm-=KbxsBoLAx&7ZkGD%`-MN9RXo8v(Zmo8Ixui{$%`X z(!$7)(w#_R#(C<_H+LKxid8VL5&$i`@bbnYg8cbPR9ojzZA|F28?`-IXDUyBLPphC z$$f6D!AmwCg8q#53;WIkDcIwUuGC&`I1dBDi?`JF9w)fEz#Cp=8^1&UJzX%6#lX#D zyW{Q$%$#r~EMJ9`=#HGK<6MD5Zj{8Uh@0F?hsxO}$VaMvdH$F-j3zqIk&?F@T zM4kyT5@c+^JK_6)hWm5JTKP<@9sq>qh27c+@dWWjX z7PuPF=7f6@HMPp5XxOmvuI@d>FWVTuWAMp2y=c@JgRwYd>(<6_vke!re^W;WsnBB8 zYt5eA$>etmp0(=)F8L?92x-bdqQl1($34JYYO}IL@dJs;=aHN|HzH>WyA0cgI2>wd z8%i}>KAw$Ls9^t>%q+(jf31-SgC-JbMp5LQYRYyNf0UgB?LZyJW6z7EM66-= z02|7VU;UwzXSNRev`IZo&stIWKT6>LF6+PK`IvOKq{OxE`UY)9t8(n4Qo5XR!}hTN zv=+^hw2G@W1%(!O?DQP_-9*oP<6=sX2PU+{mD`+{Fe#!vx5A+<&?(ZXjYg7IlIRI0 zqve}j@VHIa8Z^t{0ESv<-po*DtCVzF=3tMlwMprwS7M#LRzcVxb`dxk5Jk6hR?C5ugMaCgSLN(RU6WpbF>uB@T_mVP`GE>{47~#{}z}sLuY2%qGeV8?s z^MrU3`PA5$vMR($WCP;WvH`tnj(xAj=O_YB>^?+oJb*&qC(XX3u_w%(m$kXFhXPLE zv60=GqMrKs1UL5=QNyzKNGhL5AsN`%G;8a6tdVhr&C)a{K zZMqZzI3hF7u88vvC*A$=4|piO3#q5>$~1)Cv8x>2isXR=Zp`zN4mR zck}rKow(Ze^JobfG4%2m$b#UX57w`_?@iyyYo|JYz+<-UqVOS<@p)gD+G-fxj+H1= zZA!;)9G!^co4Z(xgVvk^OORYG)J}9niKjE1(4*8>5VrHIQV+-U4~eBVk-7Migv{N# zKM1EV{3`r>uLf5-EF3#3REdRARJ{UInqv5_dLEwbuQfAWDQ2bTYKs!gFM5&J{WtUCHpJkx6!RplF_}BbJOoZjXCTJ1{Y7(06JdnBlNZU=7S>&-VyADo3t2PH*^LG<1 zG|t_|Gm4F>ldd!|z16suRfZ|!c%D0BIDAK0owP(!jCsWyVto{`5xChI(LY@=PC*p> za6B{_TW__eG{Fu)y(dE=G)u+2XFE;~_w~|R{M1aH5U;e(LM7+f!~e9li)6AW`b27t z(U?U5ETK^pbnUOXX6*^{vou)edJ-sa%JQ*9OADTsTKuqPrYrS9Z6ivL&;gP*EDp}L z%>qt3q5SbMP##!r{a5)3JN1SccIvDFpuUb1AZC&Xi2lX^crV?1YD5{JwplyU8Pkym3S%^gK{vJ@6l5}r7iS zkLK*%sjFd_@@Jgi*(VChSiwA|P0*=)rFkO#`Hbj-1a8OMp$!+e>d-yWNK_LtGzy@bcZS%MuA>bI5bAk!x1s#)Y+KQvPteJ@v|Y1a3^FpE0p8C8U;9l zV>{WY@d$t+LZL@lb`w4$m`(+_PXS`B#CwZg?CezM*YS$@^|qwxhk6Z_Sz1#Rr)H)7 z_e@8#QvM!`PZ8L%`C%*)2L&qRSIebWe?2I7DZ@?91X*#DR@-@;VE8~r@|Jp?w0zDr zjaJhB8l?XLvoF3dSQc{xbAPs}Wg#Kkg!7qeD`9<%iRK22-3h#M5+s9WW{&Nj||w7B~OA%>6TD<*tgS?KZ_1V`2}t$uMoog_yqR}B@{)vR>u{p zC^PyoDQTC(a!uPMVP|SJ!OuK&D%Ce44eR>s2R(ehQK3oKHCY%TH^me9h0)AA1WEaz zw0h4aQKThsE7CGqL6bO;2v>j)QLqjwi10TQmDHUm*{<}8d|XvpA;X-JU2`ZN_4wQf zjftjMy&ufyszIiw-jUh!%C>#MMr}(Ch&tQDQ~^U3#*Z~O zHk^+b711YTLNXRbrd5!%M|OpHhN@**wWIoj?F?Y*iHLKsM01@D#VIko)5O=^<^^6` znev}FnzoZ#ri;vOzcU-R9lz-R1V$@cJZOe7?RO(nZxHdhT>M(W+awS_s0gVTO7^~ZT5c|XB*1Dup48AvMz>W0$zavQrhtYv6b6{OF{KVhOH+HBP9 zu$Qm2;!`%PkCq!JxkJ-nON8}Dh8|G~*cEMlM@O&MPr3+KTheugZ6%zAW;{u2fia}c zVb#|MN$m>f?vK}Ey)PNJTobfMfWvUWI@l+%O0Nk#Xy_2U-eOz0uld^oE(EIH!*6;4 z9ywheW8XCl5%LJ(fS9e!!ZnVfH0IW60rrz%VBttmmWO{sS{l|oX?E9xTMB59d|7T1 z+$T=+Y%wv`C`4%5xfPqiM;eC^oIWqNR^Jrho0E+~BstsEwhBL@EjF+^HU3U=Ps@MY zN)h>NlN@uwF?$Dn`b&1XMdt0`gF%aEtX2pv8ciFYz*GTcy_A>9#;NEARwKJYd68Y8 zb(4FJPYXi`u)(tlNu#0jJ|_KVo{2QohIqX{)HY!$5Xi9_OM;)oIm1?o#dXF=E#N*X zK@pxojIwJ(eAUs`5|j~{C$w9{{3g7MS(sqQ31trVMWOnXOwA3LGGh`{+BaKYJ_~?~)Q#v8~Dm?Pb9gJLov6_Qn6m`C;sHW>9!q3ww$%`cF z5?Q-%D(y|_t0Em`80s}0z7Nd;-r@Tyx=}GKvXX&N=c?t?E_2BiTF_O<&It0Hc7Q@n) z%cLmZYa);soBndn5@rtSxxWEhAm?{sQB5e6Mdu!*cYXfKik+|AUDXXQMv-xQ=lctD zv+6m2G~kwq%R4ms;+=M#5x-4r$+O>84$OO5gr#=pG!R^oZn#ea$*p-Sna*^+v8dTw zzd@DV4k^qf2JLgh{I0#~(5Uh4i&-miA*0*?CU|OreZWLVwC2vWHf%Tt zEQu9e^yxuqw^9je<=1@IkmuJVSdMGZ9`SK(C_RPRO)ues%`cInU$EDS(SM#OpGSpT zp>mu2;TjGd5nI$Aadp6~$P_G#2$2^NJJ}qVzLbalQg}V+Psd2DtG3*hWQa*QyN#6} zllIZ_E!BZ6W245yLQsVJ?3wms&y6*1J=}$aOi4dXH%XoBy|IG$V5J`_#icuK)IM_H zZ2LxMjjRdk6?M)kgL;`CoBdMpS8n1&mZucD( z8p3eEks`!tq)SH;0B#rfB*<(c$650*Q3-@Lj{%ImW+;xzXS1xY{T`>3rWdnM~7 ziaZMCRh6SBr&Xm$rS3>3+}e&@eE|;d4Aa)g5d)KPh@hk?PMfXd{YGA-K@eposk zhbFYxRJc+$ObXbgYVjXf$;-aAoN@TYt49ZrUrr+W5nlKeIxiqPztbj-2uGzIi<__y z5n-6=y4l=NahppEBpEL9d}GBu>tbgy>r~W??e~;c&W4O0 zKVi36B^tJzQAfc>t!5Qq_zLCe36|s=GFh`C#9FT6NDKtDuYD(H?~AD}h~mbgxqyF> zP#80$IKiDBADZ|seZH8F_MM=|M`gF=nu}p89Fr%L&OFs$Y8rBgz-_wWYx7wtJ3;?| ze+QHii-$4}1&6b4j)9+(Pa~sfnMD!hJhgHygw!WRi&90Ow$#jiI*WrTMYwgVDe9-o z@{lpe@B&rgpG0T=Z43C#o!3n}m(D?0_hts=e7=NDUBt!jgRh{_k^Ic)ZwzjtEuomt z@o1|Wjw+auYMWVatE`!xWV96D%-zs(Y=UZQX>>2LdpeU?#8~4V12k0hvI$BRaxTEkQ2TL}rS;(Ru>I*GG zj;gcvD)FW>r?H**_NK}mBDEQ1HJV8za6PoTguL{gD5=|}hp>@TRP0y#D|tGEL*#dF zt*7V_4bL8K8q0iWV1+cbR8SR4v`ct*P^P6Wwj{=z<1twqx&;Xf654zjl{&rej`3h~ zJ~}O!Wh5~U^IE8M)Fxw=O^MV~QF1H6D>bY55EQ2Zw}O)sNPTjOI(+F}&WLiMrCrx8PNaI`{jDlHVG143iTRCxWSZFW2hrv4g$dqbNI4NKiT5=e$NCVtyq!=kiD) z4+}-uAbGSjg#|}L=0FTY(^5Hw7z>Op44NBl>a;V3cLJcw;aoZFl?rpxSZW^t(G1$M zaG^Ozg|@wG@k5@Y9_}iSMHh`x6&Q1$Wvij2%-*&F@JQXR?$?s98!VugLpA_>`MJP( z6cp|lL-bQl42vMybJ1`?yoMev7s3^+OoN6=UPJz3###wFXd9;q-0hTp8+W{?+>L;n zLf6sjyFGL#YAFWpdMQ<#6btS+yI+~O8AX-6c8D1ddR=?G{V}jp!u*D z*>8^_+eoQuCuCyyITRy&h-k6ZicgHCu_&DyTTT1ub0l$b6*rzowZN!Tktu-YPEUds zX#V4n4**y)osqY=Q(v$89P5@9CAN&F?m$d^y=bfFs~?fafJyFaKxu}8_WE%Rn38SC z>(9+vqFp1TJsgT?nO55+L$O{>pyATD%7FR#S^g6Mz+59XSyZ6jarodzl~NRJJ4(fR z{k%uh8e8#h(P^~^8SD)Jbh;81ur* '/login/loginSMSUser'; } + +class _User { + ///个人资料：查询个人资料信息 + String get profile => '/user/personalData/findPersonalData'; + + ///个人资料：获取用户信息 + String get info => '/user/personalData/getUserDetail'; +} diff --git a/lib/models/common/img_model.dart b/lib/models/common/img_model.dart new file mode 100644 index 0000000..e8a9dd2 --- /dev/null +++ b/lib/models/common/img_model.dart @@ -0,0 +1,27 @@ +class ImgModel { + String url; + String size; + int longs; + int paragraph; + int sort; + + ImgModel({this.url, this.size, this.longs, this.paragraph, this.sort}); + + ImgModel.fromJson(Map json) { + url = json['url']; + size = json['size']; + longs = json['longs']; + paragraph = json['paragraph']; + sort = json['sort']; + } + + Map toJson() { + final Map data = new Map(); + data['url'] = this.url; + data['size'] = this.size; + data['longs'] = this.longs; + data['paragraph'] = this.paragraph; + data['sort'] = this.sort; + return data; + } +} diff --git a/lib/models/user/user_info_model.dart b/lib/models/user/user_info_model.dart new file mode 100644 index 0000000..c248d15 --- /dev/null +++ b/lib/models/user/user_info_model.dart @@ -0,0 +1,124 @@ +class UserInfoModel { + int id; + String userName; + String pwd; + String actualName; + String tel; + int sex; + String userCode; + String birthday; + String email; + String idCard; + int organizationId; + String organizationIdPath; + int positionId; + String roleId; + int status; + int isDelete; + int createId; + String createDate; + int modifyId; + String modifyDate; + String lastLoginIp; + String lastLoginDate; + String nickName; + String code; + String codeSendDate; + int remake; + int reportTo; + String entryDate; + + UserInfoModel( + {this.id, + this.userName, + this.pwd, + this.actualName, + this.tel, + this.sex, + this.userCode, + this.birthday, + this.email, + this.idCard, + this.organizationId, + this.organizationIdPath, + this.positionId, + this.roleId, + this.status, + this.isDelete, + this.createId, + this.createDate, + this.modifyId, + this.modifyDate, + this.lastLoginIp, + this.lastLoginDate, + this.nickName, + this.code, + this.codeSendDate, + this.remake, + this.reportTo, + this.entryDate}); + + UserInfoModel.fromJson(Map json) { + id = json['id']; + userName = json['userName']; + pwd = json['pwd']; + actualName = json['actualName']; + tel = json['tel']; + sex = json['sex']; + userCode = json['userCode']; + birthday = json['birthday']; + email = json['email']; + idCard = json['idCard']; + organizationId = json['organizationId']; + organizationIdPath = json['organizationIdPath']; + positionId = json['positionId']; + roleId = json['roleId']; + status = json['status']; + isDelete = json['isDelete']; + createId = json['createId']; + createDate = json['createDate']; + modifyId = json['modifyId']; + modifyDate = json['modifyDate']; + lastLoginIp = json['lastLoginIp']; + lastLoginDate = json['lastLoginDate']; + nickName = json['nickName']; + code = json['code']; + codeSendDate = json['codeSendDate']; + remake = json['remake']; + reportTo = json['reportTo']; + entryDate = json['entryDate']; + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['userName'] = this.userName; + data['pwd'] = this.pwd; + data['actualName'] = this.actualName; + data['tel'] = this.tel; + data['sex'] = this.sex; + data['userCode'] = this.userCode; + data['birthday'] = this.birthday; + data['email'] = this.email; + data['idCard'] = this.idCard; + data['organizationId'] = this.organizationId; + data['organizationIdPath'] = this.organizationIdPath; + data['positionId'] = this.positionId; + data['roleId'] = this.roleId; + data['status'] = this.status; + data['isDelete'] = this.isDelete; + data['createId'] = this.createId; + data['createDate'] = this.createDate; + data['modifyId'] = this.modifyId; + data['modifyDate'] = this.modifyDate; + data['lastLoginIp'] = this.lastLoginIp; + data['lastLoginDate'] = this.lastLoginDate; + data['nickName'] = this.nickName; + data['code'] = this.code; + data['codeSendDate'] = this.codeSendDate; + data['remake'] = this.remake; + data['reportTo'] = this.reportTo; + data['entryDate'] = this.entryDate; + return data; + } +} diff --git a/lib/models/user/user_profile_model.dart b/lib/models/user/user_profile_model.dart new file mode 100644 index 0000000..686a5da --- /dev/null +++ b/lib/models/user/user_profile_model.dart @@ -0,0 +1,41 @@ +import 'package:aku_community_manager/models/common/img_model.dart'; + +class UserProfileModel { + int id; + List imgUrls; + String nickName; + String tel; + + UserProfileModel({this.id, this.imgUrls, this.nickName, this.tel}); + + ImgModel get firstImg { + if (imgUrls.isEmpty) + return null; + else + return imgUrls.first; + } + + UserProfileModel.fromJson(Map json) { + id = json['id']; + if (json['imgUrls'] != null) { + imgUrls = new List(); + json['imgUrls'].forEach((v) { + imgUrls.add(new ImgModel.fromJson(v)); + }); + } + nickName = json['nickName']; + tel = json['tel']; + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + if (this.imgUrls != null) { + data['imgUrls'] = this.imgUrls.map((v) => v.toJson()).toList(); + } else + imgUrls = []; + data['nickName'] = this.nickName; + data['tel'] = this.tel; + return data; + } +} diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 52dfd4b..91a4348 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -1,8 +1,13 @@ import 'dart:io'; +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; +import 'package:aku_community_manager/models/user/user_profile_model.dart'; import 'package:aku_community_manager/utils/hive_store.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; +import 'package:aku_community_manager/models/user/user_info_model.dart' + as USER_INFO; import 'package:flutter/material.dart'; //登录状态管理 @@ -11,19 +16,46 @@ class UserProvider extends ChangeNotifier { bool get isLogin => _isLogin; + ///登陆 Future setLogin(int token) async { _isLogin = true; - NetUtil().dio.options.headers.putIfAbsent('App-Admin-Token', () => token); + NetUtil() + .dio + .options + .headers + .putIfAbsent('butlerApp-admin-token', () => token); HiveStore.appBox.put('token', token); HiveStore.appBox.put('login', true); - // await updateProfile(); - // await updateUserDetail(); + _profileModel = await updateProfile(); + _infoModel = await updateUserInfo(); // await setCurrentHouse((_userDetailModel?.estateNames?.isEmpty ?? true) // ? '' // : _userDetailModel?.estateNames?.first); notifyListeners(); } + UserProfileModel _profileModel; + UserProfileModel get profileModel => _profileModel; + USER_INFO.UserInfoModel _infoModel; + USER_INFO.UserInfoModel get infoModel => _infoModel; + + ///更新用户profile + Future updateProfile() async { + BaseModel model = await NetUtil().get(API.user.profile); + if (model == null) + return null; + else + return UserProfileModel.fromJson(model.data); + } + + Future updateUserInfo() async { + BaseModel model = await NetUtil().get(API.user.info); + if (model == null) + return null; + else + return USER_INFO.UserInfoModel.fromJson(model.data); + } + bool _isSigned = false; ///用户是否登陆 diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index ade220d..a00db6c 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -1,3 +1,4 @@ +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/anouncement_provider.dart'; import 'package:aku_community_manager/mock_models/all_model.dart'; @@ -15,6 +16,7 @@ import 'package:aku_community_manager/ui/home/application/applications_page.dart import 'package:aku_community_manager/ui/home/personal_draw.dart'; import 'package:aku_community_manager/ui/home/search_workorder_page.dart'; import 'package:aku_community_manager/ui/login/login_page.dart'; +import 'package:aku_community_manager/ui/settings/user_info_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; @@ -48,7 +50,7 @@ class _HomePageState extends State { onPressed: () { final userProvider = Provider.of(context, listen: false); - if (userProvider.isSigned) { + if (userProvider.isLogin) { Get.to(page); if (text != '全部应用') appProvider.addRecentApp(AppApplication(text, assetPath, page)); @@ -173,6 +175,11 @@ class _HomePageState extends State { margin: EdgeInsets.only(top: 8.w, bottom: 8.w), width: 72.w, height: 72.w, + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(36.w), + ), //头像按钮 child: Builder( builder: (BuildContext context) { @@ -180,20 +187,14 @@ class _HomePageState extends State { onTap: () { Scaffold.of(context).openDrawer(); }, - child: CircleAvatar( - radius: 36.w, - backgroundImage: - userProvider.userInfoModel.avatar == null - ? null - : FileImage( - userProvider.userInfoModel.avatar), - backgroundColor: Colors.white, - child: userProvider.isSigned - ? userProvider.userInfoModel.avatar == null - ? Icon(Icons.person_outline) - : null - : Icon(Icons.person), - ), + child: userProvider.isLogin + ? FadeInImage.assetNetwork( + placeholder: R.ASSETS_PLACEHOLDER_WEBP, + image: API.image(userProvider + .profileModel.firstImg?.url ?? + ''), + ) + : Icon(Icons.person), ); }, ), @@ -270,7 +271,7 @@ class _HomePageState extends State { //消息按钮 height: double.infinity, onPressed: () { - if (userProvider.isSigned) + if (userProvider.isLogin) Get.to(Message()); else Get.to(LoginPage()); @@ -297,7 +298,10 @@ class _HomePageState extends State { SizedBox(height: 24.w), GestureDetector( onTap: () { - if (!userProvider.isSigned) Get.to(LoginPage()); + if (!userProvider.isLogin) + Get.to(LoginPage()); + else + Get.to(UserInfoPage()); }, child: Container( margin: EdgeInsets.only( @@ -305,8 +309,8 @@ class _HomePageState extends State { ), height: 67.w, child: Text( - userProvider.isSigned - ? 'HI，${userProvider.userInfoModel.nickName}' + userProvider.isLogin + ? 'HI，${userProvider.infoModel.nickName}' : '登录/注册', style: TextStyle( color: AppStyle.primaryTextColor, diff --git a/lib/ui/home/personal_draw.dart b/lib/ui/home/personal_draw.dart index b9e0ffa..94d208e 100644 --- a/lib/ui/home/personal_draw.dart +++ b/lib/ui/home/personal_draw.dart @@ -1,3 +1,4 @@ +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; @@ -61,7 +62,7 @@ class _PersonalDrawState extends State { //leading InkWell( onTap: () { - userProvider.isSigned + userProvider.isLogin ? Get.to(UserInfoPage()) : Get.to(LoginPage()); }, @@ -75,17 +76,19 @@ class _PersonalDrawState extends State { AkuRoundButton( height: 72.w, onPressed: () {}, - child: CircleAvatar( - radius: 36.w, - backgroundImage: - userProvider.userInfoModel.avatar == null - ? null - : FileImage(userProvider.userInfoModel.avatar), - backgroundColor: Colors.white, - child: userProvider.isSigned - ? userProvider.userInfoModel.avatar == null - ? Icon(Icons.person_outline) - : null + child: Material( + borderRadius: BorderRadius.circular(36.w), + clipBehavior: Clip.antiAlias, + color: Colors.grey, + child: userProvider.isLogin + ? FadeInImage.assetNetwork( + placeholder: R.ASSETS_PLACEHOLDER_WEBP, + image: API.image( + userProvider.profileModel.firstImg?.url ?? '', + ), + height: 72.w, + width: 72.w, + ) : Icon(Icons.person), ), ), diff --git a/lib/ui/login/login_sms_page.dart b/lib/ui/login/login_sms_page.dart index a79279f..6f97343 100644 --- a/lib/ui/login/login_sms_page.dart +++ b/lib/ui/login/login_sms_page.dart @@ -117,7 +117,8 @@ class _LoginSMSPageState extends State { data: {'tel': widget.phone, 'code': text}, ); if (response.data['status'] == true) { - userProvider.setLogin(response.data['token']); + await userProvider.setLogin(response.data['token']); + Get.offAll(HomePage()); } else { _textEditingController.clear(); BotToast.showText(text: '登陆失败');