From f552dcacf2f56ac4ccaafeb2803aa7922dea8b4b Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Thu, 15 Mar 2018 08:39:56 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java            |  7 -------
 app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java    | 22 +++++++++++++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java                  | 16 +++++++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 | 15 ++++++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 14 --------------
 app/src/main/res/layout/layout_textandimgshow.xml                                     |  4 ++--
 6 files changed, 52 insertions(+), 26 deletions(-)

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
index 42febf5..adadc88 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
@@ -1,7 +1,5 @@
 package com.shunzhi.parent.presenter.ceping;
 
-import android.content.res.TypedArray;
-import android.util.TypedValue;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -27,11 +25,6 @@ public class CePingPresenter extends CepingContract.CePingPresenter {
         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);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
index cf05d01..038f5d2 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -27,12 +27,15 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import me.leefeng.citypicker.CityPicker;
+import me.leefeng.citypicker.CityPickerListener;
+
 /**
  * Created by Administrator on 2018/3/12 0012.
  */
 
 public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContract.SchoolListPrasenter, SchoolListContract.ISchoolListModel> implements
-        View.OnClickListener, SchoolListContract.ISchoolListView {
+        View.OnClickListener, SchoolListContract.ISchoolListView,CityPickerListener {
 
     private SideBar sideBar;
     private TextView dialog, go_next, tvLocalAddress;
@@ -40,6 +43,7 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
     private List<String> list = new ArrayList<>();
     SchoolListAdapter schoolListAdapter;
 
+    CityPicker cityPicker=null;
     @NonNull
     @Override
     public BasePresenter initPresenter() {
@@ -53,6 +57,7 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
         go_next = findViewById(R.id.go_next);
         go_next.setOnClickListener(this);
         tvLocalAddress = findViewById(R.id.tvLocalAddress);
+        tvLocalAddress.setOnClickListener(this);
         tvLocalAddress.setText(AppContext.getInstance().cityName);
         setSchoolList();
 
@@ -159,6 +164,10 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
             } else {
                 ToastUtils.showToast("请选择学校");
             }
+        }else if (v==tvLocalAddress){
+            if (null==cityPicker)cityPicker=new CityPicker(SelectSchoolActivity.this,this);
+            if (cityPicker.isShow())cityPicker.close();
+            else cityPicker.show();
         }
 
     }
@@ -224,4 +233,15 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity<SchoolListContra
         schoolListAdapter.addAll(schoolList);
         schoollist.setAdapter(schoolListAdapter);
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (null!=cityPicker)cityPicker.cancle();
+    }
+
+    @Override
+    public void getCity(String name) {
+
+    }
 }
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 bea398e..06e8530 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
@@ -24,9 +24,12 @@ import com.shunzhi.parent.contract.ceping.CepingContract;
 import com.shunzhi.parent.presenter.ceping.CePingPresenter;
 import com.shunzhi.parent.views.TextAndImgShowView;
 
+import me.leefeng.citypicker.CityPicker;
+import me.leefeng.citypicker.CityPickerListener;
+
 
 public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingPresenter,CepingContract.ICePingModel> implements CepingContract.ICePingView
-        ,View.OnClickListener{
+        ,View.OnClickListener,CityPickerListener{
 
     TextView tvLocalAddress;
 
@@ -40,6 +43,8 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
 
     LinearLayout layout_control;
 
+    CityPicker cityPicker=null;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_ce_ping;
@@ -122,6 +127,9 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
                 break;
             case R.id.tvLocalAddress:
                 AppContext.getInstance().startLocation();
+                if (null==cityPicker)cityPicker=new CityPicker(getActivity(),this);
+                if (cityPicker.isShow())cityPicker.close();
+                else cityPicker.show();
                 break;
             case R.id.ivCamera:
                 ToastUtils.showToast("功能暂未上线");
@@ -142,10 +150,16 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     public void onDestroy() {
         super.onDestroy();
         if (null!=broadcastReceiver)getActivity().unregisterReceiver(broadcastReceiver);
+        if (null!=cityPicker)cityPicker.cancle();
     }
 
     @Override
     public void getTools() {
 
     }
+
+    @Override
+    public void getCity(String name) {
+        ToastUtils.showToast(name);
+    }
 }
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 cede3da..acf2804 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
@@ -33,9 +33,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.jzvd.JZVideoPlayerStandard;
+import me.leefeng.citypicker.CityPicker;
+import me.leefeng.citypicker.CityPickerListener;
 
 public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.ConsultPresenter,ConsultContract.IConsultModel> implements View.OnClickListener
-,ConsultContract.IConsultView{
+,ConsultContract.IConsultView,CityPickerListener{
 
     ImageView ivSearch;
 
@@ -48,6 +50,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     TextView tvLocalAddress;
 
     LinearLayout layout_control;
+
+    CityPicker cityPicker=null;
     @Override
     public int getLayoutId() {
         return R.layout.fragment_zi_xun;
@@ -136,6 +140,9 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         switch (view.getId()) {
             case R.id.tvLocalAddress:
                 AppContext.getInstance().startLocation();
+                if (null==cityPicker)cityPicker=new CityPicker(getActivity(),this);
+                if (cityPicker.isShow())cityPicker.close();
+                else cityPicker.show();
                 break;
             case R.id.ivSearch://搜索按钮
 
@@ -165,10 +172,16 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     public void onDestroy() {
         super.onDestroy();
         if (null!=broadcastReceiver)getActivity().unregisterReceiver(broadcastReceiver);
+        if (null!=cityPicker)cityPicker.cancle();
     }
 
     @Override
     public void showTools() {
 
     }
+
+    @Override
+    public void getCity(String name) {
+
+    }
 }
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 da0fe48..ae8d5f6 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
@@ -1,12 +1,8 @@
 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.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -18,27 +14,17 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 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.adapter.MyConsultAdapter;
 import com.shunzhi.parent.bean.GrallyBean;
 import com.shunzhi.parent.bean.MyConsultBean;
-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;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/res/layout/layout_textandimgshow.xml b/app/src/main/res/layout/layout_textandimgshow.xml
index 982ee7e..f705427 100644
--- a/app/src/main/res/layout/layout_textandimgshow.xml
+++ b/app/src/main/res/layout/layout_textandimgshow.xml
@@ -21,7 +21,7 @@
         android:orientation="horizontal"
         android:padding="@dimen/size_dp_10">
 
-        <LinearLayout
+       <!-- <LinearLayout
             android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
                 android:background="?android:selectableItemBackground">
 
             </com.shunzhi.parent.views.TextAndImgShowView>
-        </LinearLayout>
+        </LinearLayout>-->
     </LinearLayout>
     </HorizontalScrollView>
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
--
libgit2 0.21.0