陶汉栋 / ParentWork

Download as
Browse Code »

Commit c94267215cd0d5b2adc02b8b4b84c489a65143ad

Authored by 姚旭斌
2 parents f307b0dd 0a469ad2
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' into yxb_dev 

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
Showing 10 changed files with 145 additions and 48 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/AppConfig.java
  Diff comments   View file @c942672
@@ -33,7 +33,7 @@ public class AppConfig { @@ -33,7 +33,7 @@ public class AppConfig {
33 //http://campus.myjxt.com/ 33 //http://campus.myjxt.com/
34 public static String BASE_URL="http://60.190.202.57:1000/"; 34 public static String BASE_URL="http://60.190.202.57:1000/";
35 public static String BASE_URL_IMG="http://60.190.202.57:1000"; 35 public static String BASE_URL_IMG="http://60.190.202.57:1000";
36 - public static String WAP_URL="http://60.190.202.57:8101/"; 36 + public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
37 37
38 38
39 39
app/src/main/java/com/shunzhi/parent/api/Consult.java
  Diff comments   View file @c942672
@@ -15,4 +15,6 @@ public interface Consult { @@ -15,4 +15,6 @@ public interface Consult {
15 @GET("api/ParentService/GetAds") 15 @GET("api/ParentService/GetAds")
16 Observable<JsonObject> getBanners(@Query("position") String position); 16 Observable<JsonObject> getBanners(@Query("position") String position);
17 17
  18 +
  19 + Observable<JsonObject> getConsultContent();
18 } 20 }
app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java
  Diff comments   View file @c942672
@@ -22,18 +22,26 @@ public interface ConsultOneContract { @@ -22,18 +22,26 @@ public interface ConsultOneContract {
22 public abstract void getTools(LinearLayout linearLayout); 22 public abstract void getTools(LinearLayout linearLayout);
23 23
24 public abstract void getBanners(String position); 24 public abstract void getBanners(String position);
  25 +
  26 + public abstract void getConsultContent();
25 } 27 }
26 28
27 interface IConsultOneModel extends IBaseModel{ 29 interface IConsultOneModel extends IBaseModel{
28 void getTools(); 30 void getTools();
29 31
30 Observable<JsonObject> getBanners(String position); 32 Observable<JsonObject> getBanners(String position);
  33 +
  34 + Observable<JsonObject> getConsultContent();
31 } 35 }
32 36
33 interface IConsultOneView extends IBaseFragment{ 37 interface IConsultOneView extends IBaseFragment{
34 void showTools(); 38 void showTools();
35 39
36 void showBanners(List<GuangGaoBean> guangGaoBeanList); 40 void showBanners(List<GuangGaoBean> guangGaoBeanList);
  41 +
  42 + void showConsultContent();
  43 +
  44 +
37 } 45 }
38 46
39 } 47 }
app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
  Diff comments   View file @c942672
@@ -31,4 +31,10 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo @@ -31,4 +31,10 @@ public class ConsultOneModel extends BaseModel implements ConsultOneContract.ICo
31 return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL) 31 return RetrofitCreateHelper.getInstance().createApi(Consult.class, AppConfig.BASE_URL)
32 .getBanners(position).compose(RxHelper.<JsonObject>rxSchedulerHelper()); 32 .getBanners(position).compose(RxHelper.<JsonObject>rxSchedulerHelper());
33 } 33 }
  34 +
  35 + @Override
  36 + public Observable<JsonObject> getConsultContent() {
  37 + return RetrofitCreateHelper.getInstance().createApi(Consult.class,AppConfig.BASE_URL)
  38 + .getConsultContent().compose(RxHelper.<JsonObject>rxSchedulerHelper());
  39 + }
34 } 40 }
app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java
  Diff comments   View file @c942672
@@ -79,6 +79,11 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ @@ -79,6 +79,11 @@ public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{
79 } 79 }
80 80
81 @Override 81 @Override
  82 + public void getConsultContent() {
  83 +
  84 + }
  85 +
  86 + @Override
82 public ConsultOneContract.IConsultOneModel getModel() { 87 public ConsultOneContract.IConsultOneModel getModel() {
83 return ConsultOneModel.newInstance(); 88 return ConsultOneModel.newInstance();
84 } 89 }
app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
  Diff comments   View file @c942672
