From 974d31662c25a9347d1c96d020f9c23263d58096 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 27 Apr 2022 15:32:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=A1=B5=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baselib/constant/PathConfig.java | 2 +- .../res/drawable-xhdpi/ic_about_us_icon.png | Bin 0 -> 629 bytes .../main/res/drawable-xhdpi/ic_del_tong.png | Bin 286 -> 244 bytes .../res/drawable-xhdpi/ic_dept_mine_icon.png | Bin 0 -> 312 bytes .../drawable-xhdpi/ic_draft_title_icon.png | Bin 0 -> 289 bytes .../drawable-xhdpi/ic_inbox_title_icon.png | Bin 0 -> 547 bytes .../res/drawable-xhdpi/ic_login_out_icon.png | Bin 0 -> 683 bytes .../drawable-xhdpi/ic_recycle_title_icon.png | Bin 0 -> 296 bytes .../res/drawable-xhdpi/ic_schedule_icon.png | Bin 0 -> 331 bytes .../res/drawable-xhdpi/ic_send_title_icon.png | Bin 0 -> 521 bytes .../src/main/res/drawable-xhdpi/ic_share.png | Bin 2765 -> 516 bytes .../res/drawable-xhdpi/ic_team_mine_icon.png | Bin 0 -> 547 bytes .../res/drawable-xhdpi/ic_work_day_icon.png | Bin 0 -> 360 bytes .../layout/layout_base_search_cancel_gray.xml | 10 +- .../layout_base_search_cancel_gray_btn.xml | 25 ++ mainmodule/src/main/AndroidManifest.xml | 1 + .../mainmodule/base/MainTabActivity.java | 2 +- .../mainmodule/fragments/MineFragment.java | 72 ----- .../src/main/res/layout/fragment_mine.xml | 28 -- oamodule/src/main/AndroidManifest.xml | 7 +- .../activity/email/DraftBoxActivity.java | 20 ++ .../email/DraftEmailDetailActivity.java | 2 + .../activity/email/InboxActivity.java | 24 ++ .../activity/email/InboxDetailActivity.java | 4 +- .../activity/email/RecycleBoxActivity.java | 21 +- .../email/RecycleEmailDetailActivity.java | 2 + .../email/SendEmailDetailActivity.java | 2 + .../activity/email/SentBoxActivity.java | 20 ++ .../meeting/MeetingCenterActivity.java | 6 + .../oamodule/adapter/EmailAdapter.java | 13 +- .../oamodule/fragments/EmailFragment.java | 63 +++- .../oamodule/fragments/MineFragment.java | 196 ++++++++++++ .../main/res/layout/activity_draft_box.xml | 8 +- .../src/main/res/layout/activity_inbox.xml | 10 +- .../main/res/layout/activity_recycle_box.xml | 12 +- .../src/main/res/layout/activity_sent_box.xml | 10 +- .../src/main/res/layout/fragment_mine.xml | 297 ++++++++++++++++++ .../src/main/res/layout/fragment_oa_email.xml | 180 +++++++---- .../src/main/res/layout/fragment_oa_main.xml | 3 +- oamodule/src/main/res/layout/item_email.xml | 13 +- 40 files changed, 853 insertions(+), 200 deletions(-) create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_about_us_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_dept_mine_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_draft_title_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_inbox_title_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_login_out_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_recycle_title_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_schedule_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_send_title_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_team_mine_icon.png create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_work_day_icon.png create mode 100644 baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml delete mode 100644 mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java delete mode 100644 mainmodule/src/main/res/layout/fragment_mine.xml create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/MineFragment.java create mode 100644 oamodule/src/main/res/layout/fragment_mine.xml diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index f9421fa..d779870 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -111,7 +111,7 @@ public class PathConfig { public static final String PATH_MODULE_MAIN_FRAGMENT_GRID = "/modulemain/fragment/grid";//网格员模块 public static final String PATH_MODULE_MAIN_FRAGMENT_SUPERVISION = "/modulemain/fragment/supervision";//监管模块 public static final String PATH_MODULE_MAIN_FRAGMENT_LEADER = "/modulemain/fragment/leader";//领导l模块 - public static final String PATH_MODULE_MAIN_FRAGMENT_USER = "/modulemain/fragment/user"; + //====================Player======================= diff --git a/baselib/src/main/res/drawable-xhdpi/ic_about_us_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_about_us_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f9fd8fd3a83256d7ea3bc1e90e8b3d31d238983f GIT binary patch literal 629 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2I~0X`wF|1V?#ng7pc{6C)sWP?%m z|J%7>Mka_nlLnHyn2lfqMS$WLGr%NJOEy?R=KqUX|F1UuKa%wSB3L6(&E+hZu|Vya zU|TZ(U&{P{8LSv=o$iCZ$AB)-E(!7r{?FjhaO(aSzI(YHtQ*a5NKO^$(K%6nG+I52 zjn{AIV%f46N&6Mjl=S+)ofmj?R+@oRKEJ(cz2?isQs+6r$KUL7+_>r2qSG%vT|6lD)7`?$`*c#>v-gXQdY}BLx_L$V z&8_r5UvkXahM=mdgckMg2 g$zN;ZufAg6(na*S0LTf)6)$Gy}i9a8ps8L zuCA{B{(cC1!=0V-Ky^GNL4Lsu{~Hd}J51Pbpb+rkRMY!@pm?#Ti(^Q|oMZ`w123Bx zgfBdaU=>to*jCi#afm~~#dxQJs;gt7YD$8J#*!smrM$`^qK8VE3cfvK$)WoZhgZM$oG)Jm`{Bq10Xm YhWpn|>OQnofPBN?>FVdQ&MBb@07s@&umAu6 literal 286 zcmV+(0pb3MP)#%gb*koo2G}mu>ui zF#%LnRpxnq6p@n=xOUFnilQhre-i-7yNK+yWZroL;Go4=0bXq)0MY%UCu~7Unt?|E zB)Op0n!^5h4FE&q_W|^DOJtmrLCX{D0WHv~y_V;907yQ&tGFAKNwq~&U@DQtmH?6h zNr9w5QsA!?Xa~;&z}Xu{v$kjoSm(d*mjFIdAm;0M^cwC<6?~F)>)2(*M&!3asF0 zo=UrWGUeWh^m`}M?w&}ycM>G~;LPmlzvO{Rc}s%)f*Jld?01-7FWyxUx?a*F&3rvj zVzZ}>@8sQoT4Du<{`a^g?H(t2@Iw#9*0>JE(zFMC@oRk z*W$sGm1+3qQfKplOq1S#J(sv2+HiK1D91Q-F)}#1curjWpvoWUdiky literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/drawable-xhdpi/ic_draft_title_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_draft_title_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eea3592a29040e82bbab37329ec4f41886c5e1fd GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYgdr%mREuT!FN0=6^V{$@mXJKoP4f zm^g%y_1~f3zeC1cd zRc}|_2m4hDPX7dQ-A_jdZvGPS=S4#^gJDNPTyRROgGL$ibW!f7zZ?_lfo@{(boFyt I=akR{0Glj#C;$Ke literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/drawable-xhdpi/ic_inbox_title_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_inbox_title_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6937e90e70d7d749c8d18fca700ed226ced1f07f GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYgdr8UuVnT!D1@-IE!&kEh=|1!CMe zo^k(p`rT9M4^IHOAQ2!N%m9)1PG;UZoN@D5`kfPLcTQy7KLZp2GScpzOuGwYpH9Df z0%%U=!?Qp}8i;)||{ixPgw)E(!7r zX87;0|9*nPe66=jqTgRxe@sbwMT182#y*>@UERi03-rYUX1+2Ikry~4wAxA7mxY0W zQO(oEF{EP7+i5o^H5mvnsK0LAr1zk9UA6qb|Lj?7PEBc4`&-U`^A4Qj2?3g0+?OoTa zHM6?IzC7Wudnr77S(39qU!z^#nRDiEc6f$u{2yb&_UIlB(!|FJ_0YynCD#xh3}g%`W@PokwH~nB=Ya VZVJ3yB?Am-22WQ%mvv4FO#lbx2>t*7 literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/drawable-xhdpi/ic_login_out_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_login_out_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3db8a06e09bc6ed4ea1c76e531fa2054e28bea85 GIT binary patch literal 683 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2JW0X`wFKzcVA?BBnC*REX<_V(@D zf$Tkd_CUCB5+VX5fdHZaqUD>gQ4`Q0@sc3FV21w(1QHrHC>R91FZkf_;Qsju7xLp5 z_&@1#%4A?*{O9T77*a9kZ20YI%?dm^tVefmef#adeQBtN!h{8{ozI_}J>nF^Ph-u4_o_On=*V%`KZh70D>z+5= zox5Ch)4Olk%EePxsT4isl_+~GzcNbc`n?6G`Q9a4J&rtEvFXXyEP?Ym?K&3iVmnp0 z9`q1A>3ktj^?40-I5;qzpMOq;fUh|P{Rakh;ro7gTob?}@0%}H*U z&wgjazhf?ETGq|lW4PslU0#@qaJzc*wget6mBW4N&NCLQz5dH{?UKX~U#fO%&wakm zC2r5o(>?PiZF!br6tZcxYk>V*lSUrVcQuW5of9n>PHL)dGTH7wacOU1m(E))r)ezF z+=ph=csC`i6I>F)xnSj_E*A#fNwePvzS(3{^PlfuPzH}&W-^EFNoCWv>1WeVyxz1p z@t5A?a*6jAU-VOE^(2c~q&LgY={zZSlJVBD;%TzKS{HcwX3Xe(YIL~QY~tsKZ`U2j zD_pGVwj=53iTI33UcyY_rmJ`ItzYh#&v81uH2;`xo6PzGmUZXXUW;3D?k)GLS09Q` zJlt4Q#(y@w(Kg~r%ce@6Me}?Ed=IG9+aH^>>49)#2KTw;hc%aL|GDGk7cKkkj+^;~ z`-1bH@szf|eSPA8!1wyUCoe8u88+kNmecx=#D7iVb=a!0@jNiGFnGH9xvXlM!5FA#ViFd=@y z`Rsf4K*`CTE{-7;bKYLN&DEeF;CfLf`^>uk|F;G@W>^}!wjR6buefQ!>{$!1XXl9K zWGrFY+O<+u(Xgl~Xzzp*l}i5o7CwCacAfz*)1I9?Ce78qYkkD$^7?6Pf+{O^O#QO_ z_b%;zMwX5(ouvy)uf^17GcYo-bgZqiEWN(_G>f>MfS|y?@VSgB1V( literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/drawable-xhdpi/ic_schedule_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_schedule_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..56d1a92cbe3526a7501f0d4810993424cb676c8e GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbVR04cLT!FN0=6{=v|8`mbt+M{x z0#W9F+YB%X7I!H4&nJ8bWB^Y|kY6yv|M~`lgb(xgKX4E@Yi}eC6hGzZ;uumfCwT$i zgP@?OhI39#XPTPWUg%hPSZgviwk=2y?r_@>qOfUAlZ69A#4O(FUsyJnDC=c524?QL zB=M1*r8#hx=>C#KM!U>1$HJORtxZh{ZzV3x<4ZVu!K6d)?4%h?7j?R>7MMF4vbUu1 zyzFdh(&RWBQNrD|^RQ|1MroPefU`67*t6U-j!j|9ZqGa>q@(cG;B3T_##;|(ZDd^~ z?PP40IW1&|&NYpj20JDzEi+l-;LLjEWT)5l zuMC!Fie?_-QhVdmU zU&wijW2{%&JuGeV94zg0g_yi7q;#IiPp+Eq`NO)T2X@VsOZs0__N4Zol{P*zb&po1 zO~0IXLhGJWRXaW(pAx#NzsLPXi*nq{K1cfUnt}K3Lcwe0N?7x_~%jMqH z?pI`wdJ(?yxY*x|4%fq9gik+ibgVyom;2Iv)m1Gyea)eXJKwYQ+s>YxFn2*&y$VP5 z1?Hpgizkb**UWE!Fqh%4O%i)oan2dWrxG)n&nRvwo6s!Ae$H{%+&1T|w-W6I3pCjM zbN|@1gf6H&`dc$b{*JSuT>$^tFB7UB$eeMuWIHN%EA!2_3xz6jzY5=ddNEVWpWpWQ m(}gqGAAfj#>*a^*AGupkavgJB(RmaYISihzelF{r5}E*U?(PKu literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/drawable-xhdpi/ic_share.png b/baselib/src/main/res/drawable-xhdpi/ic_share.png index e53b93099c382224d00288008171d36e14629b0a..0a8a5c0342c05892f107e9de6e4f9ac9abb8e0f4 100644 GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`*$4Q9xB}^(o}TXR?*9IMAOixr zy1IIMdx30-AW#+pAhJLyh-_b9-<*XnJ^+mnEeY}qX87MA@P5I0gMmz{|C(D;N4h!o|W;@ug9JjQ7R=(g&M6mm*E?!1WR<`cWi?&?TkBx>`gub6#xwPEu)}J2B>su|ma%+El zlx~(-W*vQeU2x~D-OMpt`<6sp2-}osZ5+PTyQXxv&$%kI0QJ{F>jRG~q;#cu{$OLJtg0M?WEnJUzrWgEi(+}Vc@+t9r{!we)69aWU zzov^Coo+o|`_9@#6&?4ydGJB`W0S`hKZloJREX`o5ckVB>)gHIqnSL1lCQ?(YpL-r zDK&2sDDk-!D$P})IVEP%j_xgyLfb>E`Hy~^I`!qVL*0(Gtk0stEYhw{{mFND;X3_0 oESybZ)!$SL_P<>nzW)n<9uvFEc4?(`z_?)WboFyt=akR{0DIQ#jQ{`u literal 2765 zcmV;;3NrPHP)7E@bIBQ|QGsakCTi%=JL=HA(zQL9(5 z3p+D+XXye8R$E)>V`*umEov%-#I!W^k5yf6n#&j|4n6^EJ)~ z=aGQNX1>Px;5-uW*v!|sa}C^z6)VC`O-=keY8b|-$NAN)*;%P^x~?|?KnD?hRtT}h zvaBaFnaqirQSi|5SqVys+bb9Y( z!>d<~E9P_r5toF+;pYs)uqF#&J%JklfHwf(3IGtrfQaaTq9_lgQmLN7%r08awI2a6_sYOC5oXqt8( z0K@@6wE^ODZkv=+%VaW#s}1jrfinza%D}+DCly7xf`~2!fY|^r0|3qkfN20Q)pmQ9 z1jqdh4-YSqQm!hrEoQ`q^0Pz~GfnfgYQmdzaEU}>dM=myHUQj4L?0?Zn&MzmCBbpK zmX?-=hK7dgiD)YTa4gSW_DLz1W-^(V9E{_r%A|lZ3?p>%8^Z9N7_;`u2-ay2*zP`R4+qP}XS0GDGUn^lG61h=Pl(hhGF%j8qu5xm- z3-vl89wH+476yrk&5FaSs{YzAjFaO{*f0z+JUn~}5%m($r%Tj5!k6;Fg9o=%0CeEz2Zz}r``$-rL5 zJ>hV;*J~oE>fqw>_(i!~j;;4wh^W+|&yM&jh`3!!`9gDZ^FIv37^!62lxrJ{#V(an z{ty5b+UpR}2)k&3K%l3yvy(O3RjDetcsxGGvaF|w=*kj@GYi%)gjgL4g?0pk!T!nc zDdX|@G|RG95z+Tc$aDe`9|eF1-MVO11IL$ul=8;^^SG-iDEpk;KN08;6_@R~2xHMB;*6F83G_-BMyz4@4 zNj-Maq?Edp@_{n-qo!$Qob<(YDh9{K=aeZ^o{&<0%N{2~#Dj?V^?`wbS2u6o%$LC# zE39=yv>pJyQ%VRSL@bp`rJV{`5jeJ+X3m`XT>#*f3KtE^2Il@iAh4*jvvZ$QVQN)R z)3o;kz-jv zDdi2BOy=kWeWR}HELVz%K4Y(oh;I>*uBz&eO0r^}!0EcafQX(dgoMUq8z7=(rfK$; z%dQ)S5gr~MzFA7S002G(0L_J8Ik&8M-V-|coNA55VmI&u9RT16$!Vo<%ilC_-n@N_ z7A=}wC!Yg{LqkJd1!J;Uu)iyca&0o194!80L9=E{DZk12Pa?WtB5f@5|Koz=DDu$I z&~-%gH~?^*uefkP^A+9=$z<|%kK>=d2yQzmIL|u);1k8$R0y#!l}i0~>~E1s-y)2h@I=tmx;)Z2avU6n1~u}QH_$|3I@0)rQ{2Vx4yk>N5tjT zej4T)oUZFVM08KFbQ~OHt2-W#&#)}34FK3DJT2Q^T%U;86gbLpHbndnBJM%N7ljag z*=)8y6bfBzS=MO}3kzBN(~>oXGqY7n`JmlK<0oN=_zTOjT5Itb(JeT>vHnd&A1wmG zj`4g&QJSTcMj^{?kAIC-XJ`MfMDzmxi-@l^H8s6sH@E}{a)dY$4u?0_D$eKnjMFsjIso7;R9v!!ZBlA$zRQ{w z2n38ZYu3Ev^bue=aG_A>Dj`HDo6WK}@Kw7SA>uJ2TCJ+;2CtD_r>f~n<1|f+uxH?) zbGDHfRM+w2$A9NGGExTIn?i_{Qp!XLZ-7O5n~3hu<#JnldU|*GcS zIKG+nv;HZorfK}0!EI$$g&k);l*i3`I$2Q%;8?Ssmr}0CWHM|RPkM2sak{RXL=?42 z$)ThzrfG6qt}0~$aD4IXDLiNBtIB{LI&ljwNs}s6uQ5oqoXERW7@CdcNgb}*L#$DdwqP*ru+nf|Kg z)S2#-FxN8-qj7L>kOPTh&qx2Ls_MK8}b# zOQ+MEqpaE%9TS}2(+v&|vMu;EA;cqd=FHi?Y}v9inwPahbq%iYK4iBL;*Ml8x!cVu zolA9HgX2Vvl=3divVPg!-CebtwBDe)2FDkQuIr6`eSIgLrt0bqiW7OgfOFFCIbX*I z=W&UBa6UMX1UxqLHO>d;k$}f$zQ+0BJQDEO%-1*{oJRs4oB0~&gY!thW3&GQq-(T` TG-ahz00000NkvXXu0mjf1ll2) diff --git a/baselib/src/main/res/drawable-xhdpi/ic_team_mine_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_team_mine_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..18885f9f8eb7da92b9aaa8d6faf1e873bd9da428 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2H<0X`wFK>GhYhW~THd1q>S-*+GueDGBlmX87N*-$7x%)qyS`xqD)l{{S>Ln`K6y?%32lYszhfG}fV`mw@ewfC?8 z|8K9l`|C)@NKKt(L}cGf7b@R<+)b5q0Uy% zTKU2IH#Ya4>V6bFm@ISs?4D~Yk9sj~pLDt__N>>fhfBHHzr9p=`yuGS;X@zz4$ggI zw8j5+>}hXtz0k9_LO@E_8O%jZw_ zy377?F1le>8$}rVxekAuE3UHhTb?(g{Dk@G;*nY$|CK9ZZ=9%3*;akRDq6?oKrKst zyjjs<8TaJRai0%vz8(Ft(RXU?N4A6BEdGLf96rb#6lU2RJ+GqR-#vcdMP;0})g`zEkDQUiFi^)Q@imk|4p8JJe3?Rz0vN0fIk<+1i*D3mKPD{4WnfzI(|HGcCZ{IB`v5&b>AjteI)nP~D)eFYjg63(Z zXIJc)7%ZifR@C*c@?YEG7t9@)^@>SbQHr@9^H_mbX%qV@3SN2lw + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="horizontal"> @@ -29,5 +30,6 @@ android:clickable="true" android:focusable="true" android:text="取消" - android:textColor="@color/gray_text" /> + android:textColor="@color/gray_text" + android:textSize="@dimen/text_16" /> \ No newline at end of file diff --git a/baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml b/baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml new file mode 100644 index 0000000..ab73155 --- /dev/null +++ b/baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/mainmodule/src/main/AndroidManifest.xml b/mainmodule/src/main/AndroidManifest.xml index d1644a8..20c04f8 100644 --- a/mainmodule/src/main/AndroidManifest.xml +++ b/mainmodule/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ android:name=".base.SplashActivity" android:launchMode="singleTop" android:screenOrientation="portrait" + android:theme="@style/FadeAnimActivity" android:windowSoftInputMode="adjustPan|stateHidden"> diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index c4796af..6e6e4d7 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -123,7 +123,7 @@ public class MainTabActivity extends BaseActivity { BaseFragment homeFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_HOME); BaseFragment docFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_DOC); BaseFragment emailFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_EMAIL); - BaseFragment userFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_MAIN_FRAGMENT_USER); + BaseFragment userFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_MINE); mFragments.add(homeFragment); mFragments.add(docFragment); mFragments.add(emailFragment); diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java deleted file mode 100644 index 9882f59..0000000 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.tengshisoft.mainmodule.fragments; - -import android.view.View; -import android.widget.Button; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.launcher.ARouter; -import com.tengshisoft.mainmodule.R; -import com.tengshisoft.mainmodule.R2; -import com.tenlionsoft.baselib.constant.PathConfig; -import com.tenlionsoft.baselib.core.widget.base.BaseFragment; -import com.tenlionsoft.baselib.utils.LogUtils; - -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.Unbinder; - -/** - * 作者: adam - * 日期: 2022/3/31 - 9:26 上午 - * 邮箱: itgaojian@163.com - * 描述: 个人中心 - */ -@Route(path = PathConfig.PATH_MODULE_MAIN_FRAGMENT_USER) -public class MineFragment extends BaseFragment { - - @BindView(R2.id.btn_login_out) - Button mBtnLoginOut; - @BindView(R2.id.btn_user_record) - Button mBtnUserRecord; - private Unbinder mBind; - - @Override - protected void setDataToView(View dataView) { - mBind = ButterKnife.bind(this, dataView); - LogUtils.e("MineFragment"); - doSync(); - setStateView(STATE_SUCCESS); - mSrlView.setEnableLoadMore(false); - mSrlView.setEnableRefresh(false); - mBtnLoginOut.setOnClickListener(v -> doLoginOut()); - mBtnUserRecord.setOnClickListener(v -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_DETAIL) - .navigation()); - } - - private void doLoginOut() { - this.mActivity.reStartApp(); - } - - /** - * 同步数据 需要更新9张表 - */ - private void doSync() { - - } - - @Override - protected void refreshView() { - - } - - @Override - protected void loadMoreData() { - - } - - @Override - protected int getContentViewId() { - return R.layout.fragment_mine; - } -} diff --git a/mainmodule/src/main/res/layout/fragment_mine.xml b/mainmodule/src/main/res/layout/fragment_mine.xml deleted file mode 100644 index 5c20a8d..0000000 --- a/mainmodule/src/main/res/layout/fragment_mine.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - -