diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 295a4e8..8bca9be 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -3,18 +3,17 @@ package com.shunzhi.parent; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.util.Log; import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; import com.amap.api.location.AMapLocationClientOption; +import com.amap.api.location.AMapLocationClientOption.AMapLocationMode; import com.amap.api.location.AMapLocationListener; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.SDKOptions; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.auth.LoginInfo; import com.share.mvpsdk.global.GlobalApplication; -import com.amap.api.location.AMapLocationClientOption.AMapLocationMode; /** * Created by Administrator on 2018/3/7 0007. @@ -137,7 +136,8 @@ public class AppContext extends GlobalApplication { sendBroadcast(intent); stopLocation(); } else { - cityName = "定位失败"; + cityName = "定位失败";district="定位失败"; + // Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo()); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java index 7029743..ecec514 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java @@ -2,22 +2,19 @@ package com.shunzhi.parent.ui.activity.consult; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; +import android.support.annotation.NonNull; +import android.support.v4.app.FragmentTransaction; import android.view.View; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; +import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.R; -import com.shunzhi.parent.adapter.MyConsultAdapter; -import com.shunzhi.parent.bean.MyConsultBean; - -import java.util.ArrayList; -import java.util.List; +import com.shunzhi.parent.ui.fragment.consult.ConsultTwoLevelFragment; public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements View.OnClickListener { @@ -32,6 +29,13 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi EditText et_search; String channel; + + FrameLayout frame_consult; + + ConsultTwoLevelFragment consultTwoLevelFragment; + + FragmentTransaction fragmentTransaction=null; + @Override protected void initView(Bundle savedInstanceState) { initViews(); @@ -45,13 +49,22 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi private void initViews() { channel=getIntent().getStringExtra("channel"); - ivBack = findViewById(R.id.ivBack); - ivBack.setOnClickListener(this); - - et_search = findViewById(R.id.et_search); + consultTwoLevelFragment=new ConsultTwoLevelFragment(); + et_search=findViewById(R.id.et_search); + ivSearch=findViewById(R.id.ivSearch); + ivBack=findViewById(R.id.ivBack); + frame_consult=findViewById(R.id.frame_consult); - ivSearch = findViewById(R.id.ivSearch); ivSearch.setOnClickListener(this); + ivBack.setOnClickListener(this); + + Bundle bundle=new Bundle(); + bundle.putString("channel",channel); + consultTwoLevelFragment.setArguments(bundle); + ToastUtils.showToast("channel="+channel); + fragmentTransaction=getSupportFragmentManager().beginTransaction(); + fragmentTransaction.add(R.id.frame_consult,consultTwoLevelFragment) + .show(consultTwoLevelFragment).commit(); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index d420a8c..f9025f2 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -8,13 +8,14 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import com.bumptech.glide.Glide; +import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.shunzhi.parent.AppConfig; @@ -46,7 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment list) { - for (int i = 0; i < list.size(); i++) { - TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity()); - textAndImgShowView.setTextColor(R.color.textColor); - textAndImgShowView.setText(list.get(i).getChannelName()); + if (first) { + layout_control.removeAllViews(); + for (int i = 0; i < list.size(); i++) { + TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity()); + textAndImgShowView.setTextColor(R.color.textColor); + textAndImgShowView.setText(list.get(i).getChannelName()); // textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage())); - textAndImgShowView.addImgs(list.get(i).getChannelImage()); - textAndImgShowView.setSelect(true); - textAndImgShowView.setWidth(getActivity(), layout_control); - textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0)); - textAndImgShowView.setTag(list.get(i)); - textAndImgShowView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - ChannelBean channelBean= (ChannelBean) view.getTag(); - ConsultOneLevelActivity.getInstance(getActivity(),channelBean.getId()+""); - } - }); - layout_control.addView(textAndImgShowView); + textAndImgShowView.addImgs(list.get(i).getChannelImage()); + textAndImgShowView.setSelect(true); + textAndImgShowView.setWidth(getActivity(), layout_control); + textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0)); + textAndImgShowView.setTag(list.get(i)); + textAndImgShowView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ChannelBean channelBean = (ChannelBean) view.getTag(); + ConsultOneLevelActivity.getInstance(getActivity(), channelBean.getId() + ""); + } + }); + layout_control.addView(textAndImgShowView); + } + first = false; } - - } @Override public void showContext(List list) { - contextList.clear(); + Log.e("aaaadxasdas-===", "111111"); contextList.addAll(list); - contextAdapter.addAll(contextList); - recycler_context.setAdapter(contextAdapter); - - + if (contextAdapter == null) { + contextAdapter = new ContextAdapter(getActivity()); + contextAdapter.addAll(contextList); + recycler_context.setAdapter(contextAdapter); + } else { + contextAdapter.addAll(contextList); + contextAdapter.notifyDataSetChanged(); + } } @Override public void getCity(String name) { + first=true; tvLocalAddress.setText(name.split(" ")[1]); mPresenter.getBanners("2", name.split(" ")[2]); mPresenter.getContextChannel(name.split(" ")[2], 0, 1, 1); - AppContext.getInstance().cityName=name.split(" ")[1]; - AppContext.getInstance().district=name.split(" ")[2]; + AppContext.getInstance().cityName = name.split(" ")[1]; + AppContext.getInstance().district = name.split(" ")[2]; } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java index ded049d..e137bf4 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java @@ -5,7 +5,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,6 +14,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.bumptech.glide.Glide; +import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; @@ -26,22 +26,22 @@ import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.adapter.MyConsultAdapter; import com.shunzhi.parent.bean.GuangGaoBean; -import com.shunzhi.parent.bean.MyConsultBean; import com.shunzhi.parent.bean.channel.ChannelBean; import com.shunzhi.parent.bean.channel.ChannelContextBean; import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract; import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter; -import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity; import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity; import com.shunzhi.parent.util.AttrsUtils; import com.shunzhi.parent.views.TextAndImgShowView; +import java.util.ArrayList; import java.util.List; public class ConsultOneLevelFragment extends BaseMVPCompatFragment implements View.OnClickListener, ConsultOneContract.IConsultOneView { - RecyclerView recyclerViewGrally, recyclerViewConsultOne; + RecyclerView recyclerViewGrally; + XRecyclerView recyclerViewConsultOne; MyGrallyAdapter myGrallyAdapter = null; @@ -49,9 +49,11 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment myConsultBeanList = null; + List myConsultBeanList = new ArrayList<>(); + boolean first=true; - String channel=""; + String channel = ""; + int pageIndex; @Override public int getLayoutId() { @@ -60,7 +62,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment guangGaoBeanList) { @@ -83,16 +85,37 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment list) { - if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity()); - myConsultAdapter.addAll(list); - recyclerViewConsultOne.setAdapter(myConsultAdapter); + myConsultBeanList.addAll(list); + if (myConsultAdapter == null) { + myConsultAdapter = new MyConsultAdapter(getActivity()); + myConsultAdapter.addAll(myConsultBeanList); + recyclerViewConsultOne.setAdapter(myConsultAdapter); + } else { + myConsultAdapter.addAll(myConsultBeanList); + myConsultAdapter.notifyDataSetChanged(); + } +// if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity()); +// myConsultAdapter.addAll(list); +// recyclerViewConsultOne.setAdapter(myConsultAdapter); } @Override public void showChannel(List list) { - for (int i = 0; i < list.size(); i++) { - TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity()); - textAndImgShowView.setTextColor(R.color.textColor); - textAndImgShowView.setText(list.get(i).getChannelName()); + if(first) { + for (int i = 0; i < list.size(); i++) { + TextAndImgShowView textAndImgShowView = new TextAndImgShowView(getActivity()); + textAndImgShowView.setTextColor(R.color.textColor); + textAndImgShowView.setText(list.get(i).getChannelName()); // textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(list.get(i).getChannelImage())); - textAndImgShowView.addImgs(list.get(i).getChannelImage()); - textAndImgShowView.setSelect(true); - textAndImgShowView.setWidth(getActivity(), layout_control); - textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0)); - textAndImgShowView.setTag(list.get(i)); - textAndImgShowView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - ChannelBean channelBean= (ChannelBean) view.getTag(); - ConsultTwoLevelActivity.getInstance(getActivity(),channelBean.getId()+""); - } - }); - layout_control.addView(textAndImgShowView); + textAndImgShowView.addImgs(list.get(i).getChannelImage()); + textAndImgShowView.setSelect(true); + textAndImgShowView.setWidth(getActivity(), layout_control); + textAndImgShowView.setBackground(AttrsUtils.getAttrs(getActivity()).getDrawable(0)); + textAndImgShowView.setTag(list.get(i)); + textAndImgShowView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ChannelBean channelBean = (ChannelBean) view.getTag(); + ConsultTwoLevelActivity.getInstance(getActivity(), channelBean.getId() + ""); + } + }); + layout_control.addView(textAndImgShowView); + } + first=false; } } @@ -199,8 +234,8 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment myConsultBeanList = new ArrayList<>(); + List myConsultBeanList = new ArrayList<>(); + + int pageIndex = 1; + String channel; @Override public int getLayoutId() { @@ -44,8 +48,30 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment list) { - + myConsultBeanList.addAll(list); + if (myConsultAdapter == null) { + myConsultAdapter = new MyConsultAdapter(getActivity()); + myConsultAdapter.addAll(myConsultBeanList); + recyclerView.setAdapter(myConsultAdapter); + } else { + myConsultAdapter.addAll(myConsultBeanList); + myConsultAdapter.notifyDataSetChanged(); + } } @Override @@ -92,5 +126,4 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment - + diff --git a/app/src/main/res/layout/fragment_consult_one_level.xml b/app/src/main/res/layout/fragment_consult_one_level.xml index 179da56..ae0649b 100644 --- a/app/src/main/res/layout/fragment_consult_one_level.xml +++ b/app/src/main/res/layout/fragment_consult_one_level.xml @@ -19,12 +19,12 @@ - + > diff --git a/app/src/main/res/layout/fragment_consult_two_level.xml b/app/src/main/res/layout/fragment_consult_two_level.xml index ae38f37..c0309df 100644 --- a/app/src/main/res/layout/fragment_consult_two_level.xml +++ b/app/src/main/res/layout/fragment_consult_two_level.xml @@ -17,12 +17,14 @@ android:paddingBottom="@dimen/size_dp_5" /> - + android:layout_height="match_parent"> + + diff --git a/app/src/main/res/layout/fragment_zi_xun.xml b/app/src/main/res/layout/fragment_zi_xun.xml index 40308c0..154229b 100644 --- a/app/src/main/res/layout/fragment_zi_xun.xml +++ b/app/src/main/res/layout/fragment_zi_xun.xml @@ -14,23 +14,17 @@ android:layout_height="0dp" android:layout_weight="2"> - - + - - + + @@ -63,7 +58,8 @@ + android:layout_height="match_parent" + >