From 252d2ee02c7e951394147eb0a20db1a0d201843a Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Thu, 22 Mar 2018 15:53:31 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java | 31 ++++++++++++++-----------------
 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java   |  7 +++----
 2 files changed, 17 insertions(+), 21 deletions(-)

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 9af4301..b5288da 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
@@ -93,7 +93,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
 
     private void addTools() {
         layout_control.measure(0, 0);
-        mPresenter.getTools(layout_control, AppContext.getInstance().district);
+        mPresenter.getTools(layout_control, "余杭区");
 
     }
 
@@ -101,8 +101,8 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     public void onResume() {
         super.onResume();
 //        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
-            tvLocalAddress.setText(AppContext.getInstance().district);
-            addTools();
+        tvLocalAddress.setText(AppContext.getInstance().district);
+        addTools();
 //        }
     }
 
@@ -134,16 +134,16 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.frame_hot1://热门课程
-                if (tvCourse1.getTag()!=null)
-                WebViewActivity.getInstance(getActivity(),tvCourse1.getTag().toString(),-1);
+                if (tvCourse1.getTag() != null)
+                    WebViewActivity.getInstance(getActivity(), tvCourse1.getTag().toString(), -1);
                 break;
             case R.id.frame_hot2:
-                if (tvCourse2.getTag()!=null)
-                WebViewActivity.getInstance(getActivity(),tvCourse2.getTag().toString(),-1);
+                if (tvCourse2.getTag() != null)
+                    WebViewActivity.getInstance(getActivity(), tvCourse2.getTag().toString(), -1);
                 break;
             case R.id.frame_hot3:
-                if (tvCourse3.getTag()!=null)
-                WebViewActivity.getInstance(getActivity(),tvCourse3.getTag().toString(),-1);
+                if (tvCourse3.getTag() != null)
+                    WebViewActivity.getInstance(getActivity(), tvCourse3.getTag().toString(), -1);
                 break;
             case R.id.tvLocalAddress:
 //                AppContext.getInstance().startLocation();
@@ -185,30 +185,27 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     public void getCity(String name) {
         tvLocalAddress.setText(name.split(" ")[2]);
         mPresenter.getTools(layout_control, name.split(" ")[2]);
-        AppContext.getInstance().cityName=name.split(" ")[1];
-        AppContext.getInstance().district=name.split(" ")[2];
+        AppContext.getInstance().cityName = name.split(" ")[1];
+        AppContext.getInstance().district = name.split(" ")[2];
     }
 
     @Override
     public void showTools(List<ToolBean> toolBeanList) {
-
         if (toolBeanList.size() > 0) {
             tvCourse1.setText(toolBeanList.get(0).toolName);
-            GlideUtils.showImg(getActivity(),ivCourse1,toolBeanList.get(0).toolImage);
-
+            GlideUtils.showImg(getActivity(), ivCourse1, toolBeanList.get(0).toolImage);
             tvCourse1.setTag(toolBeanList.get(0).toolUrl);
         }
 
         if (toolBeanList.size() > 1) {
             tvCourse2.setText(toolBeanList.get(1).toolName);
-
-            GlideUtils.showImg(getActivity(),ivCourse2,toolBeanList.get(1).toolImage);
+            GlideUtils.showImg(getActivity(), ivCourse2, toolBeanList.get(1).toolImage);
             tvCourse2.setTag(toolBeanList.get(1).toolUrl);
         }
 
         if (toolBeanList.size() > 2) {
             tvCourse3.setText(toolBeanList.get(2).toolName);
-            GlideUtils.showImg(getActivity(),ivCourse3,toolBeanList.get(2).toolImage);
+            GlideUtils.showImg(getActivity(), ivCourse3, toolBeanList.get(2).toolImage);
             tvCourse3.setTag(toolBeanList.get(2).toolUrl);
         }
     }
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 0847003..b827c28 100644
--- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
+++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -15,9 +14,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.share.mvpsdk.utils.DisplayUtils;
 import com.shunzhi.parent.AppConfig;
-import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
-import com.shunzhi.parent.util.GlideUtils;
 
 
 /**
@@ -84,10 +81,12 @@ public class TextAndImgShowView extends LinearLayout {
 
     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);
+        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);
+        LayoutParams params1 = new LayoutParams(52,52);
+        image.setLayoutParams(params1);
     }
 }
--
libgit2 0.21.0