From edcc6a060d27f44ae143b434aa3d052d9c582f98 Mon Sep 17 00:00:00 2001 From: jinyuera <454386664@qq.com> Date: Mon, 1 Mar 2021 18:15:05 +0800 Subject: [PATCH] 1111 --- app/src/main/AndroidManifest.xml | 1 + .../com/sl/house_property/Main4Fragment.java | 9 ++++- .../discovery/HistoryRecordFragment.java | 7 ++++ .../discovery/LikeActivity.java | 37 +++++++++++++++++++ .../discovery/LikeFragment.java | 7 ++++ .../user/MyAuthorizedFamilyHistory.java | 2 +- app/src/main/res/layout/activity_like.xml | 9 +++++ app/src/main/res/layout/fragment_like.xml | 13 ++++++- 8 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/discovery/LikeActivity.java create mode 100644 app/src/main/res/layout/activity_like.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b978ce8..b65e589 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -283,6 +283,7 @@ android:launchMode="singleTop" android:theme="@style/wxPayTheme" android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> + \ No newline at end of file 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 77b9e3d..ee2ad87 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -20,6 +20,7 @@ import com.cutil.SizeUtils; import com.cutil.StringUtils; import com.sl.house_property.cart.AddressListActivity; import com.sl.house_property.databinding.FragmentMain4Binding; +import com.sl.house_property.discovery.LikeActivity; import com.sl.house_property.f1.UserdlistActivity; import com.sl.house_property.order.OrderActivity; import com.sl.house_property.user.MyAuthorizedFamilyHistory; @@ -213,7 +214,13 @@ public class Main4Fragment extends BaseFragment implements } }); - + mDataBinding.ll1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(getActivity(), LikeActivity.class); + startActivityForResult(intent, 0); + } + }); // mDataBinding.llGeren.setOnClickListener(new View.OnClickListener() { // @Override // public void onClick(View v) { diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java index 2827a3d..a1da699 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java @@ -107,6 +107,8 @@ public class HistoryRecordFragment extends BaseFragment { + @Override + protected int getLayoutResId() { + return R.layout.activity_like; + } + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Fragment likeFragment = LikeFragment.newInstance(); + getSupportFragmentManager().beginTransaction().replace(R.id.fl,likeFragment).commitAllowingStateLoss(); + } + //2. 保存MyOnTouchListener接口的列表 + private ArrayList onTouchListeners = new ArrayList(); + //4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法 + public void registerMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) { + onTouchListeners.add(myOnTouchListener); + } + + //5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法 + public void unregisterMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) { + onTouchListeners.remove(myOnTouchListener); + } +} 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 index 186180e..520912c 100644 --- a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java @@ -5,6 +5,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.view.LayoutInflater; +import android.view.View; import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.BaseFragment; @@ -92,5 +93,11 @@ public class LikeFragment extends BaseFragment { MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.tb.setupWithViewPager(mDataBinding.fl); + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + getActivity().finish(); + } + }); } } diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java index 3f61912..1f467d0 100644 --- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java +++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java @@ -137,7 +137,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_like.xml b/app/src/main/res/layout/fragment_like.xml index 1555089..352f162 100644 --- a/app/src/main/res/layout/fragment_like.xml +++ b/app/src/main/res/layout/fragment_like.xml @@ -13,7 +13,18 @@ android:layout_height="45dp" android:layout_marginTop="@dimen/mystatusbar" android:orientation="horizontal"> - +