From fcf262d4382c368c2d3e5f2fbafbf2c52421bd04 Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Tue, 25 Aug 2020 15:39:59 +0800 Subject: [PATCH] d --- .../seven/main/activity/MainActivity.java | 1 - .../fenghoo/seven/main/find/FindFragment.java | 28 ++------------- .../seven/main/find/PriLetFragment.java | 10 +++--- .../seven/main/find/ui/FindFragmenttwo.java | 8 +++-- .../main/find/ui/PrivateletterFragment.java | 6 ++-- app/src/main/res/layout/criclefragment.xml | 34 +++---------------- app/src/main/res/layout/findfragment.xml | 34 ++++++++++++++++--- 7 files changed, 51 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java index 9732897..2ec0116 100644 --- a/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/MainActivity.java @@ -178,7 +178,6 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{ mTvMap.setTextColor(getResources().getColor(R.color.colorhui)); mTvMy.setTextColor(getResources().getColor(R.color.colorhui)); - hideFragment(mHomeFragment, fragmentTransaction); hideFragment(mSendFragment, fragmentTransaction); hideFragment(traceFragment, fragmentTransaction); diff --git a/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java index a4a0879..18f66dc 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/FindFragment.java @@ -13,24 +13,14 @@ import com.fenghoo.seven.R; import com.fenghoo.seven.main.find.ui.FindFragmenttwo; import com.fenghoo.seven.main.kehu.activity.ShowAty; import com.fenghoo.seven.test.BaseFragment; -import com.zaaach.citypicker.model.HotCity; - -import java.util.ArrayList; -import java.util.List; /** * 发现 */ public class FindFragment extends BaseFragment { - private int anim; - private boolean enable; - private List hotCities; - private String city; - private String province; - private String adCode; Context mContext; View view; - private RelativeLayout rl_privateletter; + private RelativeLayout rl_live; private String pagetype="0";//0是家居 1是私信 private RelativeLayout dianpubuju; private LinearLayout dianyuanbuju; @@ -54,24 +44,15 @@ public class FindFragment extends BaseFragment { view = inflater.inflate(R.layout.criclefragment, container, false); getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.container,new FindFragmenttwo()).commit(); initView(view); - HotCity(); return view; } - private void HotCity() { - hotCities = new ArrayList<>(); - hotCities.add(new HotCity("北京", "北京", "101010100")); - hotCities.add(new HotCity("上海", "上海", "101020100")); - hotCities.add(new HotCity("广州", "广东", "101280101")); - hotCities.add(new HotCity("深圳", "广东", "101280601")); - hotCities.add(new HotCity("杭州", "浙江", "101210101")); - } private void initView(View mContentView) { marking_fragment = (TextView)view.findViewById(R.id.marking_fragment); dianpubuju = (RelativeLayout)view.findViewById(R.id.dianpubuju); dianyuanbuju = (LinearLayout)view.findViewById(R.id.dianyuanbuju); - rl_privateletter = (RelativeLayout)view.findViewById(R.id.rl_privateletter); - rl_privateletter.setOnClickListener(new View.OnClickListener() { + rl_live = (RelativeLayout)view.findViewById(R.id.rl_live); + rl_live.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if(pagetype.equals("0")){ @@ -103,10 +84,7 @@ public class FindFragment extends BaseFragment { public void onClick(View view) { // ShowAty.CloundSolutionActivity(getActivity()); ShowAty.MainActivitytwot(getActivity()); - - } }); } - } \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java index 16335a2..bbcd66e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java @@ -8,17 +8,17 @@ import android.view.ViewGroup; import android.widget.RelativeLayout; import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseFragment; import com.fenghoo.seven.main.find.ui.PrivateletterFragment; -import com.fenghoo.seven.test.BaseFragment; /** - * 私信 + * 视频评论（页面） */ public class PriLetFragment extends BaseFragment { Context mContext; View view; - private RelativeLayout rl_live; + private RelativeLayout rl_privateletter; @Override @@ -43,7 +43,7 @@ public class PriLetFragment extends BaseFragment { } private void initView(View mContentView) { - rl_live = (RelativeLayout)view.findViewById(R.id.rl_live); + rl_privateletter = (RelativeLayout)view.findViewById(R.id.rl_privateletter); } @@ -52,7 +52,7 @@ public class PriLetFragment extends BaseFragment { } public void cutover(final ClickCallback callback) { - rl_live.setOnClickListener(new View.OnClickListener() { + rl_privateletter.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { callback.onsuccess(); diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java index 31ef9b0..d3e9b6d 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java @@ -19,6 +19,9 @@ import java.util.List; import androidx.recyclerview.widget.LinearLayoutManager; +/** + * 私信页面 + */ public class FindFragmenttwo extends MobanFragment { @@ -70,8 +73,9 @@ public class FindFragmenttwo extends MobanFragment { @Override public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) { - //进入查看评论 - ShowAty.CommentActivity(getActivity(),20); + + //进入回话页 + ShowAty.ConversationActivity(getActivity()); } }); } diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java index 3e55ad0..bda11b6 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java @@ -20,7 +20,7 @@ import java.util.List; import androidx.recyclerview.widget.LinearLayoutManager; /** - * 私信 + * 视频评论（列表） */ public class PrivateletterFragment extends MobanFragment { @@ -72,8 +72,8 @@ public class PrivateletterFragment extends MobanFragment { @Override public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) { - //进入回话页 - ShowAty.ConversationActivity(getActivity()); + //进入查看评论 + ShowAty.CommentActivity(getActivity(),20); } }); } diff --git a/app/src/main/res/layout/criclefragment.xml b/app/src/main/res/layout/criclefragment.xml index 4642944..f2dc2d9 100644 --- a/app/src/main/res/layout/criclefragment.xml +++ b/app/src/main/res/layout/criclefragment.xml @@ -14,36 +14,24 @@ android:layout_height="48dp" android:background="@color/colorWhite"> - + android:layout_marginRight="18dp" + android:layout_centerVertical="true"> + android:src="@mipmap/icon_live" /> - - - + + + android:layout_centerVertical="true" + android:layout_marginRight="18dp"> + android:src="@mipmap/icon_watch_k" /> + +