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" /> - - - - + + + + + + + +