From 75be5d9a65c65f6e12a9ee2107a76f75ad924f1d Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Wed, 14 Mar 2018 16:49:37 +0800 Subject: [PATCH] no message --- app/build.gradle | 7 ++++++- app/src/main/AndroidManifest.xml | 4 ++-- app/src/main/java/com/shunzhi/parent/AppContext.java | 2 +- app/src/main/java/com/shunzhi/parent/bean/ToolBean.java | 28 ++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java | 33 +++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java | 28 ++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java | 27 +++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/model/CePingModel.java | 20 ++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java | 20 ++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java | 20 ++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 2 +- app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java | 30 +++++++++++++++--------------- app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java | 67 +++++++++++++++++++++++++------------------------------------------ app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 58 ++++++++++++++-------------------------------------------- app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 65 +++++++++++++---------------------------------------------------- app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java | 13 +++++++++---- app/src/main/res/drawable-xhdpi/logo.png | Bin 0 -> 34716 bytes app/src/main/res/drawable-xhdpi/xsc.png | Bin 0 -> 4922 bytes app/src/main/res/drwable-xxhdpi/logo.png | Bin 0 -> 34716 bytes app/src/main/res/layout/fragment_consult_one_level.xml | 10 +++++----- app/src/main/res/layout/layout_consult_content.xml | 1 + app/src/main/res/layout/layout_textandimgshow.xml | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------- mvpsdk/build.gradle | 3 +++ mvpsdk/src/main/java/com/share/mvpsdk/utils/DBUtils.java | 1 + 27 files changed, 501 insertions(+), 202 deletions(-) create mode 100644 app/src/main/java/com/shunzhi/parent/bean/ToolBean.java create mode 100644 app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java create mode 100644 app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java create mode 100644 app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java create mode 100644 app/src/main/java/com/shunzhi/parent/model/CePingModel.java create mode 100644 app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java create mode 100644 app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java create mode 100644 app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java create mode 100644 app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java create mode 100644 app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java create mode 100644 app/src/main/res/drawable-xhdpi/logo.png create mode 100644 app/src/main/res/drawable-xhdpi/xsc.png create mode 100644 app/src/main/res/drwable-xxhdpi/logo.png diff --git a/app/build.gradle b/app/build.gradle index 57f6623..36b4dfa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { config { keyAlias 'key0' keyPassword '123456' - storeFile file('E:/parentwork/app/parent.jks') + storeFile file('../app/parent.jks') storePassword '123456' } } @@ -24,6 +24,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.config } + debug { + signingConfig signingConfigs.config + } + } + productFlavors { } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 57c9148..5d511e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,9 +48,9 @@ diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java index 9fa58ee..aa905e6 100644 --- a/app/src/main/java/com/shunzhi/parent/AppContext.java +++ b/app/src/main/java/com/shunzhi/parent/AppContext.java @@ -105,8 +105,8 @@ public class AppContext extends GlobalApplication { sendBroadcast(intent); stopLocation(); }else { - Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo()); cityName="定位失败"; + Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo()); } } diff --git a/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java b/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java new file mode 100644 index 0000000..cac4511 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/ToolBean.java @@ -0,0 +1,28 @@ +package com.shunzhi.parent.bean; + +import java.io.Serializable; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public class ToolBean implements Serializable { + + public ToolBean(String toolImg,String toolName){ + this.toolImg=toolImg; + this.toolName=toolName; + } + + + public String toolImg; + + public String toolName; + + @Override + public String toString() { + return "ToolBean{" + + "toolImg='" + toolImg + '\'' + + ", toolName='" + toolName + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java b/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java new file mode 100644 index 0000000..0434a54 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/contract/ceping/CepingContract.java @@ -0,0 +1,33 @@ +package com.shunzhi.parent.contract.ceping; + +import android.view.View; +import android.widget.LinearLayout; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.IBaseFragment; +import com.share.mvpsdk.base.IBaseModel; +import com.shunzhi.parent.bean.ToolBean; + +import java.util.List; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public interface CepingContract { + + abstract class CePingPresenter extends BasePresenter{ + public abstract void getTools(LinearLayout view); + } + + + interface ICePingModel extends IBaseModel{ + void getTools(); + } + + + interface ICePingView extends IBaseFragment{ + void getTools(); + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java new file mode 100644 index 0000000..37af7dc --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java @@ -0,0 +1,28 @@ +package com.shunzhi.parent.contract.consult; + +import android.widget.LinearLayout; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.IBaseFragment; +import com.share.mvpsdk.base.IBaseModel; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public interface ConsultContract { + + abstract class ConsultPresenter extends BasePresenter{ + public abstract void getTools(LinearLayout linearLayout); + } + + + interface IConsultModel extends IBaseModel{ + void getTools(); + } + + interface IConsultView extends IBaseFragment{ + void showTools(); + } + +} 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 new file mode 100644 index 0000000..2fa5029 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/consultone/ConsultOneContract.java @@ -0,0 +1,27 @@ +package com.shunzhi.parent.contract.consult.consultone; + +import android.widget.LinearLayout; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.IBaseFragment; +import com.share.mvpsdk.base.IBaseModel; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public interface ConsultOneContract { + + abstract class ConsultOnePresenter extends BasePresenter{ + public abstract void getTools(LinearLayout linearLayout); + } + + interface IConsultOneModel extends IBaseModel{ + void getTools(); + } + + interface IConsultOneView extends IBaseFragment{ + void showTools(); + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/model/CePingModel.java b/app/src/main/java/com/shunzhi/parent/model/CePingModel.java new file mode 100644 index 0000000..4c2777b --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/CePingModel.java @@ -0,0 +1,20 @@ +package com.shunzhi.parent.model; + +import com.share.mvpsdk.base.BaseModel; +import com.shunzhi.parent.contract.ceping.CepingContract; + +/** + * Created by ToaHanDong on 2018/3/14. + */ +//获取测评数据 +public class CePingModel extends BaseModel implements CepingContract.ICePingModel { + +public static CePingModel newInstance(){ + return new CePingModel(); +} + @Override + public void getTools() { + + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java new file mode 100644 index 0000000..7b6cba6 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/consult/ConsultModel.java @@ -0,0 +1,20 @@ +package com.shunzhi.parent.model.consult; + +import com.share.mvpsdk.base.BaseModel; +import com.shunzhi.parent.contract.consult.ConsultContract; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public class ConsultModel extends BaseModel implements ConsultContract.IConsultModel{ + + @Override + public void getTools() { + + } + + public static ConsultContract.IConsultModel newInstance() { + return new ConsultModel(); + } +} 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 new file mode 100644 index 0000000..d29da8c --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java @@ -0,0 +1,20 @@ +package com.shunzhi.parent.model.consult.consultone; + +import com.share.mvpsdk.base.BaseModel; +import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public class ConsultOneModel extends BaseModel implements ConsultOneContract.IConsultOneModel{ + + public static ConsultOneModel newInstance(){ + return new ConsultOneModel(); + } + + @Override + public void getTools() { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java new file mode 100644 index 0000000..4705596 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java @@ -0,0 +1,66 @@ +package com.shunzhi.parent.presenter.ceping; + +import android.content.res.TypedArray; +import android.util.TypedValue; +import android.view.View; +import android.widget.LinearLayout; + +import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.ToolBean; +import com.shunzhi.parent.contract.ceping.CepingContract; +import com.shunzhi.parent.model.CePingModel; +import com.shunzhi.parent.views.TextAndImgShowView; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public class CePingPresenter extends CepingContract.CePingPresenter { + @Override + public void getTools(LinearLayout layout_control) { + List toolBeanList=new ArrayList<>(); + toolBeanList.add(new ToolBean(R.drawable.gxzt+"","高校直通")); + toolBeanList.add(new ToolBean(R.drawable.zycx+"","专业查询")); + toolBeanList.add(new ToolBean(R.drawable.cmyk+"","传媒艺考")); + toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜")); + toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜")); + toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜")); + toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜")); + toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜")); + + for (int i = 0; i < toolBeanList.size(); i++) { + TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); + textAndImgShowView.setTextColor(R.color.textColor); + textAndImgShowView.setText(toolBeanList.get(i).toolName); + textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImg)); + textAndImgShowView.setSelect(true); + textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); + TypedValue typedValue=new TypedValue(); + mIView.getBindActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,typedValue,true); + int[] sttrides=new int[]{android.R.attr.selectableItemBackground}; + TypedArray typedArray=mIView.getBindActivity().getTheme().obtainStyledAttributes(sttrides); + textAndImgShowView.setBackground(typedArray.getDrawable(0)); + textAndImgShowView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + } + }); + layout_control.addView(textAndImgShowView); + } + mIView.getTools(); + } + + @Override + public CepingContract.ICePingModel getModel() { + return CePingModel.newInstance(); + } + + @Override + public void onStart() { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java new file mode 100644 index 0000000..735d206 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -0,0 +1,62 @@ +package com.shunzhi.parent.presenter.consult; + +import android.content.res.TypedArray; +import android.util.TypedValue; +import android.view.View; +import android.widget.LinearLayout; + +import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.ToolBean; +import com.shunzhi.parent.contract.consult.ConsultContract; +import com.shunzhi.parent.model.consult.ConsultModel; +import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity; +import com.shunzhi.parent.views.TextAndImgShowView; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public class ConsultPresenter extends ConsultContract.ConsultPresenter { + @Override + public void getTools(LinearLayout layout_control) { + List toolBeanList=new ArrayList<>(); + toolBeanList.add(new ToolBean(R.drawable.xiaoxue+"","小学")); + toolBeanList.add(new ToolBean(R.drawable.zhongxue+"","中学")); + toolBeanList.add(new ToolBean(R.drawable.gaozhong+"","高中")); + toolBeanList.add(new ToolBean(R.drawable.parent+"","家长")); + for (int i = 0; i < toolBeanList.size(); i++) { + TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); + textAndImgShowView.setTextColor(R.color.textColor); + textAndImgShowView.setText(toolBeanList.get(i).toolName); + textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImg)); + textAndImgShowView.setSelect(true); + textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); + TypedValue typedValue=new TypedValue(); + mIView.getBindActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,typedValue,true); + int[] sttrides=new int[]{android.R.attr.selectableItemBackground}; + TypedArray typedArray=mIView.getBindActivity().getTheme().obtainStyledAttributes(sttrides); + textAndImgShowView.setBackground(typedArray.getDrawable(0)); + textAndImgShowView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ConsultOneLevelActivity.getInstance(mIView.getBindActivity()); + } + }); + layout_control.addView(textAndImgShowView); + } + mIView.showTools(); + } + + @Override + public ConsultContract.IConsultModel getModel() { + return ConsultModel.newInstance(); + } + + @Override + public void onStart() { + + } +} 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 new file mode 100644 index 0000000..7efb3f6 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/consultone/ConsultOnePresenter.java @@ -0,0 +1,48 @@ +package com.shunzhi.parent.presenter.consult.consultone; + +import android.widget.LinearLayout; + +import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.ToolBean; +import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract; +import com.shunzhi.parent.model.consult.consultone.ConsultOneModel; +import com.shunzhi.parent.views.TextAndImgShowView; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by ToaHanDong on 2018/3/14. + */ + +public class ConsultOnePresenter extends ConsultOneContract.ConsultOnePresenter{ + @Override + public void getTools(LinearLayout layout_control) { + List toolBeanList=new ArrayList<>(); + toolBeanList.add(new ToolBean(R.drawable.xiaoxue+"","政策咨询")); + toolBeanList.add(new ToolBean(R.drawable.gbxx+"","公办/民办小学")); + toolBeanList.add(new ToolBean(R.drawable.xsc+"","小升初")); + toolBeanList.add(new ToolBean(R.drawable.xxk+"","学校库")); + toolBeanList.add(new ToolBean(R.drawable.zhuanti+"","专题")); + for (int i = 0; i < toolBeanList.size(); i++) { + TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity()); + textAndImgShowView.setTextColor(R.color.textColor); + textAndImgShowView.setText(toolBeanList.get(i).toolName); + textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImg)); + textAndImgShowView.setSelect(true); + textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control); + layout_control.addView(textAndImgShowView); + } + mIView.showTools(); + } + + @Override + public ConsultOneContract.IConsultOneModel getModel() { + return ConsultOneModel.newInstance(); + } + + @Override + public void onStart() { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java index 2b5e709..368fd3b 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java @@ -119,7 +119,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre @Override public void getUserInfo() { - Log.d("77777", "getUserInfo="); +// Log.d("77777", "getUserInfo="); } 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 e95db04..2208fce 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 @@ -13,6 +13,7 @@ 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.base.adapter.BaseRecyclerViewAdapter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; @@ -22,7 +23,7 @@ import com.shunzhi.parent.bean.MyConsultBean; import java.util.ArrayList; import java.util.List; -public class ConsultTwoLevelActivity extends BaseMVPCompatFragment implements View.OnClickListener { +public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements View.OnClickListener { ImageView ivBack, ivSearch; @@ -37,31 +38,30 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatFragment implements Vi List myConsultBeanList = new ArrayList<>(); @Override - public int getLayoutId() { - return R.layout.activity_consult_two_level; + protected void initView(Bundle savedInstanceState) { + initViews(); } @Override - public void initUI(View view, @Nullable Bundle savedInstanceState) { - - initViews(view); - + public int getLayoutId() { + return R.layout.activity_consult_two_level; } - private void initViews(View view) { - ivBack = view.findViewById(R.id.ivBack); + private void initViews() { + + ivBack = findViewById(R.id.ivBack); ivBack.setOnClickListener(this); - et_search = view.findViewById(R.id.et_search); + et_search = findViewById(R.id.et_search); - ivSearch = view.findViewById(R.id.ivSearch); + ivSearch = findViewById(R.id.ivSearch); ivSearch.setOnClickListener(this); - tvContentName = view.findViewById(R.id.tvContentName); + tvContentName = findViewById(R.id.tvContentName); tvContentName.setText(""); - recyclerView = view.findViewById(R.id.recyclerView); + recyclerView = findViewById(R.id.recyclerView); initRecyclerView(); } @@ -105,13 +105,13 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatFragment implements Vi @Override public void onAttachedToRecyclerView(RecyclerView recyclerView) { super.onAttachedToRecyclerView(recyclerView); - LinearLayoutManager layoutManager = new LinearLayoutManager(getContext()); + LinearLayoutManager layoutManager = new LinearLayoutManager(ConsultTwoLevelActivity.this); recyclerView.setLayoutManager(layoutManager); } @Override public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(getActivity()).inflate(R.layout.layout_consult_content, parent, false); + View view = LayoutInflater.from(ConsultTwoLevelActivity.this).inflate(R.layout.layout_consult_content, parent, false); return new MyTwoLevelViewHolder(view); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java index 38aca8a..bea398e 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java @@ -11,27 +11,35 @@ import android.support.design.widget.FloatingActionButton; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; +import com.share.mvpsdk.utils.DisplayUtils; import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; +import com.shunzhi.parent.contract.ceping.CepingContract; +import com.shunzhi.parent.presenter.ceping.CePingPresenter; import com.shunzhi.parent.views.TextAndImgShowView; -public class CePingFragment extends BaseMVPCompatFragment implements View.OnClickListener{ + +public class CePingFragment extends BaseMVPCompatFragment implements CepingContract.ICePingView + ,View.OnClickListener{ TextView tvLocalAddress; ImageView ivCamera; - TextAndImgShowView textAndImg1,textAndImg2,textAndImg3,textAndImg4,textAndImg_xqjc,textAndImg_zxlx; + TextAndImgShowView textAndImg_xqjc,textAndImg_zxlx; FrameLayout frame_hot1; FloatingActionButton floatingActionButton; + LinearLayout layout_control; + @Override public int getLayoutId() { return R.layout.fragment_ce_ping; @@ -39,36 +47,16 @@ public class CePingFragment extends BaseMVPCompatFragment implements View.OnClic @Override public void initUI(View view, @Nullable Bundle savedInstanceState) { + ivCamera=view.findViewById(R.id.ivCamera); tvLocalAddress=view.findViewById(R.id.tvLocalAddress); - textAndImg1=view.findViewById(R.id.textAndImg1); - textAndImg2=view.findViewById(R.id.textAndImg2); - textAndImg3=view.findViewById(R.id.textAndImg3); - textAndImg4=view.findViewById(R.id.textAndImg4); textAndImg_xqjc=view.findViewById(R.id.textAndImg_xqjc); textAndImg_zxlx=view.findViewById(R.id.textAndImg_zxlx); frame_hot1=view.findViewById(R.id.frame_hot1); + layout_control=view.findViewById(R.id.layout_control); floatingActionButton=view.findViewById(R.id.floatingActionButton); - textAndImg1.setTextColor(R.color.textColor); - textAndImg1.setText("高校直通"); - textAndImg1.setImgs(R.drawable.play,R.drawable.gxzt); - textAndImg1.setSelect(true); - - textAndImg2.setTextColor(R.color.textColor); - textAndImg2.setText("专业查询"); - textAndImg2.setImgs(R.drawable.play,R.drawable.zycx); - textAndImg2.setSelect(true); - - textAndImg3.setTextColor(R.color.textColor); - textAndImg3.setText("传媒艺考"); - textAndImg3.setImgs(R.drawable.play,R.drawable.cmyk); - textAndImg3.setSelect(true); - - textAndImg4.setTextColor(R.color.textColor); - textAndImg4.setText("排行榜"); - textAndImg4.setImgs(R.drawable.play,R.drawable.phb); - textAndImg4.setSelect(true); + addTools(); textAndImg_xqjc.setTextColor(R.color.white); textAndImg_xqjc.setText("学情检测"); @@ -84,6 +72,12 @@ public class CePingFragment extends BaseMVPCompatFragment implements View.OnClic floatingActionButton.setRippleColor(getResources().getColor(R.color.white)); } + private void addTools() { + layout_control.measure(0,0); + mPresenter.getTools(layout_control); + + } + @Override public void onResume() { super.onResume(); @@ -94,10 +88,6 @@ public class CePingFragment extends BaseMVPCompatFragment implements View.OnClic view.findViewById(R.id.frame_hot2).setOnClickListener(this); view.findViewById(R.id.frame_hot3).setOnClickListener(this); tvLocalAddress.setOnClickListener(this); - textAndImg1.setOnClickListener(this); - textAndImg2.setOnClickListener(this); - textAndImg3.setOnClickListener(this); - textAndImg4.setOnClickListener(this); ivCamera.setOnClickListener(this); initBroadCast(); @@ -114,7 +104,7 @@ public class CePingFragment extends BaseMVPCompatFragment implements View.OnClic @NonNull @Override public BasePresenter initPresenter() { - return null; + return new CePingPresenter(); } @@ -133,18 +123,6 @@ public class CePingFragment extends BaseMVPCompatFragment implements View.OnClic case R.id.tvLocalAddress: AppContext.getInstance().startLocation(); break; - case R.id.textAndImg1: - - break; - case R.id.textAndImg2: - - break; - case R.id.textAndImg3: - - break; - case R.id.textAndImg4: - - break; case R.id.ivCamera: ToastUtils.showToast("功能暂未上线"); break; @@ -165,4 +143,9 @@ public class CePingFragment extends BaseMVPCompatFragment implements View.OnClic super.onDestroy(); if (null!=broadcastReceiver)getActivity().unregisterReceiver(broadcastReceiver); } + + @Override + public void getTools() { + + } } 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 afdeeb4..cede3da 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 @@ -12,6 +12,7 @@ import android.support.annotation.Nullable; 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; @@ -19,6 +20,8 @@ import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; +import com.shunzhi.parent.contract.consult.ConsultContract; +import com.shunzhi.parent.presenter.consult.ConsultPresenter; import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity; import com.shunzhi.parent.views.TextAndImgShowView; import com.stx.xhb.xbanner.XBanner; @@ -31,12 +34,11 @@ import java.util.List; import cn.jzvd.JZVideoPlayerStandard; -public class ConsultFragment extends BaseMVPCompatFragment implements View.OnClickListener { +public class ConsultFragment extends BaseMVPCompatFragment implements View.OnClickListener +,ConsultContract.IConsultView{ ImageView ivSearch; - TextAndImgShowView textAndImg1, textAndImg2, textAndImg3, textAndImg4; - XBanner xBanner; List imgesUrl = new ArrayList<>(); @@ -45,6 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnCli TextView tvLocalAddress; + LinearLayout layout_control; @Override public int getLayoutId() { return R.layout.fragment_zi_xun; @@ -54,38 +57,16 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnCli public void initUI(View view, @Nullable Bundle savedInstanceState) { ivSearch = view.findViewById(R.id.ivSearch); - textAndImg1 = view.findViewById(R.id.textAndImg1); - textAndImg2 = view.findViewById(R.id.textAndImg2); - textAndImg3 = view.findViewById(R.id.textAndImg3); - textAndImg4 = view.findViewById(R.id.textAndImg4); xBanner = view.findViewById(R.id.xBanner); videoplayer = view.findViewById(R.id.videoplayer); tvLocalAddress = view.findViewById(R.id.tvLocalAddress); + layout_control=view.findViewById(R.id.layout_control); videoplayer.batteryLevel.setVisibility(View.GONE); videoplayer.replayTextView.setVisibility(View.GONE); videoplayer.backButton.setVisibility(View.GONE); - textAndImg1.setTextColor(R.color.textColor); - textAndImg1.setText("小学"); - textAndImg1.setImgs(R.drawable.play, R.drawable.xiaoxue); - textAndImg1.setSelect(true); - - textAndImg2.setTextColor(R.color.textColor); - textAndImg2.setText("中学"); - textAndImg2.setImgs(R.drawable.play, R.drawable.zhongxue); - textAndImg2.setSelect(true); - - textAndImg3.setTextColor(R.color.textColor); - textAndImg3.setText("高中"); - textAndImg3.setImgs(R.drawable.play, R.drawable.gaozhong); - textAndImg3.setSelect(true); - - textAndImg4.setTextColor(R.color.textColor); - textAndImg4.setText("家长"); - textAndImg4.setImgs(R.drawable.play, R.drawable.parent); - textAndImg4.setSelect(true); - + mPresenter.getTools(layout_control); initBanners(); initBroadCast(); @@ -94,10 +75,6 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnCli } private void initListeners() { - textAndImg1.setOnClickListener(this); - textAndImg2.setOnClickListener(this); - textAndImg3.setOnClickListener(this); - textAndImg4.setOnClickListener(this); ivSearch.setOnClickListener(this); tvLocalAddress.setOnClickListener(this); } @@ -127,7 +104,7 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnCli @NonNull @Override public BasePresenter initPresenter() { - return null; + return new ConsultPresenter(); } private byte[] InputStreamToByte(InputStream is) throws IOException { @@ -160,18 +137,6 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnCli case R.id.tvLocalAddress: AppContext.getInstance().startLocation(); break; - case R.id.textAndImg1: - ConsultOneLevelActivity.getInstance(getActivity()); - break; - case R.id.textAndImg2: - ConsultOneLevelActivity.getInstance(getActivity()); - break; - case R.id.textAndImg3: - ConsultOneLevelActivity.getInstance(getActivity()); - break; - case R.id.textAndImg4: - ConsultOneLevelActivity.getInstance(getActivity()); - break; case R.id.ivSearch://搜索按钮 break; @@ -201,4 +166,9 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnCli super.onDestroy(); if (null!=broadcastReceiver)getActivity().unregisterReceiver(broadcastReceiver); } + + @Override + public void showTools() { + + } } 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 0da90bb..577506b 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 @@ -22,10 +22,14 @@ import com.share.mvpsdk.base.BasePresenter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; +import com.share.mvpsdk.utils.DisplayUtils; import com.share.mvpsdk.utils.ToastUtils; import com.shunzhi.parent.AppContext; import com.shunzhi.parent.R; import com.shunzhi.parent.bean.GrallyBean; +import com.shunzhi.parent.contract.consult.ConsultContract; +import com.shunzhi.parent.contract.consult.consultone.ConsultOneContract; +import com.shunzhi.parent.presenter.consult.consultone.ConsultOnePresenter; import com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity; import com.shunzhi.parent.views.TextAndImgShowView; @@ -35,9 +39,9 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -public class ConsultOneLevelFragment extends BaseMVPCompatFragment implements View.OnClickListener { +public class ConsultOneLevelFragment extends BaseMVPCompatFragment + implements View.OnClickListener,ConsultOneContract.IConsultOneView { - TextAndImgShowView textAndImg1, textAndImg2, textAndImg3, textAndImg4; RecyclerView recyclerViewGrally; @@ -74,71 +78,28 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment implements Vi private void initViews(View view) { layout_control=view.findViewById(R.id.layout_control); - for (int i = 0; i < 10; i++) { - TextAndImgShowView textAndImgShowView=new TextAndImgShowView(getContext()); - textAndImgShowView.setTextColor(R.color.textColor); - textAndImgShowView.setText("政策咨询"); - textAndImgShowView.setImgs(R.drawable.play, R.drawable.zczx); - textAndImgShowView.setSelect(true); - textAndImgShowView.setWidth(1); - layout_control.addView(textAndImgShowView); - } - - textAndImg1 = view.findViewById(R.id.textAndImg1); - textAndImg2 = view.findViewById(R.id.textAndImg2); - textAndImg3 = view.findViewById(R.id.textAndImg3); - textAndImg4 = view.findViewById(R.id.textAndImg4); + layout_control.measure(0,0); + mPresenter.getTools(layout_control); recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally); - textAndImg1.setTextColor(R.color.textColor); - textAndImg1.setText("政策咨询"); - textAndImg1.setImgs(R.drawable.play, R.drawable.zczx); - textAndImg1.setSelect(true); - - textAndImg2.setTextColor(R.color.textColor); - textAndImg2.setText("公办/民办小学"); - textAndImg2.setImgs(R.drawable.play, R.drawable.gbxx); - textAndImg2.setSelect(true); - - textAndImg3.setTextColor(R.color.textColor); - textAndImg3.setText("学校库"); - textAndImg3.setImgs(R.drawable.play, R.drawable.xxk); - textAndImg3.setSelect(true); - - textAndImg4.setTextColor(R.color.textColor); - textAndImg4.setText("专题"); - textAndImg4.setImgs(R.drawable.play, R.drawable.zhuanti); - textAndImg4.setSelect(true); - - textAndImg1.setOnClickListener(this); - textAndImg2.setOnClickListener(this); - textAndImg3.setOnClickListener(this); - textAndImg4.setOnClickListener(this); initRecyclerView(); } @NonNull @Override public BasePresenter initPresenter() { - return null; + return new ConsultOnePresenter(); } @Override public void onClick(View view) { switch (view.getId()) { - case R.id.textAndImg1: - startNewActivity(ConsultTwoLevelActivity.class); - break; - case R.id.textAndImg2: - - break; - case R.id.textAndImg3: + } + } - break; - case R.id.textAndImg4: + @Override + public void showTools() { - break; - } } private class MyGrallyAdapter extends BaseRecyclerViewAdapter { diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java index 1561335..fd6e3b2 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -1,10 +1,12 @@ package com.shunzhi.parent.views; +import android.app.Activity; import android.content.Context; import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; import android.text.Layout; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -67,13 +69,16 @@ public class TextAndImgShowView extends LinearLayout { text.setText(content); } - public void setTextColor(int color){ + public void setTextColor(int color) { text.setTextColor(color); } - public void setWidth(int width) { - LayoutParams params=new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); - params.width= DisplayUtils.px2dp(width); + public void setWidth(Activity activity, View layout_control) { + Log.d("66666", "layout_control=" + layout_control.getMeasuredWidth()); + LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); + params.width = (DisplayUtils.getScreenWidthPixels(activity) - + DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight() + )) / 4; layout.setLayoutParams(params); } } diff --git a/app/src/main/res/drawable-xhdpi/logo.png b/app/src/main/res/drawable-xhdpi/logo.png new file mode 100644 index 0000000..fd04f6e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/logo.png differ diff --git a/app/src/main/res/drawable-xhdpi/xsc.png b/app/src/main/res/drawable-xhdpi/xsc.png new file mode 100644 index 0000000..eb2b06a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/xsc.png differ diff --git a/app/src/main/res/drwable-xxhdpi/logo.png b/app/src/main/res/drwable-xxhdpi/logo.png new file mode 100644 index 0000000..fd04f6e Binary files /dev/null and b/app/src/main/res/drwable-xxhdpi/logo.png differ 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 4b422d7..b5e8c38 100644 --- a/app/src/main/res/layout/fragment_consult_one_level.xml +++ b/app/src/main/res/layout/fragment_consult_one_level.xml @@ -4,6 +4,9 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/bgColor" + android:paddingTop="@dimen/size_dp_10" + android:paddingRight="@dimen/size_dp_10" + android:paddingLeft="@dimen/size_dp_10" tools:context="com.shunzhi.parent.ui.fragment.consult.ConsultOneLevelFragment"> diff --git a/app/src/main/res/layout/layout_consult_content.xml b/app/src/main/res/layout/layout_consult_content.xml index 594d910..f72fd35 100644 --- a/app/src/main/res/layout/layout_consult_content.xml +++ b/app/src/main/res/layout/layout_consult_content.xml @@ -1,6 +1,7 @@ - + android:scrollbars="none"> + + + + + android:orientation="horizontal"> - + - + - + - + - + - + - + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/mvpsdk/build.gradle b/mvpsdk/build.gradle index 382f398..a83cedb 100644 --- a/mvpsdk/build.gradle +++ b/mvpsdk/build.gradle @@ -107,6 +107,9 @@ dependencies { //轮播图XBanner compile 'com.xhb:xbanner:1.3.1' + //省市区联动 + compile 'me.leefeng:citypicker:1.0' + //悬浮窗 // compile 'com.github.yhaolpz:FloatWindow:1.0.8' diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/utils/DBUtils.java b/mvpsdk/src/main/java/com/share/mvpsdk/utils/DBUtils.java index 663b4f5..ccae847 100644 --- a/mvpsdk/src/main/java/com/share/mvpsdk/utils/DBUtils.java +++ b/mvpsdk/src/main/java/com/share/mvpsdk/utils/DBUtils.java @@ -2,6 +2,7 @@ package com.share.mvpsdk.utils; import android.content.ContentValues; import android.content.Context; +import android.content.SharedPreferences; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -- libgit2 0.21.0