From c8a5db9f1de6a8867fda108ab49957a06ef6b049 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Tue, 20 Mar 2018 14:40:19 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java | 46 ++++++++++++++++++++++------------------------
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java                  |  7 ++++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 |  5 +++++
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java                    | 40 +++++++++++++++++++++++++++++++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 38 ++++++++++----------------------------
 app/src/main/res/layout/fragment_mine.xml                                             |  1 +
 mvpsdk/src/main/java/com/share/mvpsdk/utils/CacheUtils.java                           |  5 +++++
 7 files changed, 86 insertions(+), 56 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
index adf15db..c47fd6d 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
@@ -3,39 +3,37 @@ package com.shunzhi.parent.ui.activity.consult;
 import android.content.Context;
 import android.content.Intent;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 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.activity.BaseCompatActivity;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.ui.fragment.consult.ConsultOneLevelFragment;
 
-public class ConsultOneLevelActivity extends BaseCompatActivity implements View.OnClickListener{
+public class ConsultOneLevelActivity extends BaseCompatActivity implements View.OnClickListener {
 
-
-    public static void getInstance(Context context,String channel){
-        Intent intent=new Intent(context,ConsultOneLevelActivity.class);
-        intent.putExtra("channel",channel);
+    public static void getInstance(Context context, String channel) {
+        Intent intent = new Intent(context, ConsultOneLevelActivity.class);
+        intent.putExtra("channel", channel);
         context.startActivity(intent);
     }
 
     EditText et_search;
 
-    ImageView ivSearch,ivBack;
+    ImageView ivSearch, ivBack;
 
-    String channel="";
+    String channel = "";
 
     FrameLayout frame_consult;
 
-    FragmentTransaction fragmentTransaction=null;
+    FragmentTransaction fragmentTransaction = null;
+
+    ConsultOneLevelFragment consultOneLevelFragment = null;
 
-    ConsultOneLevelFragment consultOneLevelFragment=null;
     @Override
     protected void initView(Bundle savedInstanceState) {
 
@@ -45,22 +43,22 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
 
     private void initViews() {
 
-        channel=getIntent().getStringExtra("channel");
-        consultOneLevelFragment=new ConsultOneLevelFragment();
-        et_search=findViewById(R.id.et_search);
-        ivSearch=findViewById(R.id.ivSearch);
-        ivBack=findViewById(R.id.ivBack);
-        frame_consult=findViewById(R.id.frame_consult);
+        channel = getIntent().getStringExtra("channel");
+        consultOneLevelFragment = new ConsultOneLevelFragment();
+        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.setOnClickListener(this);
         ivBack.setOnClickListener(this);
 
-        Bundle bundle=new Bundle();
-        bundle.putString("channel",channel);
+        Bundle bundle = new Bundle();
+        bundle.putString("channel", channel);
         consultOneLevelFragment.setArguments(bundle);
-        ToastUtils.showToast("channel="+channel);
-        fragmentTransaction=getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.add(R.id.frame_consult,consultOneLevelFragment)
+//        ToastUtils.showToast("channel=" + channel);
+        fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.frame_consult, consultOneLevelFragment)
                 .show(consultOneLevelFragment).commit();
     }
 
@@ -71,9 +69,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()){
+        switch (view.getId()) {
             case R.id.ivSearch:
-
+                consultOneLevelFragment.showSearchContent(et_search.getText().toString());
                 break;
             case R.id.ivBack:
                 finish();
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 a6dbb74..e1cd2e8 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
@@ -70,7 +70,6 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
 
         addTools();
 
-        tvLocalAddress.setText(AppContext.getInstance().cityName);
         textAndImg_xqjc.setTextColor(R.color.white);
         textAndImg_xqjc.setText("学情检测");
         textAndImg_xqjc.setImgs(R.drawable.xqjc, R.drawable.xqjc);
@@ -99,6 +98,10 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     @Override
     public void onResume() {
         super.onResume();
+        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
+            tvLocalAddress.setText(AppContext.getInstance().cityName);
+            addTools();
+        }
     }
 
     private void initListeners(View view) {
@@ -125,7 +128,6 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
         return new CePingPresenter();
     }
 
-
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
@@ -175,7 +177,6 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
         mPresenter.getTools(layout_control, name.split(" ")[2]);
         AppContext.getInstance().cityName=name.split(" ")[1];
         AppContext.getInstance().district=name.split(" ")[2];
-//        ToastUtils.showToast(name.split(" ")[2]);
     }
 
     @Override
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..cb8a7bc 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
@@ -133,6 +133,11 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     public void onResume() {
         super.onResume();
         xBanner.startAutoPlay();
+        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
+            tvLocalAddress.setText(AppContext.getInstance().cityName);
+            mPresenter.getBanners("2", AppContext.getInstance().district);
+            mPresenter.getContextChannel(AppContext.getInstance().district, 0, 1, 1);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index a08954c..f6a66b9 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -1,5 +1,7 @@
 package com.shunzhi.parent.ui.fragment;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -13,6 +15,7 @@ import com.bumptech.glide.Glide;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+import com.share.mvpsdk.utils.CacheUtils;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
@@ -26,9 +29,11 @@ import com.shunzhi.parent.ui.activity.PersonInfoActivity;
 import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
 import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
 
+import static java.util.ResourceBundle.clearCache;
+
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order,layout_cache;
     RoundedImageView user_photo;
     TextView user_name, user_mobile, tvExit,binding_state;
 
@@ -49,6 +54,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
         personinfo = view.findViewById(R.id.personinfo);
         layout_order = view.findViewById(R.id.layout_order);
         layout_orderDetail = view.findViewById(R.id.layout_orderDetail);
+        layout_cache=view.findViewById(R.id.layout_cache);
+        layout_cache.setOnClickListener(this);
         childlayout.setOnClickListener(this);
         personinfo.setOnClickListener(this);
         layout_order.setOnClickListener(this);
@@ -109,11 +116,42 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             case R.id.tvExit:
                 clearUerinfo();
                 break;
+            case R.id.layout_cache:
+                clearMyCache();
+                break;
             default:
                 break;
         }
     }
 
+    private void clearMyCache() {
+
+        AlertDialog.Builder builder=new AlertDialog.Builder(getActivity());
+        try {
+            builder.setMessage("清理缓存"+CacheUtils.getCacheSize(getActivity())+"")
+                    .setPositiveButton("取消", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            dialogInterface.dismiss();
+                        }
+                    })
+                    .setNegativeButton("确定", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            try {
+                                CacheUtils.clearCache(getActivity());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            dialogInterface.dismiss();
+                        }
+                    });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        builder.create().show();
+    }
+
     private void clearUerinfo() {
         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, "");
         AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_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 ded049d..3dee868 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