@@ -30,13 +30,6 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi @@ -30,13 +30,6 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
30 30
31 EditText et_search; 31 EditText et_search;
32 32
33 - TextView tvContentName;  
34 -  
35 - RecyclerView recyclerView;  
36 -  
37 - MyConsultAdapter myConsultAdapter = null;  
38 -  
39 - List<MyConsultBean> myConsultBeanList = new ArrayList<>();  
40 33
41 @Override 34 @Override
42 protected void initView(Bundle savedInstanceState) { 35 protected void initView(Bundle savedInstanceState) {
@@ -59,28 +52,8 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi @@ -59,28 +52,8 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
59 ivSearch = findViewById(R.id.ivSearch); 52 ivSearch = findViewById(R.id.ivSearch);
60 ivSearch.setOnClickListener(this); 53 ivSearch.setOnClickListener(this);
61 54
62 - tvContentName = findViewById(R.id.tvContentName);  
63 - tvContentName.setText("");  
64 -  
65 - recyclerView = findViewById(R.id.recyclerView);  
66 -  
67 - initRecyclerView();  
68 } 55 }
69 56
70 - private void initRecyclerView() {  
71 -  
72 - if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(this);  
73 - for (int i = 0; i < 12; i++) {  
74 - MyConsultBean myConsultBean = new MyConsultBean();  
75 - myConsultBean.consultCounts = i + "";  
76 - myConsultBean.consultContent = "咨询内容" + i;  
77 - myConsultBean.consultTitle = "咨询标题" + i;  
78 - myConsultBean.consultZhuanfaCounts = "转发:" + i;  
79 - myConsultBeanList.add(myConsultBean);  
80 - }  
81 - myConsultAdapter.addAll(myConsultBeanList);  
82 - recyclerView.setAdapter(myConsultAdapter);  
83 - }  
84 57
85 @NonNull 58 @NonNull
86 @Override 59 @Override
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  Diff comments   View file @c942672
@@ -89,9 +89,8 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract @@ -89,9 +89,8 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
89 break; 89 break;
90 case R.id.layout_order: 90 case R.id.layout_order:
91 Bundle bundle=new Bundle(); 91 Bundle bundle=new Bundle();
92 - bundle.putString("url",AppConfig.WAP_URL+"ParentOrderCenter.aspx?userid="+ 92 + bundle.putString("url",AppConfig.BASE_URL_ORDER+"ParentOrderCenter.aspx?userid="+
93 AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID)); 93 AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
94 - bundle.putInt("type",AppConfig.ORDER_CENTER);  
95 startNewActivity(WebViewActivity.class,bundle); 94 startNewActivity(WebViewActivity.class,bundle);
96 break; 95 break;
97 default: 96 default:
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java 0 → 100644
  Diff comments   View file @c942672
