From 2751dc6d9fd413e3e186ee0d3309775e39bd9698 Mon Sep 17 00:00:00 2001
From: datang <austin@akuhome.com>
Date: Mon, 22 Aug 2022 23:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{home_ selected.png => home_selected.png} | Bin
 assets/images/portrait_deep.png               | Bin 0 -> 16585 bytes
 lib/constants/api.dart                        |  12 ++-
 lib/gen/assets.gen.dart                       |   6 +-
 lib/model/user_info_model.dart                |  39 ++++----
 lib/model/user_info_model.g.dart              |   6 +-
 lib/ui/home/content_connect_page.dart         |  70 ++++++++-----
 lib/ui/home/content_refuse_page.dart          |  92 +++++++++++-------
 lib/ui/login/login_page.dart                  |   2 +-
 lib/ui/user/user_page.dart                    |  82 +++++++---------
 lib/ui/widget/centertipsalterwidget.dart      |   9 +-
 pubspec.lock                                  |  34 +++----
 12 files changed, 202 insertions(+), 150 deletions(-)
 rename assets/icons/{home_ selected.png => home_selected.png} (100%)
 create mode 100644 assets/images/portrait_deep.png

diff --git a/assets/icons/home_ selected.png b/assets/icons/home_selected.png
similarity index 100%
rename from assets/icons/home_ selected.png
rename to assets/icons/home_selected.png
diff --git a/assets/images/portrait_deep.png b/assets/images/portrait_deep.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7440b35d1c7dd051499428721c442ae16ff2e5
GIT binary patch
literal 16585
zcmV*LKxDs(P)<h;3K|Lk000e1NJLTq006)M006)U1^@s6Qrv6@00001b5ch_0Itp)
z=>PyA07*naRCr$PeF>OdMVa<nr#ne!fg~^x!jgbMfCvfu4iff2!cGt(i^71v&aeN7
z;K&TvgAOx-jG!2@vc<3@qR1kv22oUG5pY33Bm_c`EeT0T(#xs;sdI0g`_*^8I_KQm
z_jcdzzWqErr2C#*r|PS3dF!jUzEWuXR4jqRT6OdCZ7_I1h#{Q{EdxUg(#;sDLu{{r
zvC!BYz~&0r4CX(L5l|Qu{io5Q6b2~(T4Mtg)+=Cx1~w>QC4l$Le@fw9rSUF+HxS^p
zrVgxV53pgN#`@*}9}jpF>mF}a9Tg9vpMTNFzwwh(0*BqKTRvQm9XbbKyFg<MG{$I+
zu~66=z$l~W8W_%n8vm{UN#Kd+*&m``BTE64!m7wHfPX;Yt)gKpRT@imCte@cgugxh
zS+zdrkox^&4Fkwffj#EwEjv0fDFh}djr}w*0>DrJLzKcmXegtcqGA`7)+(=k$Udv+
z=S3Ztx)VL;`&>aQpbZ)y16T`SWf0&gt+06DAS{0JO!aoZ*YXqrGz=gXj#d+H!w|I=
zBiezj5MVNZlL1U54%kt2s+gK7sQFA6Ja+sOD}KS57uqU$cJK4lfW$V6Z=mn8FIB(`
zQ20qxfCm9ATdT10#dD0YDAR?0|I_acV0^0{7;J@|!%iHC0Q+f;Jr%GEfB}-%O$dy6
zf9Z4HP8K9eyf+VY5~4(GU<EaAR|+oycur|Nr33tC^<ez<FVj?8f3|{tYXIXH>S0)k
zX*$HGmBKDsV^aWwspn=0r36FB2i|9h7E>WR&r|PDA_zAS9!X;FPQEWfClUsV>j#Ua
z)&clH0WT?qI|mKM!pEnnHT}^L`i}v$>R`9cF+2<~Mk`F$!1>VFB+^q0SD5Q{6xV7l
zeV$2=VtUCi;^tEnm%<{xwvdd+K0}R!t}!IzamEWEQ20<Q%xmhv0<>W1k*{J^YpV+T
zgF*BQ1DG&JZ`T&$cxW6A;7|a=6R^ZeqKMl$rniPdohoy%rS*ZJ;EtflFFZOp-kq)$
zEY2rdDXlM}ezOQA^_ePn+>XX7C_E7;Jkq4_z!T@F*ZaB=^l1YaKTD4ZHU6*GI87;R
z0iY$Jh(_TBuur|Hfe*1_d9pFK4H77l3ubFoY;nvXjg(cQuqb+-FR<y0i{s&w%OhGG
z9g6*m$DpxZ1Mf67;YVSJ?>~92TH03)q0bq>wm0jRVQtu|6Sz=ooDX1An{r7g1pR}c
zl*BVeRw61CgGSu5N=jz!z(Nsgf6?!y#8C7;3VZD5iReWlh0`XFG$b-b{o;_1S#R;{
zA1H-+14GOXHJ0_YJ%&DI06Wdod#iSw0brWhq~aPY4K^*u&hzw=;+0m$8Jk=J?4imX
z8&2^#5gHK%<{p`QcgGL~_btIE4!=sd+6Y!HRSFB6nsL|TXR2rVN<`=r2C(Z7^fnz$
z_zwV6p`+c{W)2zBl;4Nzsd5V_sqit=;)EjFY`dV?34;<knHIJ9Vm9s%T_><L1NZ!?
z?H40U+)srL1-z$$`+^R9>xs{)H+#Dw^j-tdT8*2HO`A22?bP@tfNk?AfW^;zSJp8C
z=B=eoF2_6ilq?I27hzRm!;EF6MB^nL79)u@&f<E3jyLf<k1S-sF-$5NGKrW=bb!m7
z0zCBinfL&zcW$ipN&_%Bf6#iI02QS&k2IM)j=d$XPCS|8xV&(q_*BA6GUZEyBVMB<
zc$@FwI`7L7IZ_wRJR11gOWC<j$hKr4p;CAZz`URX_x8s1L9a7_U1sUgp~m%E<7lO@
zam>YGUQ6`aOjFBNZ0b6>m&|}el7ae!AHynZfJAAXaZ%6h>5sS%z|yN(oFs?VL6ZfA
zei<&(M^Jbq9E>mj>QuG7H^HJ_V*oqN(;KOFOwk(G0vMg}x<ol8Tq|K;pOHwAqK>#d
zg`soULZcOrE^MH&d}wCN2YY<kFYZhVjV^C$!o|ae;{JP2RI7V~A@m9Z7&lW-RKQnt
zh?Af&%z-TS7n;kKCnwe$#~TayMTA5QQ~6+%*Q>LaO3!6MpBRr9alME9Rx%C&2a50Y
zz@iww`3#5>`bq}41`78mjqfZzTfI>4Mo`}dpmi{AHcmh%zKsAo8o0xipXS*`g&^2g
z^z6i&#<T*??95Ppk=fau+@74?pL+giBTX2)1l4>F!wZcHu;|sG312(pOx)Y5>X%kg
zw+687clC%tgK(Z!xKaTdl|@bH=iHvuMRg7?lk@#bs39e%vswXHgzdQH@y{xA%B}8x
z>dydLb+E%IObish2947TTrKxU+Mu$|EOyoe8qpnApNHd+#=F?0-ZlebNKh@Y?jRki
zI=4sYE8pGba+6?>SN@*J=&Ug`LKR?<3h?d6Ud9WkGm>518Nkjr>SIFSdT8vZ6ar2g
zh+&L`TkXP7m{mJaYdrml+Y{|s2qd`#?SihSY@{ecIlAfQm7SG;a$RParLP7GUw&-5
zdbpm#K;0O??%&lT)(^rLLWL^<G<iLf`M|T_l|r}Z@qOQ?n3!%PSx-uH<)n>X#_fqk
z;;aEY<F&>U&j-;MF*4ZJWo}g`fGaj?!;E|C1QOMS0qi<Qk81D0RT`KMU=UlI6}(r9
zSC^FBo9)QTXpr}aZKS{+X^}1MI42gP!iyyMB)qz$%y|@3*ekHYjlV7!b{suYoKM_0
z9t9}GE68?(QdppY%YJ^A`bSSkgB~}4-Dc>K8x$5rJbjG;&X#@A<2t%8K_B9w9b@3a
zXGWCAND_+Jm$*HALCg$<vsFu;C`S>1^h{d20-hK&9H&1pMXl&bBj`B;&|2+uBgR2t
zz6SP@AdlmDtddiuW>`~dgGUa@OJ@<<;!U*T3lgE9xaO#RfvZn9;<6%(7)ff(?TOD9
z*q7&VD&@#ujx0|%55U<EosL&}ic8dE1~6{6-UprdE`S3lm&fas1p~+fjU2d<)`my9
zMWbS!%*4_{Sn?WCmXReP1$E30B=S|IaJs{+Eh{RD{bq*XL`~ux_&*g8BEWB(6#n(0
zPphYUA`<k70gRuc59#Q@d>|?=rQ*danT&{ANZ?L`+e6MS3kFE#(<N??kRV7zBtwr#
zSxY5!KD};|Mu4S32hM)@Z1t<|HiB+708>ivoh>jq)R<>@`#wr?41H3vJq>P8NmXc+
zi~n5>Zcmo{iRYL0TIgXT$$>cs`4!%S#`$fp;KA-J_1LWju)|C}HPHB;<?aj7vBY&~
zaC=J7rs#t6z&W~Z%7QbZ{2At}2$Hgf6Of39l+v1M34kv>a+bQUyCOli8Nj$1`Vc7G
z9Tkb?IF>B98r&Y{*~y~R3vH-@P#DRy$V;9pQ~q=xM%>vZT9trLG&@8fZfr9q5&)+@
zd}jB+q1qdOIk`0ld#g??(xzfEJLsKQkO>P_=jb03E)iT|gDeNv#YcLJou5@GK|0Z&
zJWA$FHhZQkb$jZD+mjL<=otoyIxfLlP9n6;s{n5RIQ^kB@Jy|<Lp3*moo48rOwlC`
z9B9`<{G|<UPtkBaaX-xfx|`c$)1@Lgkr;>rdnh^4_lye*v{LvD0-XQQH1%>V;ZRKt
zz-)50DLkx!y`T}$g;H7E66Sg6uMKWbAtKS}L#Y{&^3cdw1#XWd|3c_Z)+=%%Gzp%3
zN*yOySQCU$cy^OvIOg^mZkE-|0E+Ymv*mq6ECe4WZE$<!O3@s0ko7>Nb&9IY?J3M?
zwYXIR0S_8KAD}V)-Wt&+YGMGp->gThYs0lV#M!jUvXiS$@#;=A6c$Pe-0xc#Fv}A&
z8iIA&=cEN(gWFS@omigLlt0-;FUr4N1(-kRV_aMd0$oiEVCPx-vM|II(9v~3adfPR
zTSBbC!IdeBn=l{`35+h>Qp=<i8_de0L^e&8fn#5ZaY@G~9OMz#OSV6}Zcoo~dkS+*
zBNQbtc2)ig8=!IJgJ-I%7>MZduhlhxRvqlTC5{R^@qnQ;iyoK#kuR2LNEL!avYek(
zK$f}gtOZ#@$%t`9O*ObZv7$w?BJ$-?()qmjZ1gt^lRT7ipVK1p?^FuM@ADEKt!Cxw
zsv5xf8}%L?z#RZ~5*&0%h@OxcD}0)f<na77G^fHIk7wtTn3{$p5zd)J_KVlZc!cw{
zS6SVjL_Jf-Q>WECrAjMB;j}qq2EyI67}b0`*EDJ>yxbh(%zMvNf9SI7CsDL2ZAG|$
zJ!TavF&7F|Q9(4gJr1|YDq_v+_H;kD$4yDm;s7a;IS~OEow|q&%*nDJ4Q#<h_ncgv
zGse}40IfRMX>)u@tEgsA;tX%5*YRLq9|4YsU7s@9!8y+te~~t8Xyo9T4c|Mx-i^E`
z5gBY_?3iLAxK+DuPd9RVD11$9WZHxFo;%c}jYcc700=d3@jhqZd)25mQ56FiH%p&{
z5Vrx?hz>kfd`~!yCp-%hrND{A00an;1&Mf{r4*y|Ok%9`557A9NMv*jE+r&WQdz>_
z1k0o{iQ!z1_7h{|Uf3sF-UpvzdrtP1CI5m`Fx4i`x$g{hPgmhfmkq!atwM-}P#7mE
ze}mgonj&#+A!SHx^x!a(&30B+%87D0FXgBKx2KRqpoUNGL2z`&Q!JP}%A(S~0*z_+
zf4XbMx4L8ird%P~F$2JK&5Bkz-k%?jYt-#=R9RXS`tJ7PH^Zb-6FiZ%=G-a@@tER^
zkddwx$pc<aQK2BI4m1|17JQ*AWf;3;06WjrXKIbv0ERgzMFPx%5k%jqr0^0?eF}Kn
z8JJHIn6L>_i$8JTgwRgpF?|#0iO>Cz+at>}cI~Az#@+}d!>ToC!iD#prcCCsqMwQl
zAga<F;#m!hHjOm6J)SF+EcW*0zp1xmhGdnYk8pbu3hHwlF)X6m>A4e4DJ*Yp!d^eF
zuqt&$1`yTf-+<eSmD@_zZCh(_dm_whCV1EYVB<l+mcxMEw*a;u35?ws7~TR5jjrMb
z*0uwy)&p;R1pIvk@Z!6`vem%qw!&uy4sl2s|6cq|QW^<b#go+?ccKa0o_H+mGiu~^
z&0xus@z|_0u?V1)C0n$~TAXvsXVv<0!$A24V5&LHj7k>H*1&Mv0M9n?PRG$s$Rs$Q
zu^8w;5E3%I?Xzd-b0RVm`V+rXfL22DZpGf>7WfXE0DEl#>^=(EX;Wa-(DJ6{-L=5W
z9{?}B3q1D@@b{I4{GabI3a3T;Cf0i0)CF`FWK5ewE}$g0$E8ekMgFDlt_lKNc+aU=
zRPOnKvJGI|Ed5VPV*!ApqO;M~JLOSM_O>+TPBoyea!Uv-;cA)YHJ!zyrwya%pPc|4
zur;vBU|@iAcTIUlV4iLdffeh3-z@`fdl7io-0{vR&5o?fa4?zjC-BUPF!d&X1+6q5
z4LdOXzO&T(<w&_~0~kM3f2LF8R$I!X%L_WD>5`Y`2WFg!6AoJ>l$aQ2)P9w@J*G_q
zbB_K5aM2#Xuz}@FLH=jgwgGdW2Oe7jtlr?>U7Q-3JPIo*HJ5)J*)7zvu%qkTo_OFq
zD<vr<jmn~qm?FGQIQO2@)DQDZR4(x4{l2-4u|2>Oi9_w4km(4Rw3_L8SP%H%%kkQY
zNzPzo=3#~Mjj|m^0-xU#*ncaaxr-h@Yw|im;P=abxi0{(6>F;HUQBvu5phVdQH{%=
zXk4mt(x{k++atZt6TzJK`fsgSf=(Rz(=+qmURhQI*m;(or9)g8DL{kU6S<FlMgw0z
z5ZGdvhXazO(G`4dBG@}?fopzOSRW)jVs-2G)Q;Q34TizW1mr9ZR74%6^R~0^IZa)Z
zSFE`Wz+6I&Hr#9P=SuZD{eatJu)Tpi|GIDOAWzmLu4w~)@GS7y>wt+2F%06&QO{lr
zrC3P3D_>=~YI1uh#L8TlOPMPh;!Byb<xL7F+<jWU%e-?LfJu9{Y`{0Q#{W|a&5@uz
zsm`cBS&)d%EDL9e4hbPK3lhb!hXCWu(CvGV{UQ_olpTP7*&7(qlBK4#{e0C1VCHkc
zL$A38K!)ygfI|r`D+lv?#-4z%f^f4Sivvwb54~+?ajPu(SfL{Tt{c7@m*+`~<}!d?
zXX))bG=5=988)~*1=#c7lX}kcbCWWWp!EshSp$a{UhhTRo`k2MjxIp~5l);DWnPMA
z9DdKqins;Y5#=&~U1sTThaoQYdG?xfOSp&dU_r;LWbxp+qOg3mjbyx@k6G|ueK;^W
z;=R_-&+;|E<-Y`8Ul|vHa1O)7hEYk~Br7YXbY95fSv03|d+50VvKHV5?95AX!nqQg
z-&KICe|)O?TGk9@8o>BjdQ7PC2WV`<j~6-NiiJyG$EDCr<W=}sP;e=9i{YCH&-_#L
zfb1FCP8zpo_#oi&gMkCL?!E<Y)&$zmjiH*of~$WEeAJd4H-{X2?sy6KG}%%;NI({*
zlx1>z3iIVNASw(GJR{@$pgF{zi>9fiX)??-fSqURYqZ8!>4GV4&?+jImT(Fv9+-5}
zhj<p^Y-A6X=KVc_bGqllwe-av&vN?Cz?b)}eX29B((~ucLiomKfuFom%5PK8U*)<z
ziEidj#}+-4gD7&yKVh_1Z)mh9?F3Eu&fTY|ODZ;i33K#zZJqc9G`1D%(9j-r2e*V3
zfU+UgD!Ap2(1_yvyU0VAyc_4D*idVQXLfiOoLE1&-#4jdv+Vo_fcHKo$p{}ei$q&K
zUi&*;^TmJj>_m(5CmF%K+@6SCASFkN`WDS;9(_|-($tB=7fn;I`{d=10H(sj7Wg87
zs{us04(VYrGEj)oN4Pzg><^q2AN8-)M|aQn?tc~d-qS_y5Sut3Wbw|g?XnO#W9K4-
zZSQ+>W^*L8<NS@hApR#u2O5SPcj<&b;|IP<5?%u^WewYdi1IKsOZmBsM97h5K=sBg
zA(A!%8n+2>^%3P0+PX*GlW#HJ|MJIyznPt4swfO*L?6)*DV^CM6bMNVI4t44;R?oK
zkF)m3*rksnOd7R=8HNV#YiYr`zVeD*1Nh`jJ+Tw`r2>Y>3QoL0DrF$q2|u1sJ1tg}
zctVK8;-qj`4Q`1I_on?%j|cwGUR@`)b(cYywSeIa-Tl|X8)*=Bl%C4B&bU1eBx4Gn
z2si{92?n?-4DhL+oFX5c^cukUnfmGwxI|Pw_Q$lan(8%tSLd)%__n^C3!s_Tj(_zC
z#~Fg3TM`l5Oy=j%G2NxU)p^g8ZxyH#W{*Jh!f6|slKgvy+f(RCjya_34~|HJ0M{%!
zMO`XMRy2U|3-vJlAx!#cWWxLV6pecF^gE$?j$4v;lu`(*MyR8Q0yj<uHZPOUUmZ2B
zycGk3zVaCG&YDsi4y)EPUK%cZ-Z5?67kh3Cod~R{gxe#g(|J@&amdB~e5f|T*hP~R
zk%nViuAq0Bsm}*6mnwgMy_0L-ErIKgu3Qm&@|$1#MS(15m9m#|dlDj~i(bh{`P#<(
zu7C>`ovP*u5Xt@1_=S3)UWxk=;wZ`cd+|7lJ0c`vamfdpyk3WPGY@nU!e%TO(^ghC
zqFBn~f<1uGP3%cEuKe9U{3CGNACn7RKK8_12$PTn8Dpf91&{6LS@KWYFOncyR+duX
zQFLI+qG_s)sgm28S^R2+`?bc_+;iB)hbS<DDZRU|9;J+*FTQ}|Id1V%4w!~sX^TFd
zAp4Je%)*HC^Qm5j|Lu%E`6kf%E3yWV<j<MA0&}!1`Fj+xZ270G%Mu%UzI_hY7~g7A
zm~t0e3^RMxYWz%Gq!j)))EMk|%#;+Fm*YV!Mlv49Yh-zZ8gP3=h{sZKx1R`XJEC$g
z+>_s2x(c|!)ahm$h;iz(7jb)>J`06{sRNWY(KN6wQ25HilQD~)8+Hs}!fkqJ$9mkL
zL!1|T(SBaH=YcbTkv&X#uGENDt_P<5Sk9twNW&0nVcj6W+8*Qf6g%X_{6t9HA(QXi
z(y|u+GXEU4RvIrR-l(@~3-B|gF~LWCvzdgx!0mCMoTqNj;?DpBn<`bop8Z~XCopAU
z20N6%PTt#k<MwbivNc9ZV~NMW9Cr~`zlZ@iZqZb=Of-P;H|l*6;MdW$MtQgvd@(}s
zbsUm>mMN?mx|7>OGX;F(j6$Qu(|f-GB%q$fqeZwU@}Ssf{29|kw{v?c(6>0PTS#iO
z>i`EYI$8Z*Hh@|B8vt6J@W&LG^NW4i9B&)Kn{6B7I>DFCA;u;xdbxL}vJ=B7`6K=O
z{$37&&iIL|H5ArFpL9>%9;Xwz<)0Rv*o5*nxh};zqR_hVWc8mu19%=lob*dm?z~2l
zP{exUme9(@LI%Sug2(paMeslWtfVOkYP2xkG{+&$c@J=Vq5;KD)3+eD5vr(fHsUMb
zg}Y8syC)1_k9m5_4INk}SrR`0kyr>Za}%*Od87D_;;5pgs$92+LICUa==ORd@(|DS
zUx)SXH0U><B=Ss47g9*tL-LOmTZsCO!ZHZw`%Hx4#xR<&)tx7*w;h8XKU+_SMpRU&
zT+dI#su<olc4H4&>+BA0PXY>ggl*Ra7wisvwwG>%EifBle@f>9IZ9`}r8GaxWqO?$
zab#ZD>61D6LK?TnX*aE}#RvJ~xe55p?WZVH-LRzVpPa4dLc>rX;-5^#rmnLmxFr>E
zd&<3&%N&6JZoDVXEV<5q{rY0y4~7bn;!&xWl$=-md3|wv9F#!yRH{}YtOw@Zd9u17
zHh{x!)-CV1;pq_ARl<M?h(Pcaw=UbLxV!7SI)}U<#&*8zPkA(<o+;<<u6H3X+{tCC
zI^S?i?<B)r^7BFgt@sXxO65-=A-8$1eC0BC9WR_laS?Qc1tq6zsVQ8AKedd&KDSI#
z>!befa--fg2=E|)trK3Lm)7l(aG^6<HarSmoU$Da9s05ZfkS#39pX1{0oOhSd~BF6
zf@^pFl%;qQDxkZ_=JTwb{3>&M@*))xk}JHWH74J6iuzOZ`6p-UsZi1BuaOQO=UeDp
zX@t<~L<{0M5{EJfR_so0k4X2m{bb?G{Mr0BZ9H(%p1tcp%*`(VKYqEi0Ipd6^~>#v
zw2>p0Jawx8tWXN)-f@z;FZ%v&bMzOr#<kEGWHDdb9aRZ#3HK0LA=4AiB;$$Sm7{J?
z?Dbj2XfZ6)K4)-C%#lb#it8<B0?b(eQz*;aDIh`?pZrr&ijo0I3spydh?7frY}*G9
zoVM-c!SqtK3$I}mI<lcj;o=1+sUN7rT6OaWTjIZpr@thWz>kgAZQULz+{J?Qg>m~O
zVG(b?(i8w+*%vq=x(BoVe}48FaKkf&L-CFx#2%vJJGrV?x5r}~+^b6tna{Ix&_|f(
z7}c21j7$P(Xk4>=1pZx_n;r*rV2%dPNIU6c8zF}4Kj-VigLxJ*L?QVmi%pZ-*q0E5
z&#Tk?H}gEwjVlRmi3T<w0^E86FtkRs|EpzIrYy?m9|YbnUZml8-Yof3feL#8Wy{|}
zlr;GlJ4mB{Zf=j|`v~a3>WFV`5&(C#1o&sQ>l{4_8g~OYNK`1UFgcX0EN%(O_GEHP
z`0gI*aBSsND9oMkozQZ}d+JWW7x%93!dSEa0Nnd(!Ncd`R`q1v9%l7)4#mjLtRw+#
zsdr|yb{<)j!joFzRJF@oJ+>*tV*qwYJVZjK6q=mBab+x8f8tDM@i|{;PR%A*Z^1NI
zf<97uHXcqE>=DwT<}2nF7;_iE0b98hu&d?0yV8zXv;F?<LgvR@u4m^aX6>d>P#oM_
zK{hA1{EG^j#ogk3erGIY=m0e$0XF>&oj6iWoUO;1OGoI1cfPPGSW$v&n*~ewB#U^C
z46^LHF&W$*iBe0)<#5T_y1;z)i4lOIM~rrEM(&F0R_D9s@cWg&E)>Ug=8r|}n#<of
zzLfP;S@NfS_i%fdk9NnN;wY8Es?HGmstGsg{lX6X&hf}J)c8_O<jr2Cw`tTK;+A+l
z8=oKv=Gi_AVRg?ffGZEJpE8N&D%EfO8hHL6MbFQ$eot|$V#gvxeMfOUFq=an>d_^|
zkBuwO{F>W5f&JBPbM;vWqgx;2AF4QFcw=s)+}%H?O^<N+Gii|}Axw$oD5Utjp*zKc
z*-4oE3E=a40j6SfPyT$gp-=?t(Z4gwgGZ@&6wgz0#|KHc!emAN1c_1*Tvp1O8$rU!
zB?g$>D<JwZT}_y)zpg`E6*tU}*)Zy9P3y*V1Gh(zPwAF>j!~H>rG{oM!#i?2;EQ|p
zTqH1_f7Wxr;y034BuV3p`!7T_JO7C?=_&LQ1{557aP|#SposHc?hI4p?-*0s0eUM4
zni4MECw7^dFh_s4c=b_|hFlzyGf<)=zB)5><G_wx5?1PBh$|!M3qK%T4!6e%%RYLr
z&oc?no6E2--XGXvX!k9QjokmS7P$WD66|plUQit09P*)hVPl&7IU*pQ!iyk0%I!1U
z3~rC8yCQ9$CTA3`GX}5#8fT@2vn)s?h1E>xBtV}S^O**-vJuRpsdr9Hst0Bzq8^=O
zKH<V=_C4Eg0-Qeq*k{Yyr$|lR&u5ndxBk&x@Mb|q$MA`O==aK!e|>R#xcVl4Cj%w_
zyj@M4qaV?_SOm+Xlp?c}LL+AJ^~~*|#*vkd;~63G`QnwN8@B+5k1Z6@s?}zh+2p$A
zMc|i9OQ}xo`6I`gwh`GExjpnSk93}eDL>h#deo#rpVtZ#)9{?cwQxLc9<0Wm;dgII
zSTKG^mAO5RB3DxOMYsmmD&l5CfY0m-?6*~+oJv<O&Nd!@#d_fBw}CtUoZR7!y|w_)
z90O)vzmIWyqR~0g%<5Y@*XVg;0IzF>ZPUu-@gtEE+^|ZOw$hh2r<{$NEb6s|At{S0
zZz_x`0JC-u*PI<=B3Zhgi6t%=P?Om&7zyk?3fOJ)!u<lqFkDz$*Z=?^07*naRLc1=
zgtk{d1pfS90q4KIs=@7X<ZplJf&&YHC1wq<9KaS{3-T;RIetzk5x0_Ra7%0(Rp9o-
z5vS-mVsB|PQPR4B%R)$(QsXiI9y$QnXb@ly*6g+!u-yn?n~e**%H}ikW3o9Wo%!ZR
zz><}~pWX+|t&e6$_v7{qNRzgZr;}0*`PVVGCpHdZ7*2|pM1)v(fp^rzx%z|X21p(%
z1YDJiThfcTJ>1hfi$Kp_LhQw*^dJ+y=oDCJ=4+B(eJ2+SaSl9_xH&Wu`{ZdU92wjm
zqSVO+utg5m%NN^J0X{T~U~_0L4$$$W39Dvto#0tGbBMshe*&*DjGA~}=uaGEd{$4Q
zQ2cezf{8;XuDs5>(lS&mlse;NQBitFLjH{D*x>dQgeb~RP|ytdf2?+&t2?wdyTast
zR`Lcfv=J;)>KLaq*BiGdx{;6yRDwR%gD?T72{$26`;N3WXqfi&Bh7KtME<>n+ryko
zs{BjdwNvdeS9gROX5AKRf>-JLD7S}38&Sd1$Xzt73P(se42Wq3HWGPik~)1NMic$B
zhqzU-fu%VK4l{V<rbeDkSuThnC%1=9MZvKNp@RIWQ|-<mkn|-!iK%>z9G)waTT-$`
z|NT%^=JrTO@A!oKj_2{1oNypafvIwPy>^+C9=BNy`R8aOS`SJ&cQ&~0<n{<bAYlY7
zYDW<01E9DF<}*V>f7%9$$Ep*MtoR4ItxXjmciuV$Mpy$D4@Y|xQR*k9^h!$V{H<Q^
zL}U9WzWp5Q;1Y5mj;L2~dnDsa<F=Va@E&vZ+gf9^q<j<>aqlMyt1obS5(ZQZ!J@|_
zo>JnS^yfRde6TY1(kW5Vr;C}~9`e#OeI_aI<;DQaHS*i0hUIR&lPe2OP>3eLy8`B8
zl44=cy*yfodeVlS7+wXa;J`)uVqZZjx-jP6i)oNJRv|Qb$C|~h>Koji66R0Sff5o~
zVj$2T6tKIrH7=DTapr|W8cC6;)}+vCotmK1g44doPPlLLCw;-=r#&;zAsv)=41l~x
zjD*Zu9Hs0(cXDxG)_w9%fyi{jQw4b5M1V&CawBAlk~!_N5Y|_@J&BN=&Mk?fk0>ja
z3iU!p-&&>r)a?<ChdRo#>Q<38Dvi*A!lT9j%xSQQ4$VDP5&p`xWmt-dM0*E@Btmiq
z<nZ+)?I4bCQ7tJim8|U>U+YMCKkk<Vd!)r?T84y0kOaIUkW<XG2$8pJ`Fr4*BmX?m
zS8xbC5KFL>z9&}7qQZIQ?~_{!IZ@PsVmkqFyV`SJ;Xq7`t<$(AwAa<(mh>`iPbw>x
z7>3=wPdF5kkr2JV$MbXJizc-i^6z`x9(q<Pvu>3Fu2Xx>)n5;RtBmZa<;9%oKFIAE
z5ERbxZZZUzuo<xProgttflY@1Lk9HTJHdqD>inraERgF~tOJ&Q1iZQe_{)31$_>Ek
z4M2yr+$@5f-92Zn-tqK3!R-<H<8Z6kMrELInK6K~G{~WNDa2<iX1%bb_&s55>g>>o
zA(P=R=NV7k9x+!<CNofgspw$1`V%)V-2ZEgp+El^qj+-_@R#?2=iUMS_%0AiFqQtz
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
K&t;ucLK6Ttj<+2E

literal 0
HcmV?d00001

diff --git a/lib/constants/api.dart b/lib/constants/api.dart
index 8437552..7c8f5f6 100644
--- a/lib/constants/api.dart
+++ b/lib/constants/api.dart
@@ -1,15 +1,17 @@
 import 'environment/environment.dart';
 
 class API {
-  static const tokenKey = 'Telephony-Manage-Token';
+  static const tokenKey = 'Manage-Token';
 
   ///HOST
   static String get host {
     if (DevEV.instance.dev) {
-      // return 'http://10.0.2.2:8088/';
-      return 'http://api.dxbs.vip';
+      return 'http://10.0.2.2:8088/';
+      // return 'http://api.dxbs.vip';
     } else {
-      return 'http://api.dxbs.vip/';
+      return 'http://10.0.2.2:8088/';
+
+      // return 'http://api.dxbs.vip/';
     }
   }
 
@@ -43,6 +45,8 @@ class _App {
   String get content => '/app/user/content';
   ///删除自定义短信
   String get delete => '/app/user/content/delete';
+  ///选择自定义短信
+  String get checked => '/app/user/content/checked';
   ///更新VIP状态（已合并至用户信息）
   String get updateVip => '/app/user/updateVip';
 }
diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart
index 06adb78..9678733 100644
--- a/lib/gen/assets.gen.dart
+++ b/lib/gen/assets.gen.dart
@@ -14,7 +14,7 @@ class $AssetsIconsGen {
 
   /// File path: assets/icons/home_ selected.png
   AssetGenImage get homeSelected =>
-      const AssetGenImage('assets/icons/home_ selected.png');
+      const AssetGenImage('assets/icons/home_selected.png');
 
   /// File path: assets/icons/home_noSelected.png
   AssetGenImage get homeNoSelected =>
@@ -68,6 +68,10 @@ class $AssetsImagesGen {
   AssetGenImage get portrait =>
       const AssetGenImage('assets/images/portrait.png');
 
+  /// File path: assets/images/portrait_deep.png
+  AssetGenImage get portraitDeep =>
+      const AssetGenImage('assets/images/portrait_deep.png');
+
   /// File path: assets/images/refused.png
   AssetGenImage get refused => const AssetGenImage('assets/images/refused.png');
 
diff --git a/lib/model/user_info_model.dart b/lib/model/user_info_model.dart
index 07fdb89..d35ed39 100644
--- a/lib/model/user_info_model.dart
+++ b/lib/model/user_info_model.dart
@@ -12,8 +12,8 @@ class UserInfoModel extends Equatable {
   final int isVip;
   final String tag;
   final int status;
-  final num start;
-  final num end;
+  final int start;
+  final int end;
   final List<Content>? contentRef;
   final List<Content>? contentCon;
 
@@ -31,35 +31,38 @@ class UserInfoModel extends Equatable {
         status: 0,
         start: 0,
         end: 0,
-    contentCon: [],
-    contentRef: [],
+        contentCon: [],
+        contentRef: [],
       );
 
-  const UserInfoModel(
-      {required this.id,
-      required this.name,
-      required this.phone,
-      required this.isVip,
-      required this.tag,
-      required this.status,
-      required this.start,
-      required this.end,
-      required this.contentCon,
-      required this.contentRef,
-      });
+  const UserInfoModel({
+    required this.id,
+    required this.name,
+    required this.phone,
+    required this.isVip,
+    required this.tag,
+    required this.status,
+    required this.start,
+    required this.end,
+    required this.contentCon,
+    required this.contentRef,
+  });
+
   @override
   List<Object?> get props =>
-      [id, name, phone, isVip, tag, status, start, end, contentCon,contentRef];
+      [id, name, phone, isVip, tag, status, start, end, contentCon, contentRef];
 }
 
 @JsonSerializable()
 class Content extends Equatable {
   final int id;
   final String content;
+  final int isChecked;
 
   const Content({
     required this.id,
     required this.content,
+    required this.isChecked,
   });
 
   factory Content.fromJson(Map<String, dynamic> json) =>
@@ -68,5 +71,5 @@ class Content extends Equatable {
   Map<String, dynamic> toJson() => _$ContentToJson(this);
 
   @override
-  List<Object?> get props => [id, content];
+  List<Object?> get props => [id, content, isChecked];
 }
diff --git a/lib/model/user_info_model.g.dart b/lib/model/user_info_model.g.dart
index 6761b97..4e82a93 100644
--- a/lib/model/user_info_model.g.dart
+++ b/lib/model/user_info_model.g.dart
@@ -14,8 +14,8 @@ UserInfoModel _$UserInfoModelFromJson(Map<String, dynamic> json) =>
       isVip: json['is_vip'] as int,
       tag: json['tag']as String,
       status: json['status'] as int,
-      start: json['start']as num,
-      end: json['end']as num,
+      start: json['start']as int,
+      end: json['end']as int,
       contentCon:(json['content_con'] as List<dynamic>?)
           ?.map((e) => Content.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -41,9 +41,11 @@ Map<String, dynamic> _$UserInfoModelToJson(UserInfoModel instance) =>
 Content _$ContentFromJson(Map<String, dynamic> json) => Content(
       id: json['id'] as int,
       content: json['content'] as String,
+      isChecked: json['is_checked'] as int,
 );
 
 Map<String, dynamic> _$ContentToJson(Content instance) => <String, dynamic>{
       'id': instance.id,
       'content': instance.content,
+      'is_checked':instance.isChecked,
 };
\ No newline at end of file
diff --git a/lib/ui/home/content_connect_page.dart b/lib/ui/home/content_connect_page.dart
index 11d843b..ed808e8 100644
--- a/lib/ui/home/content_connect_page.dart
+++ b/lib/ui/home/content_connect_page.dart
@@ -7,7 +7,11 @@ import 'package:project_telephony/ui/widget/centertipsalterwidget.dart';
 import 'package:project_telephony/ui/widget/plone_back_button.dart';
 import 'package:project_telephony/utils/headers.dart';
 import 'package:provider/provider.dart';
+import '../../constants/api.dart';
+import '../../model/network/api_client.dart';
+import '../../model/network/base_model.dart';
 import '../../providers/user_provider.dart';
+import '../../utils/toast/cloud_toast.dart';
 
 class ContentConnectPage extends StatefulWidget {
   const ContentConnectPage({Key? key}) : super(key: key);
@@ -17,20 +21,14 @@ class ContentConnectPage extends StatefulWidget {
 }
 
 class _ContentConnectPageState extends State<ContentConnectPage> {
-  int _select = 0;
-  List<String> textList = [
-    '欢迎您的来电，祝您生活愉快',
-    '祝您万事顺心',
-    '感谢您的来电，我们会尽快处理的',
-    "自定义短信内容"
-  ];
-  List<int> smsIdList =[];
+  List<String> textList = ['欢迎您的来电，祝您生活愉快', '自定义短信内容'];
+  List<int> smsIdList = [];
   List<String> textListSMS = [];
+  int isCheck=0;
 
   final userProvider = Provider.of<UserProvider>(Get.context!, listen: false);
   final EasyRefreshController _easyRefreshController = EasyRefreshController();
 
-
   @override
   void initState() {
     super.initState();
@@ -43,13 +41,18 @@ class _ContentConnectPageState extends State<ContentConnectPage> {
     super.dispose();
   }
 
-  updateList(){
+  updateList() {
     if (userProvider.isLogin) {
       textListSMS.clear();
       smsIdList.clear();
+      int i=0;
       userProvider.userInfo.contentCon?.forEach((model) {
         textListSMS.add(model.content);
         smsIdList.add(model.id);
+        if(model.isChecked==1){
+          isCheck=i;
+        }
+        i++;
       });
       textListSMS.add("自定义短信内容");
     } else {
@@ -89,48 +92,61 @@ class _ContentConnectPageState extends State<ContentConnectPage> {
         updateList();
         setState(() {});
       },
-      child:ListView.builder(
+      child: ListView.builder(
         itemBuilder: (context, index) {
-          return _getBox(textListSMS[index], index == _select, index);
+          return _getBox(textListSMS[index], index);
         },
         itemCount: textListSMS.length,
       ),
     );
   }
 
-  _getBox(String content, bool pd, int index) {
+  _getBox(String content, int index) {
     return GestureDetector(
       onTap: () async {
         if (content != "自定义短信内容") {
-          _select = index;
+          BaseModel res = await apiClient.request(API.app.checked,
+              data: {'id': smsIdList[index], 'status': 1});
+          if (res.code == 0) {
+            setState(() {});
+            userProvider.updateUserInfo();
+            _easyRefreshController.callRefresh();
+          } else {
+            CloudToast.show(res.msg);
+          }
         } else {
-          if(userProvider.isLogin){
-            if(textListSMS.length>5){
+          if (userProvider.isLogin) {
+            if (textListSMS.length > 5) {
               BotToast.showText(text: '自定义数量已达上限，请先删除不需要的短信');
-            }else{
+            } else {
               Get.to(AddSmsPage(
-                status: 1, ploneBack: (String textContent) {
+                status: 1,
+                ploneBack: (String textContent) {
                   _easyRefreshController.callRefresh();
-              },
+                },
               ));
             }
-          }else{
+          } else {
             BotToast.showText(text: '请先登录');
           }
         }
         setState(() {});
       },
       onLongPress: () {
-        if(content != "自定义短信内容"){
-          if (textListSMS.length<2 ) {
+        if (content != "自定义短信内容") {
+          if (textListSMS.length == 1) {
             BotToast.showText(text: '不能再删了');
-          }else{
+          } else {
             showDialog(
                 context: context,
                 builder: (context) {
-                  return  Centertipsalterwidget(
+                  return Centertipsalterwidget(
                     desText: '你确定要删除这个短信模版吗,删除之后无法还原。',
-                    title: '删除短信模板', id: smsIdList[index],
+                    title: '删除短信模板',
+                    id: smsIdList[index],
+                    callback: (bool status) {
+                      _easyRefreshController.callRefresh();
+                    },
                   );
                 });
           }
@@ -143,13 +159,13 @@ class _ContentConnectPageState extends State<ContentConnectPage> {
         padding: EdgeInsets.all(40.w),
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(16),
-          color: pd ? Colors.blue : const Color(0xFFF9F9F9),
+          color: index==isCheck?Colors.blue:const Color(0xFFF9F9F9),
         ),
         child: Text(
           content,
           style: TextStyle(
               fontSize: BaseStyle.fontSize28,
-              color: pd ? const Color(0xFFF9F9F9) : BaseStyle.color333333,
+              color: index==isCheck?const Color(0xFFF9F9F9):BaseStyle.color333333,
               fontWeight: FontWeight.bold),
         ),
       ),
diff --git a/lib/ui/home/content_refuse_page.dart b/lib/ui/home/content_refuse_page.dart
index b09dae0..1d86274 100644
--- a/lib/ui/home/content_refuse_page.dart
+++ b/lib/ui/home/content_refuse_page.dart
@@ -7,7 +7,11 @@ import 'package:project_telephony/ui/widget/centertipsalterwidget.dart';
 import 'package:project_telephony/ui/widget/plone_back_button.dart';
 import 'package:project_telephony/utils/headers.dart';
 import 'package:provider/provider.dart';
+import '../../constants/api.dart';
+import '../../model/network/api_client.dart';
+import '../../model/network/base_model.dart';
 import '../../providers/user_provider.dart';
+import '../../utils/toast/cloud_toast.dart';
 import 'add_sms_page.dart';
 
 class ContentRefusePage extends StatefulWidget {
@@ -18,10 +22,11 @@ class ContentRefusePage extends StatefulWidget {
 }
 
 class _ContentRefusePageState extends State<ContentRefusePage> {
-  int _select = 0;
-  List<String> textList = ['现在无法接听。有什么事吗？', '我马上会打给你。', '我稍后会打给你。', "自定义短信内容"];
+  List<String> textList = ['现在无法接听。有什么事吗？', '自定义短信内容'];
   List<String> textListSMS = [];
-  List<int> smsIdList =[];
+  List<int> smsIdList = [];
+  int isCheck=0;
+
 
   final userProvider = Provider.of<UserProvider>(Get.context!, listen: false);
   final EasyRefreshController _easyRefreshController = EasyRefreshController();
@@ -38,12 +43,18 @@ class _ContentRefusePageState extends State<ContentRefusePage> {
     super.dispose();
   }
 
-  Future updateList() async{
+  updateList() async {
     if (userProvider.isLogin) {
       textListSMS.clear();
+      smsIdList.clear();
+      int i=0;
       userProvider.userInfo.contentRef?.forEach((model) {
         textListSMS.add(model.content);
         smsIdList.add(model.id);
+        if(model.isChecked==1){
+          isCheck=i;
+        }
+        i++;
       });
       textListSMS.add("自定义短信内容");
     } else {
@@ -74,60 +85,75 @@ class _ContentRefusePageState extends State<ContentRefusePage> {
 
   _getList() {
     return EasyRefresh(
-        firstRefresh: true,
-        header: MaterialHeader(),
-        footer: MaterialFooter(),
-        controller: _easyRefreshController,
-        onRefresh: () async {
-          await updateList();
-        },
-    child:ListView.builder(
-      itemBuilder: (context, index) {
-        return _getBox(textListSMS[index], index == _select, index);
+      firstRefresh: true,
+      header: MaterialHeader(),
+      footer: MaterialFooter(),
+      controller: _easyRefreshController,
+      onRefresh: () async {
+        await userProvider.updateUserInfo();
+        updateList();
+        setState(() {});
       },
-      itemCount: textListSMS.length,
-    ),
+      child: ListView.builder(
+        itemBuilder: (context, index) {
+          return _getBox(textListSMS[index], index);
+        },
+        itemCount: textListSMS.length,
+      ),
     );
   }
 
-  _getBox(String content, bool pd, int index) {
+  _getBox(String content, int index) {
     return GestureDetector(
       onTap: () async {
         if (content != "自定义短信内容") {
-          _select = index;
+          BaseModel res = await apiClient.request(API.app.checked,
+              data: {'id': smsIdList[index], 'status': 2});
+          if (res.code == 0) {
+            setState(() {});
+            userProvider.updateUserInfo();
+            _easyRefreshController.callRefresh();
+          } else {
+            CloudToast.show(res.msg);
+          }
         } else {
-          if(userProvider.isLogin){
-            if(textListSMS.length>5){
+          if (userProvider.isLogin) {
+            if (textListSMS.length > 5) {
               BotToast.showText(text: '自定义数量已达上限，请先删除不需要的短信');
-            }else{
+            } else {
               Get.to(AddSmsPage(
-                status: 2, ploneBack: (String textContent) {  },
+                status: 2,
+                ploneBack: (String textContent) {
+                  _easyRefreshController.callRefresh();
+                },
               ));
             }
-          }else{
+          } else {
             BotToast.showText(text: '请先登录');
           }
         }
         setState(() {});
       },
       onLongPress: () {
-        if(content != "自定义短信内容"){
-          if (textListSMS.length<2 ) {
+        if (content != "自定义短信内容") {
+          if (textListSMS.length == 1) {
             BotToast.showText(text: '不能再删了');
-          }else{
+          } else {
             showDialog(
                 context: context,
                 builder: (context) {
-                  return  Centertipsalterwidget(
+                  return Centertipsalterwidget(
                     desText: '你确定要删除这个短信模版吗,删除之后无法还原。',
-                    title: '删除短信模板', id: smsIdList[index],
+                    title: '删除短信模板',
+                    id: smsIdList[index],
+                    callback: (bool status) {
+                      _easyRefreshController.callRefresh();
+                    },
                   );
                 });
           }
         }
-        setState(() {
-          _easyRefreshController.callRefresh();
-        });
+        setState(() {});
       },
       child: Container(
         // width: 686.w,
@@ -135,13 +161,13 @@ class _ContentRefusePageState extends State<ContentRefusePage> {
         padding: EdgeInsets.all(40.w),
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(16),
-          color: pd ? const Color(0xFF72E4C8) : const Color(0xFFF9F9F9),
+          color: index==isCheck?const Color(0xFF72E4C8) :const Color(0xFFF9F9F9),
         ),
         child: Text(
           content,
           style: TextStyle(
               fontSize: BaseStyle.fontSize28,
-              color: pd ? const Color(0xFFF9F9F9) : BaseStyle.color333333,
+              color: index==isCheck?const Color(0xFFF9F9F9):BaseStyle.color333333,
               fontWeight: FontWeight.bold),
         ),
       ),
diff --git a/lib/ui/login/login_page.dart b/lib/ui/login/login_page.dart
index aad13c0..deb6dbb 100644
--- a/lib/ui/login/login_page.dart
+++ b/lib/ui/login/login_page.dart
@@ -131,6 +131,7 @@ class _LoginPageState extends State<LoginPage> {
                   var base = await apiClient.request(API.app.login,
                       data: {'phone': _phoneController.text, 'code': _smsCodeController.text});
                   if (base.code == 0) {
+                    print(base.data['token']);
                     await UserTool.userProvider.setToken(base.data['token']);
                     Get.offAll(() => const TabNavigator());
                   } else {
@@ -293,7 +294,6 @@ class _LoginPageState extends State<LoginPage> {
       if (kDebugMode) {
         print("点击协议了");
       }
-
       ///跳转到用户协议页面
     };
     return recognizer;
diff --git a/lib/ui/user/user_page.dart b/lib/ui/user/user_page.dart
index 3686409..23481da 100644
--- a/lib/ui/user/user_page.dart
+++ b/lib/ui/user/user_page.dart
@@ -1,29 +1,20 @@
-
-import 'package:bot_toast/bot_toast.dart';
+import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:permission_handler_platform_interface/permission_handler_platform_interface.dart';
-
 import 'package:project_telephony/base/base_style.dart';
 import 'package:project_telephony/ui/login/login_page.dart';
-
 import 'package:project_telephony/ui/tab_navigator.dart';
 import 'package:project_telephony/ui/user/content_authority_page.dart';
 import 'package:project_telephony/ui/user/members_page.dart';
 import 'package:project_telephony/ui/user/privacy_rights_page.dart';
 import 'package:project_telephony/ui/widget/image_scaffold.dart';
 import 'package:project_telephony/ui/widget/plone_bottom.dart';
-import 'package:project_telephony/ui/widget/plone_image_picker.dart';
 import 'package:project_telephony/utils/headers.dart';
-import 'package:project_telephony/utils/permissionutils.dart';
 import 'package:provider/provider.dart';
 import 'package:telephony/telephony.dart';
-import 'package:velocity_x/velocity_x.dart';
-
 import '../../constants/api.dart';
 import '../../model/network/api_client.dart';
-
 import '../../providers/user_provider.dart';
 import '../../utils/toast/cloud_toast.dart';
 import '../../utils/user_tool.dart';
@@ -44,18 +35,20 @@ class _UserPageState extends State<UserPage> {
   // bool vle = PermissionStatus.denied.isGranted;
   //bool vle =PermissionStatus.denied.isGranted;
   final userProvider = Provider.of<UserProvider>(Get.context!, listen: false);
-  bool vle=false;
-  bool isVip=false;
+  bool vle = false;
+  bool isVip = false;
+  String? endDate;
 
   @override
   void initState() {
     super.initState();
-    if(userProvider.isLogin){
-      if(userProvider.userInfo.isVip==1){
-        isVip=true;
-      }else{
-        isVip=false;
+    if (userProvider.isLogin) {
+      if (userProvider.userInfo.isVip == 1) {
+        isVip = true;
+      } else {
+        isVip = false;
       }
+      endDate=DateUtil.formatDateMs(userProvider.userInfo.end * 1000, format: DateFormats.y_mo_d);
     }
   }
 
@@ -74,10 +67,10 @@ class _UserPageState extends State<UserPage> {
         72.hb,
         _getBanner(),
         120.hb,
-        _getSwitch(Assets.icons.switch1.path, "功能开关",  true),
+        _getSwitch(Assets.icons.switch1.path, "功能开关", true),
         _getSwitch(Assets.icons.privacy.path, "隐私政策", false),
-        _getSwitch(Assets.icons.permissions.path, "权限说明",  false),
-        _getSwitch(Assets.icons.sms.path, "短信标签",  false),
+        _getSwitch(Assets.icons.permissions.path, "权限说明", false),
+        _getSwitch(Assets.icons.sms.path, "短信标签", false),
         // const Spacer(),
         182.hb,
         userProvider.isLogin
@@ -136,15 +129,15 @@ class _UserPageState extends State<UserPage> {
           const Spacer(),
           GestureDetector(
             onTap: () async {
-              var value = await CloudImagePicker.pickSingleImage(title: '选择图片');
-              if (value != null) {
-                BotToast.showText(text: '头像成功');
-                setState(() {});
-              }
+              // var value = await CloudImagePicker.pickSingleImage(title: '选择图片');
+              // if (value != null) {
+              //   BotToast.showText(text: '头像成功');
+              //   setState(() {});
+              // }//暂时不开放头像更改
             },
             child: ClipOval(
               child: Image.asset(
-                Assets.images.portrait.path,
+                userProvider.isLogin?Assets.images.portraitDeep.path:Assets.images.portrait.path,
                 height: 128.w,
                 width: 128.w,
                 fit: BoxFit.cover,
@@ -152,7 +145,6 @@ class _UserPageState extends State<UserPage> {
             ),
           )
         ],
-
       ),
     );
   }
@@ -200,7 +192,7 @@ class _UserPageState extends State<UserPage> {
                   begin: Alignment.centerLeft,
                   end: Alignment.centerRight)),
           child: Text(
-            isVip?"立即续费":"立即购买",
+            isVip ? "立即续费" : "立即购买",
             style: TextStyle(
                 color: const Color(0xFF001F3F), fontSize: BaseStyle.fontSize24),
           )),
@@ -215,7 +207,7 @@ class _UserPageState extends State<UserPage> {
         _getVip(),
         16.hb,
         Text(
-          isVip?"{$userProvider.userInfo.end}到期":"解锁全部功能",
+          isVip ? "$endDate到期" : "解锁全部功能",
           style: TextStyle(color: Colors.white, fontSize: BaseStyle.fontSize24),
         )
       ],
@@ -243,7 +235,7 @@ class _UserPageState extends State<UserPage> {
           ),
         ),
         Text(
-          isVip?"已成为会员":"未开通会员",
+          isVip ? "已成为会员" : "未开通会员",
           style: const TextStyle(
               color: Color(
                 0xFFFFEAB0,
@@ -258,26 +250,25 @@ class _UserPageState extends State<UserPage> {
   _getSwitch(String url, String name, bool pd) {
     return GestureDetector(
       onTap: () async {
-
-        if(!pd){
-          switch(name){
+        if (!pd) {
+          switch (name) {
             case "短信标签":
               Get.to(() => ContentDetailsPage(
-                content:
-                userProvider.isLogin ? userProvider.userInfo.tag : "",
-                ploneBack: (String textContent) {
-                  // print("这是数据" + textContent);
-                  // textList.setAll(index, {textContent});
-                },
-              ));
+                    content:
+                        userProvider.isLogin ? userProvider.userInfo.tag : "",
+                    ploneBack: (String textContent) {
+                      // print("这是数据" + textContent);
+                      // textList.setAll(index, {textContent});
+                    },
+                  ));
               break;
-            case"隐私政策":
+            case "隐私政策":
               Get.to(() => const ContentAuthorityPage());
               break;
-            case"权限说明":
+            case "权限说明":
               Get.to(() => PrivacyRightsPage(
-                name: name,
-              ));
+                    name: name,
+                  ));
               break;
             default:
               break;
@@ -321,8 +312,7 @@ class _UserPageState extends State<UserPage> {
                       // setState(() {
                       //   vle = value;
                       // });
-                    }
-                    )
+                    })
                 : const Icon(Icons.keyboard_arrow_right)),
       ),
     );
diff --git a/lib/ui/widget/centertipsalterwidget.dart b/lib/ui/widget/centertipsalterwidget.dart
index 11513a5..ccbe800 100644
--- a/lib/ui/widget/centertipsalterwidget.dart
+++ b/lib/ui/widget/centertipsalterwidget.dart
@@ -9,12 +9,17 @@ import '../../model/network/base_model.dart';
 import '../../providers/user_provider.dart';
 import '../../utils/toast/cloud_toast.dart';
 
+
+typedef Callback = Function(bool status);
+
 class Centertipsalterwidget extends StatefulWidget {
   final String title;
   final String desText;
   final int id;
+  final Callback callback;
+
   const Centertipsalterwidget(
-      {Key? key, required this.desText, required this.title, required this.id})
+      {Key? key, required this.desText, required this.title, required this.id, required this.callback})
       : super(key: key);
 
   @override
@@ -45,6 +50,7 @@ class _CentertipsalterwidgetState extends State<Centertipsalterwidget> {
             style: TextStyle(color: Color(0xFF999999)),
           ),
           onPressed: () {
+            widget.callback(false);
             Navigator.pop(context);
           },
         ),
@@ -60,6 +66,7 @@ class _CentertipsalterwidgetState extends State<Centertipsalterwidget> {
             } else {
               CloudToast.show(res.msg);
             }
+            widget.callback(true);
             Navigator.pop(context);
           },
         )
diff --git a/pubspec.lock b/pubspec.lock
index f4e88fb..e4dc2ce 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "40.0.0"
+    version: "46.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.6.0"
   archive:
     dependency: transitive
     description:
@@ -112,7 +112,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.4.0"
+    version: "8.4.1"
   call_log:
     dependency: "direct main"
     description:
@@ -161,7 +161,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
   collection:
     dependency: transitive
     description:
@@ -287,7 +287,7 @@ packages:
       name: equatable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   fake_async:
     dependency: transitive
     description:
@@ -308,7 +308,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   fixnum:
     dependency: transitive
     description:
@@ -397,7 +397,7 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -470,7 +470,7 @@ packages:
       name: grinder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.1"
+    version: "0.9.2"
   highlight:
     dependency: transitive
     description:
@@ -743,7 +743,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.19"
   path_provider_ios:
     dependency: transitive
     description:
@@ -820,7 +820,7 @@ packages:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.4.0"
+    version: "5.0.0"
   platform:
     dependency: transitive
     description:
@@ -876,7 +876,7 @@ packages:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   rational:
     dependency: transitive
     description:
@@ -946,7 +946,7 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -1079,7 +1079,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   universal_io:
     dependency: transitive
     description:
@@ -1128,7 +1128,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.2"
+    version: "2.6.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -1142,7 +1142,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.3.1"
+    version: "5.4.1"
   yaml:
     dependency: "direct dev"
     description:
@@ -1151,5 +1151,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0-206.0.dev <3.0.0"
-  flutter: ">=2.8.0"
+  dart: ">=2.17.0 <3.0.0"
+  flutter: ">=2.8.1"