@@ -49,9 +49,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
 
     LinearLayout layout_control;
 
-    List<MyConsultBean> myConsultBeanList = null;
-
-    String channel="";
+    String channel = "";
 
     @Override
     public int getLayoutId() {
@@ -60,7 +58,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
 
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-            initViews(view);
+        initViews(view);
     }
 
     private void initRecyclerView(List<GuangGaoBean> guangGaoBeanList) {
@@ -83,35 +81,20 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
     }
 
     private void initViews(View view) {
-        channel=getArguments().getString("channel");
+        channel = getArguments().getString("channel");
         ToastUtils.showToast(channel);
         layout_control = view.findViewById(R.id.layout_control);
         layout_control.measure(0, 0);
-//        mPresenter.getTools(layout_control);
         recyclerViewGrally = view.findViewById(R.id.recyclerViewGrally);
         recyclerViewConsultOne = view.findViewById(R.id.recyclerViewConsultOne);
 
         mPresenter.getBanners("3", AppContext.getInstance().district);
         mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, 1);
-//        initRecyclerViewConsult();
     }
 
-//    private void initRecyclerViewConsult() {
-//        if (null == myConsultAdapter) myConsultAdapter = new MyConsultAdapter(getActivity());
-//        if (null == myConsultBeanList) myConsultBeanList = new ArrayList<>();
-//        else myConsultBeanList.clear();
-//        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);
-//        recyclerViewConsultOne.setAdapter(myConsultAdapter);
-//
-//    }
+    public void showSearchContent(String keyword) {
+        mPresenter.getInformationTopic(keyword, AppContext.getInstance().district, channel, "0", 1);
+    }
 
     @NonNull
     @Override
@@ -148,7 +131,6 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
             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);
@@ -157,8 +139,8 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
             textAndImgShowView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ChannelBean channelBean= (ChannelBean) view.getTag();
-                    ConsultTwoLevelActivity.getInstance(getActivity(),channelBean.getId()+"");
+                    ChannelBean channelBean = (ChannelBean) view.getTag();
+                    ConsultTwoLevelActivity.getInstance(getActivity(), channelBean.getId() + "");
                 }
             });
             layout_control.addView(textAndImgShowView);
@@ -199,8 +181,8 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
 
             @Override
             public void onBindViewHolder(GuangGaoBean object, int position) {
-                Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG+object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
-                tv_grally_title.setText(object.describe+"");
+                Glide.with(getActivity()).load(AppConfig.BASE_URL_IMG + object.fileSrc).error(R.drawable.ic_launcher_foreground).into(iv_grally);
+                tv_grally_title.setText(object.describe + "");
             }
         }
     }
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index f074307..7d5afe9 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -268,6 +268,7 @@
                     android:background="@color/bottomline" />
 
                 <LinearLayout
+                    android:id="@+id/layout_cache"
                     android:layout_width="match_parent"
                     android:layout_height="?android:actionBarSize"
                     android:gravity="center_vertical"
diff --git a/mvpsdk/src/main/java/com/share/mvpsdk/utils/CacheUtils.java b/mvpsdk/src/main/java/com/share/mvpsdk/utils/CacheUtils.java
index de28722..cca1c2b 100644
--- a/mvpsdk/src/main/java/com/share/mvpsdk/utils/CacheUtils.java
+++ b/mvpsdk/src/main/java/com/share/mvpsdk/utils/CacheUtils.java
@@ -96,6 +96,11 @@ public class CacheUtils {
         cleanCustomCache(filepath);
     }
 
+    public static void clearCache(Context context)throws Exception{
+        File file=new File("/data/data/"+ context.getPackageName());
+        cleanCustomCache(file.toString());
+    }
+
     public static String getCacheSize(Context context) throws Exception {
         File file=new File("/data/data/"+ context.getPackageName());
         return getFormatSize(getFolderSize(file));
--
libgit2 0.21.0