From c79e6751fef848a1b31014788daef31a90d3b871 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Fri, 18 Sep 2020 09:14:08 +0800 Subject: [PATCH] 1 --- .../com/sl/house_property/Main4Fragment.java | 4 +- .../com/sl/house_property/MainFragment.java | 13 +-- .../sl/house_property/MainTabActivity.java | 24 ++++- .../discovery/LikeFragment.java | 92 ++++++++++++++++++ app/src/main/res/drawable/main_bottom_2.xml | 4 +- .../main/res/drawable/main_bottom_like.xml | 5 + app/src/main/res/layout/activity_main_tab.xml | 18 +++- app/src/main/res/layout/fragment_like.xml | 48 +++++++++ app/src/main/res/layout/fragment_main.xml | 49 +++++++--- app/src/main/res/mipmap-xhdpi/gouwuche.png | Bin 0 -> 1249 bytes app/src/main/res/mipmap-xhdpi/gouwuche_no.png | Bin 0 -> 1192 bytes app/src/main/res/mipmap-xhdpi/zan.png | Bin 0 -> 1582 bytes app/src/main/res/mipmap-xhdpi/zan_p.png | Bin 0 -> 1625 bytes 13 files changed, 224 insertions(+), 33 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/discovery/LikeFragment.java create mode 100644 app/src/main/res/drawable/main_bottom_like.xml create mode 100644 app/src/main/res/layout/fragment_like.xml create mode 100644 app/src/main/res/mipmap-xhdpi/gouwuche.png create mode 100644 app/src/main/res/mipmap-xhdpi/gouwuche_no.png create mode 100644 app/src/main/res/mipmap-xhdpi/zan.png create mode 100644 app/src/main/res/mipmap-xhdpi/zan_p.png diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java index 7be61b0..efb6b09 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -82,7 +82,9 @@ public class Main4Fragment extends BaseFragment { mDataBinding.userImage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - + Intent intent = new Intent(getActivity(), MyUserMessage.class); + intent.putExtra("usertitile", "个人信息"); + startActivityForResult(intent, 0); } }); initTopView(); diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index d5f4c7b..b2c5aeb 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -372,12 +372,13 @@ public class MainFragment extends BaseFragment implements V startActivity(intent); break; case R.id.cargara://车库 - if ((Config.getInstance(MainFragment.this.getContext()).getUser() == null)) { - intent = new Intent(MainFragment.this.getContext(), LoginActivity.class); - } else { - intent = new Intent(getActivity(), CarGarageActivity.class); - } - startActivity(intent); + Toast.makeText(getContext(),"功能正在开发",Toast.LENGTH_SHORT).show(); +// if ((Config.getInstance(MainFragment.this.getContext()).getUser() == null)) { +// intent = new Intent(MainFragment.this.getContext(), LoginActivity.class); +// } else { +// intent = new Intent(getActivity(), CarGarageActivity.class); +// } +// startActivity(intent); break; case R.id.moew1: intent = new Intent(getActivity(), MyMarketShopActivity.class); diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index d930f8c..de21d90 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -15,11 +15,11 @@ import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.cart.CartFragment; import com.sl.house_property.databinding.ActivityMainTabBinding; import com.sl.house_property.discovery.DiscoveryFragment; +import com.sl.house_property.discovery.LikeFragment; import java.util.ArrayList; import tools.Config; -import utils.UtilHelpers; public class MainTabActivity extends BaseActivity implements View.OnClickListener, MainFragment.OnFragmentInteractionListener, @@ -44,6 +44,7 @@ public class MainTabActivity extends BaseActivity private Main3Fragment fragment2; private CartFragment fragment3; private Main4Fragment fragment4; + private LikeFragment likeFragment; private Fragment currentFragment; private int myeditcode = 1000; @@ -51,7 +52,7 @@ public class MainTabActivity extends BaseActivity private int nowradioId; -// @Override + // @Override // public boolean dispatchTouchEvent(MotionEvent ev) { // switch (ev.getAction()) { // case MotionEvent.ACTION_DOWN: @@ -62,30 +63,36 @@ public class MainTabActivity extends BaseActivity // return super.dispatchTouchEvent(ev); // // } - public void visibilyBottom(int isVisibily){ + public void visibilyBottom(int isVisibily) { findViewById(R.id.rl_bottom).setVisibility(isVisibily); } + //2. 保存MyOnTouchListener接口的列表 private ArrayList onTouchListeners = new ArrayList(); + //1.触摸事件接口 public interface MyOnTouchListener { public boolean onTouch(MotionEvent ev); } + @Override public boolean dispatchTouchEvent(MotionEvent ev) { for (MyOnTouchListener listener : onTouchListeners) { - // listener.onTouch(ev); + // listener.onTouch(ev); } return super.dispatchTouchEvent(ev); } + //4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法 public void registerMyOnTouchListener(MyOnTouchListener myOnTouchListener) { onTouchListeners.add(myOnTouchListener); } + //5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法 public void unregisterMyOnTouchListener(MyOnTouchListener myOnTouchListener) { onTouchListeners.remove(myOnTouchListener); } + @Override protected int getLayoutResId() { @@ -194,6 +201,15 @@ public class MainTabActivity extends BaseActivity } currentFragment = fragment4; break; + case R.id.like: + if (likeFragment == null) { + likeFragment = LikeFragment.newInstance(); + fragmentTransaction.add(R.id.mycontent, likeFragment, "likeFragment"); + } else { + fragmentTransaction.show(likeFragment); + } + currentFragment = likeFragment; + break; } try { fragmentTransaction.commit(); diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java new file mode 100644 index 0000000..8142f4f --- /dev/null +++ b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java @@ -0,0 +1,92 @@ +package com.sl.house_property.discovery; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; +import android.view.LayoutInflater; + +import com.gyf.immersionbar.ImmersionBar; +import com.sl.house_property.BaseFragment; +import com.sl.house_property.R; +import com.sl.house_property.databinding.FragmentLikeBinding; + +import java.util.ArrayList; + +import entity.RegisterUser; +import tools.Config; + +public class LikeFragment extends BaseFragment { + private ArrayList fragments; + private String[] strings; + + public static LikeFragment newInstance() { + LikeFragment fragment = new LikeFragment(); + Bundle args = new Bundle(); + + fragment.setArguments(args); + return fragment; + } + + @Override + protected int getLayoutId() { + return R.layout.fragment_like; + } + + @Override + protected void loadData() { + + } + + class MyViewPagerAdapter extends FragmentPagerAdapter { + public MyViewPagerAdapter(FragmentManager fm) { + super(fm); + } + + @Override + public Fragment getItem(int position) { + return fragments.get(position); + } + + + @Override + public int getCount() { + return fragments.size(); + } + + @Override + public CharSequence getPageTitle(int position) { + return strings[position]; + + } + } + + @Override + protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) { + super.onCreateVew(inflater, savedInstanceState); + + ImmersionBar.with(this) + .keyboardEnable(true) //解决软键盘与底部输入框冲突问题 + // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE + // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 + .init(); + + strings = new String[2]; + strings[0] = "说说"; + strings[1] = "商品"; + fragments = new ArrayList<>(); + RegisterUser user = + Config.getInstance(getActivity()).getUser(); + String userId = ""; + if (user != null) { + userId = user.getUserid(); + } else { + userId = "0"; + } + fragments.add(HistoryRecordFragment.newInstance(1, userId)); + fragments.add(HistoryRecordFragment.newInstance(2, userId)); + MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); + mDataBinding.fl.setAdapter(myViewPagerAdapter); + mDataBinding.tb.setupWithViewPager(mDataBinding.fl); + } +} diff --git a/app/src/main/res/drawable/main_bottom_2.xml b/app/src/main/res/drawable/main_bottom_2.xml index 3f2cad3..01726a3 100644 --- a/app/src/main/res/drawable/main_bottom_2.xml +++ b/app/src/main/res/drawable/main_bottom_2.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/main_bottom_like.xml b/app/src/main/res/drawable/main_bottom_like.xml new file mode 100644 index 0000000..4717bb3 --- /dev/null +++ b/app/src/main/res/drawable/main_bottom_like.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index cdf39e0..05393d4 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -16,8 +16,7 @@ + android:layout_height="match_parent"> + android:orientation="vertical" + android:visibility="visible"> + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 6da1cd4..fed9d66 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -42,6 +42,7 @@ android:textSize="17sp" /> - - - - + + + + + + + + 2C8-?Wrcs#L2h zaUn>lZ2}gnR8(|87u7miCK>S;W?3f&bup!Oa=%w@rfEl;$-T*BbRu53d^hC#&Uv4E z&dK)^qQ@`xxPJUM09@WXBI#Fy4MQrUmi&fCPyN;l(V-skma2x+O~jrO@u@i;XR&mA zzQWW~NPcEXO&UnTmOI0MiOU5IG(?Lym^e~?Y(7G?tbv-JdE9{Q0Iv&#yZege59S+0 zWDy5BZwHC(6rN$R{7TOOD4$s^@nZ>tiDG$2?*aJP^@3gmaEic(4yXvKBxvKHtDt68 z*n%nx!@vI6!Fy#zsifKS;04V@r8)@@zN-jVX2*Il$t8i|rt%KVXc!E_- zEUfa_@R^2K#EL%ra;6_lq-u1jB(2|pDT7NvOpA5MG=Y?+ zfUk(MdFl5WBkd@Ul%9(O2=d-$3cKS1v@fPU4_ygM_CvK)081sDt3v}y8QCu|MW|m> zQ4a6L_4!K}j08|Fvqj{txddnzT7Kqc0q+5<#R1qVa_4*k2!WmNeF9)rBtT;#>sbK# znL&ZudKVy{-6d&DD}eJ+y0hI}o~eHz4E7bvL#^z^P9f#I-6A%(1ju`bC_LOP0D@1l zP>8$_|~^$ zU8#W}m)TEp-An*lvtqFpo%;;awxF{Gk+30AEQd?@8L#-iLcaHsfM;7qz#mA}G}*NX zBrmg*d~;-?I{pU>I6uNL37%PZ+9K85W&2EcnAPvBc0fX-G~Q z&Mq<}14E)_IJa=BO*q43pTV5Ll7?E?hIiupvo3uOoPpt;u$q%iU#Ug{G&VFne6W>S zF7RsrLsp1Bm6(HkX=ySt0@L@O0EQ*J`%jCU$)BjPSOB4cAnzSuI3v%qD>gu=TmCKA z1PJai;Pqx4j#w*)@oq5EkT&6PD?dpWeAgDhR61q9ntA2P_pMO6w;KS?_rg@Yueq&@ ze%b=iL)jZ-`l*#bLN~E6`r~XM2m^pPDV@+au#`0ZbLL_l|%y&D2ob&thqPY^5za zw)6uWW1;*&eLd8PGx^yQf^ProSdCd>^!iTh&GqoBLX zk!Q?th{aN&o8lX`8h+}ZWgoFvIyl`=#{hF7wiBEG19bA%x;f@gR((yOB@K5<00000 LNkvXXu0mjf9w9@% literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/gouwuche_no.png b/app/src/main/res/mipmap-xhdpi/gouwuche_no.png new file mode 100644 index 0000000000000000000000000000000000000000..95dd19f93292bfb931655a5260e3c749a17c7678 GIT binary patch literal 1192 zcmV;Z1XufsP)*elZ^ndzf2iR8@!tSYN__y}cL3)~rP2>Vh@U1WC;uoy@6g=b+|FjRd8vol^8mim zTA!{~tEaasOgMz*=jX3oUtix1U>7s*7D9w&m+9kD%4fGDMC=?;N<9bQH2^mOcu-3D z>2`xioW!o{Iz(h3UX)V4RYZV&MDztSPusTb6b``iyeVdW1HgGA`b=xRMnr1>R)r92 ztyZf+M2%{-`scp^mpFu!QWXGRN^|P~3|w@q8rTkW2pR-ISPCH;%gf7+#l^)SW$d2S z(f~*RE)gwht=}Y~2>=sBG_JKaWq1u>yi+E|yv)hppbebXI)ntUd2X(o&1R$BZZ{mq z*@$8!iYcY40A>wly+lc_4=e^3zuWu&+1FV$#62RU>far&;umDP_X#j_c3~(60!8m|UFWsMY zEcdG)1i^HzR$GdTmwE^(rH%kNkN|Lkh@Q?10KoH7%6IYtm<3QR@(^+X$RY!nJg8D+ z03X0BaR5rGCz$z;yyk$``n_7Mwvx*na9#H(5xv|Gz;T=%BO@bU6H)gPbW1GET(NE2 zr0{(|S>8f(0A7mgfti^ZldR>|1Lbo0tYujyOWitv@B7EJ*87V*2i^woLSX@-IRM~{ zlyc9O26v8)Q_lh4_YY~UO+Iu<2=Qp8QaP8SkAXt@zJHh2`da`$CT642imXd1Hb)uA zQT9fAJ58QU0}!sr0GtGHBY-=z>*d>mnSTLr!ff*-0z?a%?tLN0aRh*W9HXP7A_xM( z%tC7&meFDAcb`YsLqkJh9CNQ%+5KH~-kqr?0z?a%!ftFSrFH@M9>9{6GI3WT-@%d` zEwKl>*PrJ917<#z9QNweAflC203C>90QO%UYw1-|1DKHYdi{o0tMw2Oz1vGdYyA{6 zucnvpU(;-W2_fE((-|Hf{y7tX3Ff-)cQKjgCsN9X^8j#N_Y@I5(kIrYP9}ia+1Xo4 zrP8l)2FvC0ZBtWI7qSQbX5M4l_L;2!q|p&V+*7Gk z&SnDeJa2-Te@ifTy_B-opN6TK(&!M;PRp`ZGXWR}p67kU%#ZbPb5u$>mD*`c#W)=z zI%!$f;(_fKN-kgW|D27t1m(Dj*%KM@^0|9j2M$Zt@1I)Z(7CTbP z#XQYNv0T>;b<8z0e{S3M@ot@g0j`AEL1O+7FvwHOv&~;*6iqzy0lixQ0000M6wl literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/zan.png b/app/src/main/res/mipmap-xhdpi/zan.png new file mode 100644 index 0000000000000000000000000000000000000000..01350f54252c3025536cfdd16f030b06e62b64da GIT binary patch literal 1582 zcmV+}2GRM6P)#k7M_Xh*%IL;a(dOdD0 z#7$tms%{JjEH=jMEM8^Tb$6=jqM+_p5&5uEFT_fKnKuJi9T1phjM-NV&~cpQMD$Tm z_q2#SGS&!mgqu}FPFoz;b?a4iZvgr;5m`272r%>I0NMjU+eGB%QgC&3brVymRQMh^ zAR-rzB?2!4xYq(w)w?{;d#e;&Q&ZFUo}Qi)LH%(NIcH1|NT<__eBTc@?6G7rIkT;; z?axwh4Gj&`3x&cj!5;C9F+3&+F!Lb*Qv+bl#+Zi&1IEm00N(}oc8JK5|CE5;l)mq8 zC!(1FkdH-V`B0#kc>#c3!Trr5vL6pkj7$zQYCto81YHXzh7bAK2t z(`OqI%~93MirRDnctAuxDK{B2e+ppf2v_|t06*EqBcd(Fm@NYqHvGZN_6V?IgoE32 zP4lT!r=IWX>MDEQPp8u}eBT!Ul}4VeBC@jI^R~duHfHy~)`@7Psva&OW1nApR1R&A zs^0H;-dDpR9X$UjBC?-kp-@Nx=quYgTlRh5UdILXwmcbt-T3tYE(+&S)lHt~t?dgM z_RDdc2Z`vpzKSv@MP}XupfMO|p@_5$2YeiDnE4(6uNLjOdB&Jb9|2~z2}roQLjq%F z8$qlmtc@yxV4+_lqPuNbRo8i*_ex{}zVBb(-rl}Dj@2FR7$pn6K}24NOn`{4F~)?+ z%WyGN)Xs67jYPCQ@W36O=e-k|fT~{QdEU1bAsS)l;z+5gOFYlp5t#rH^=+aNVyLJ& zGk*=B$qwTC{@nKV_SVP*RP_qa^V%vxG{Vlz{4;&lx<4`jB1#)$%m^`5 z)SQ_$9H6$gHr3M7@^@qcs_J;27bY+j0UJ)|;7x8lVC|@g)Y?L10*OSTKAX+jGtj7* z>$**5*=Ael^F+Sb+YTBU$Rlv zCq2)5v?2lkE*6pSnLN|{72jv(w*mAieMHo+IYr(B`FwtQXJ@BPaz@39LTGO;mz&hx z-F>Q34@?u0-$nzy>$ZXn;|);sA`>8@ zDaM#T;sRN2oZ>SO5iK>wSf#tqA`{5x^OHI|JA0~4AP~cBus9FEk(!#C*_lk{Sj7Zt zYHB8AGMP|is~Qj2b(gBD6$7lDCdEYdKrWX%D~tqHL;r8O`z8_H8O(80sqzt-KzNv{ zCiwdL`kBdO(kdAfh-gqLGBN=XN!Zl1ngp161AyjWj%P%~3S$E-G64W@sH!2NwrZ#o zjg5_G_xARFY4eW0Xfs3tRf()pyb|_>W^)6p5w+y=`Anq|syKl!)`5odKonuC?9-#F zT}0Fc;2;ql^nL$;y#o0C43AwS5#4BW-u_ToCVlPKMn@tos_N}TWX~dV0bB{-IsoIV zu^+5TXpGr9)YzrsZn1DRSRebRMYD)JTXHkO%yU(BK7a-yasb$bV}Qav5`uvT-xHBR z|Meg6A}b!)aU47G0wOxUxZZA7BKjhm&04j1SmwI!WL2F8;DVyhlyaR_^$-!Y4>vHx g`Zw#aSjF7vA8*7LUW05t;s5{u07*qoM6N<$f=ZU`*8l(j literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/zan_p.png b/app/src/main/res/mipmap-xhdpi/zan_p.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d31ef99efdd9f51f527fed4c084c5c875867ec GIT binary patch literal 1625 zcmV-f2B!ImP)H_fPi2d%1aFdmfpEbXdzeyvxp?5geK5C7s3Y+LWD>{Y$Eyr0wsvX zYDi2(0t7^f?YeWT<;?~q=_UvygbmByxrH`ZjADxv6w2Ga&3VX7=dQEcz1!`bdzbZm zxi>Rs&Ut?SbI$+Fd4~8uFYJ_l`QD|FP65n5xC^#(^T4~E=&K_D^1VL`xOj@-EnF~s zJ%9Jc{&s@29YAI8P7xcX7pdpyMAxwQ^}n|ZqOAb(i%SLWZHSY!9^la=t^#mIdVRnI z;W_gY;L7f=%GwuWaReS?5MC4iSEcxMiQ51idEg#zWKess9T4pufpW^sJzZlKa9sR>ME!9fh_6L}l+`64xgJEl=f^ z+U~5talg3MfR88B3b@A!!rSK+fc3rC8;jKh;X%RCx>A>nUQ0#)$pqo0^9DdydS}XF zN4kKwG6*l9Do$(9I8qDU#y+su1mOwu1|X_<_fhz6EXYFF6@vPs2Lbr2j}SimB)z`h z1mPFw1%S%k7m2p9U_ankVL7)BzJD;lS<8gztu#y38PvRa0bqUa9RSCt*=HmBYCoJ# z*vLAs+ckJKz4wd>!b?6^fRS~jF4x#?0GFq8|49bn+Ge80%3hB{Y)`Y$!%h(1&~^Zo zy(=tnDul(^#tpd##O_9Jk1F0R6n@dDLvRnk^BD}i*-TXAd$$qzQ34>`1#;NP4#RLb zl7<0(>QJ8m=2Jw`d$5In@sC6C=r%2rQe8F;HhY4=R)8x6ot~+)lfw5|4WF8+Gx^@r z0@fU6)ISFB4*xL<9`Cpt;f(x@n|IClzOO5~Pn2Ur0QoWx z5tzQP^1qRfhtu~i7cjA{Q>=_b`zB2xpohernQJeT`X2l0&(8*0Wv>T>8mGcKY|`~g8Gf=x&u@${y^kU)AZK#P0{+^ z%K%oz^&;Uyw;J}(MtnQ!sN&ru;r`5;JBLASAell@+1t>F?o7h0@5LFU=kowa`t*wr z5d2OOXz6BF>%YnYV87v3cRbgQ=+3r{Y@kWp%D(XDEdvnz8iQJLc$upbm5cY1Tp#ym zrE3e-`fqap=sX7Xm*z@*B07^PNnOIe`ZGBIm@J~X1d#8&AYgT}2CQAlEjwPx0id%P z)CcDh!1~@l0i2isIPNm`zOp9=0J|B~YI6*ri8Q+JIG6qX<2e9SWKd5IFmqAToje|a zxV&eA@VI0oTHOamVY(ItLp$d}eB8&FUs~-zFQomwW`b}CWVgjqv4~t?TwLqBT&FnZVvxF%l>m!lV2(c8cG}4Zi4We6X~?o zEX2a-@rOFZ%?|_{7c+I}M-%W>}moz69W1V&Q2F20q9SFuZUvpB!koY#rlJrL;!U)9Lg%$ckxw z1U?#G)W`%KQ=gpIi@z55?PR(LmrZp(S_ep9raCJAs;=dV3bB*1nBcTlWa|JyXqY60 z&XvgbZY8iWjsA~W4R4#;Tk8PABY