@@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
  1 +package com.shunzhi.parent.ui.fragment.consult;
  2 +
  3 +import android.content.Context;
  4 +import android.net.Uri;
  5 +import android.os.Bundle;
  6 +import android.support.annotation.NonNull;
  7 +import android.support.annotation.Nullable;
  8 +import android.support.v4.app.Fragment;
  9 +import android.support.v7.widget.RecyclerView;
  10 +import android.view.LayoutInflater;
  11 +import android.view.View;
  12 +import android.view.ViewGroup;
  13 +import android.widget.TextView;
  14 +
  15 +import com.share.mvpsdk.base.BasePresenter;
  16 +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
  17 +import com.shunzhi.parent.R;
  18 +import com.shunzhi.parent.adapter.MyConsultAdapter;
  19 +import com.shunzhi.parent.bean.GuangGaoBean;
  20 +import com.shunzhi.parent.bean.MyConsultBean;
  21 +import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract;
  22 +import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter;
  23 +
  24 +import java.util.ArrayList;
  25 +import java.util.List;
  26 +
  27 +/**
  28 + */
  29 +public class ConsultTwoLevelFragment extends BaseMVPCompatFragment<ConsultOneContract.ConsultOnePresenter,
  30 + ConsultOneContract.IConsultOneModel> implements ConsultOneContract.IConsultOneView {
  31 +
  32 +
  33 + TextView tvContentName;
  34 +
  35 + RecyclerView recyclerView;
  36 +
  37 + MyConsultAdapter myConsultAdapter = null;
  38 +
  39 + List<MyConsultBean> myConsultBeanList = new ArrayList<>();
  40 +
  41 + @Override
  42 + public int getLayoutId() {
  43 + return R.layout.fragment_consult_two_level;
  44 + }
  45 +
  46 + @Override
  47 + public void initUI(View view, @Nullable Bundle savedInstanceState) {
  48 + tvContentName = view.findViewById(R.id.tvContentName);
  49 + tvContentName.setText("");
  50 +
  51 + recyclerView = view.findViewById(R.id.recyclerView);
  52 +
  53 + initRecyclerView();
  54 + }
  55 +
  56 + private void initRecyclerView() {
  57 +
  58 + if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
  59 + for (int i = 0; i < 12; i++) {
  60 + MyConsultBean myConsultBean = new MyConsultBean();
  61 + myConsultBean.consultCounts = i + "";
  62 + myConsultBean.consultContent = "咨询内容" + i;
  63 + myConsultBean.consultTitle = "咨询标题" + i;
  64 + myConsultBean.consultZhuanfaCounts = "转发:" + i;
  65 + myConsultBeanList.add(myConsultBean);
  66 + }
  67 + myConsultAdapter.addAll(myConsultBeanList);
  68 + recyclerView.setAdapter(myConsultAdapter);
  69 + }
  70 +
  71 + @NonNull
  72 + @Override
  73 + public BasePresenter initPresenter() {
  74 + return new ConsultOnePresenter();
  75 + }
  76 +
  77 + @Override
  78 + public void showTools() {
  79 +
  80 + }
  81 +
  82 + @Override
  83 + public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
  84 +
  85 + }
  86 +
  87 + /**
  88 + * 显示咨询内容
  89 + */
  90 + @Override
  91 + public void showConsultContent() {
  92 +
  93 + }
  94 +}
app/src/main/res/layout/activity_consult_two_level.xml
  Diff comments   View file @c942672
@@ -9,23 +9,5 @@ @@ -9,23 +9,5 @@
9 tools:context="com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity"> 9 tools:context="com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity">
10 10
11 <include layout="@layout/layout_search_back"/> 11 <include layout="@layout/layout_search_back"/>
12 -<TextView  
13 - android:layout_width="match_parent"  
14 - android:layout_height="wrap_content"  
15 - android:textSize="@dimen/textSize16"  
16 - android:textColor="@color/textColor"  
17 - android:text="政策咨询"  
18 - android:gravity="center"  
19 - android:id="@+id/tvContentName"  
20 - android:paddingTop="@dimen/size_dp_5"  
21 - android:paddingBottom="@dimen/size_dp_5"  
22 - />  
23 -  
24 - <android.support.v7.widget.RecyclerView  
25 - android:layout_marginLeft="@dimen/size_dp_10"  
26 - android:layout_marginRight="@dimen/size_dp_10"  
27 - android:id="@+id/recyclerView"  
28 - android:layout_width="match_parent"  
29 - android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>  
30 12
31 </LinearLayout> 13 </LinearLayout>
app/src/main/res/layout/fragment_consult_two_level.xml 0 → 100644
  Diff comments   View file @c942672
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
  1 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2 + xmlns:tools="http://schemas.android.com/tools"
  3 + android:layout_width="match_parent"
  4 + android:orientation="vertical"
  5 + android:layout_height="match_parent"
  6 + tools:context="com.shunzhi.parent.ui.fragment.consult.ConsultTwoLevelFragment">
  7 +
  8 + <TextView
  9 + android:layout_width="match_parent"
  10 + android:layout_height="wrap_content"
  11 + android:textSize="@dimen/textSize16"
  12 + android:textColor="@color/textColor"
  13 + android:text="政策咨询"
  14 + android:gravity="center"
  15 + android:id="@+id/tvContentName"
  16 + android:paddingTop="@dimen/size_dp_5"
  17 + android:paddingBottom="@dimen/size_dp_5"
  18 + />
  19 +
  20 + <android.support.v7.widget.RecyclerView
  21 + android:layout_marginLeft="@dimen/size_dp_10"
  22 + android:layout_marginRight="@dimen/size_dp_10"
  23 + android:id="@+id/recyclerView"
  24 + android:layout_width="match_parent"
  25 + android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
  26 +
  27 +
  28 +</>