diff --git a/app/src/main/java/com/shunzhi/parent/api/Consult.java b/app/src/main/java/com/shunzhi/parent/api/Consult.java index ab4cbca..4d13bc1 100644 --- a/app/src/main/java/com/shunzhi/parent/api/Consult.java +++ b/app/src/main/java/com/shunzhi/parent/api/Consult.java @@ -15,4 +15,6 @@ public interface Consult { @GET("api/ParentService/GetAds") Observable getBanners(@Query("position") String position); + + Observable getConsultContent(); } diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java index f87f1db..4381ca6 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java @@ -22,18 +22,26 @@ public interface ConsultOneContract { public abstract void getTools(LinearLayout linearLayout); public abstract void getBanners(String position); + + public abstract void getConsultContent(); } interface IConsultOneModel extends IBaseModel{ void getTools(); Observable getBanners(String position); + + Observable getConsultContent(); } interface IConsultOneView extends IBaseFragment{ void showTools(); void showBanners(List guangGaoBeanList); + + void showConsultContent(); + + } } diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java index 42ca7bc..de5b676 100644 --- a/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java +++ b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java @@ -31,4 +31,10 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL) .getBanners(position).compose(RxHelper.rxSchedulerHelper()); } + + @Override + public Observable getConsultContent() { + return RetrofitCreateHelper.getInstance().createApi(Consult.class,AppConfig.BASE_URL) + .getConsultContent().compose(RxHelper.rxSchedulerHelper()); + } } diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java index 3053259..1d7e686 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java @@ -79,6 +79,11 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ } @Override + public void getConsultContent() { + + } + + @Override public ConsultOneContract.IConsultOneModel getModel() { return ConsultOneModel.newInstance(); } 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 ad19f38..0521680 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 @@ -30,13 +30,6 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi EditText et_search; - TextView tvContentName; - - RecyclerView recyclerView; - - MyConsultAdapter myConsultAdapter = null; - - List myConsultBeanList = new ArrayList<>(); @Override protected void initView(Bundle savedInstanceState) { @@ -59,28 +52,8 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi ivSearch = findViewById(R.id.ivSearch); ivSearch.setOnClickListener(this); - tvContentName = findViewById(R.id.tvContentName); - tvContentName.setText(""); - - recyclerView = findViewById(R.id.recyclerView); - - initRecyclerView(); } - private void initRecyclerView() { - - if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(this); - for (int i = 0; i < 12; i++) { - MyConsultBean myConsultBean = new MyConsultBean(); - myConsultBean.consultCounts = i + ""; - myConsultBean.consultContent = "咨询内容" + i; - myConsultBean.consultTitle = "咨询标题" + i; - myConsultBean.consultZhuanfaCounts = "转发:" + i; - myConsultBeanList.add(myConsultBean); - } - myConsultAdapter.addAll(myConsultBeanList); - recyclerView.setAdapter(myConsultAdapter); - } @NonNull @Override diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java new file mode 100644 index 0000000..b515c3d --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java @@ -0,0 +1,94 @@ +package com.shunzhi.parent.ui.fragment.consult; + +import android.content.Context; +import android.net.Uri; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; +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.contract.consult.consultone.ConsultOneContract; +import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter; + +import java.util.ArrayList; +import java.util.List; + +/** + */ +public class ConsultTwoLevelFragment extends BaseMVPCompatFragment implements ConsultOneContract.IConsultOneView { + + + TextView tvContentName; + + RecyclerView recyclerView; + + MyConsultAdapter myConsultAdapter = null; + + List myConsultBeanList = new ArrayList<>(); + + @Override + public int getLayoutId() { + return R.layout.fragment_consult_two_level; + } + + @Override + public void initUI(View view, @Nullable Bundle savedInstanceState) { + tvContentName = view.findViewById(R.id.tvContentName); + tvContentName.setText(""); + + recyclerView = view.findViewById(R.id.recyclerView); + + initRecyclerView(); + } + + private void initRecyclerView() { + + if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity()); + for (int i = 0; i < 12; i++) { + MyConsultBean myConsultBean = new MyConsultBean(); + myConsultBean.consultCounts = i + ""; + myConsultBean.consultContent = "咨询内容" + i; + myConsultBean.consultTitle = "咨询标题" + i; + myConsultBean.consultZhuanfaCounts = "转发:" + i; + myConsultBeanList.add(myConsultBean); + } + myConsultAdapter.addAll(myConsultBeanList); + recyclerView.setAdapter(myConsultAdapter); + } + + @NonNull + @Override + public BasePresenter initPresenter() { + return new ConsultOnePresenter(); + } + + @Override + public void showTools() { + + } + + @Override + public void showBanners(List guangGaoBeanList) { + + } + + /** + * 显示咨询内容 + */ + @Override + public void showConsultContent() { + + } +} diff --git a/app/src/main/res/layout/activity_consult_two_level.xml b/app/src/main/res/layout/activity_consult_two_level.xml index f7ca574..a6e398b 100644 --- a/app/src/main/res/layout/activity_consult_two_level.xml +++ b/app/src/main/res/layout/activity_consult_two_level.xml @@ -9,23 +9,5 @@ tools:context="com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity"> - - - diff --git a/app/src/main/res/layout/fragment_consult_two_level.xml b/app/src/main/res/layout/fragment_consult_two_level.xml new file mode 100644 index 0000000..653f915 --- /dev/null +++ b/app/src/main/res/layout/fragment_consult_two_level.xml @@ -0,0 +1,28 @@ + + + + + + + + -- libgit2 0.21.0