Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

陶汉栋
2 parents 34523b04 3808bda7
Showing 1 changed file with 29 additions and 21 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
@@ -10,6 +10,7 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -47,6 +48,7 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     LinearLayout layout_control;
     CityPicker cityPicker = null;
+    FrameLayout frame_zxxl, frame_xqjc;
     @Override
     public int getLayoutId() {
@@ -55,7 +57,10 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
-
+        frame_xqjc = view.findViewById(R.id.frame_xqjc);
+        frame_xqjc.setOnClickListener(this);
+        frame_zxxl = view.findViewById(R.id.frame_zxxl);
+        frame_zxxl.setOnClickListener(this);
         ivCamera = view.findViewById(R.id.ivCamera);
         tvLocalAddress = view.findViewById(R.id.tvLocalAddress);
         textAndImg_xqjc = view.findViewById(R.id.textAndImg_xqjc);
@@ -94,7 +99,7 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     private void addTools(String districtName) {
         layout_control.measure(0, 0);
-        mPresenter.getTools(layout_control,districtName );
+        mPresenter.getTools(layout_control, districtName);
     }
@@ -152,10 +157,10 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
             case R.id.ivCamera:
                 ToastUtils.showToast("功能暂不开放");
                 break;
-            case R.id.textAndImg_xqjc:
+            case R.id.frame_xqjc:
                 ToastUtils.showToast("功能暂不开放");
                 break;
-            case R.id.textAndImg_zxlx:
+            case R.id.frame_zxxl:
                 ToastUtils.showToast("功能暂不开放");
                 break;
             default:
@@ -192,7 +197,7 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
     public void showTools(List<ToolBean> toolBeanList) {
         if (toolBeanList.size() > 0) {
             tvCourse1.setText(toolBeanList.get(0).toolName);
-            GlideUtils.showImgWithDefaule(getActivity(), ivCourse1, toolBeanList.get(0).toolImage,R.drawable.activite1);
+            GlideUtils.showImgWithDefaule(getActivity(), ivCourse1, toolBeanList.get(0).toolImage, R.drawable.activite1);
             if (TextUtils.isEmpty(toolBeanList.get(0).toolUrl)) {
                 tvCourse1.setTag(AppConfig.BASE_URL_ORDER
                         + "InformationDetail.aspx?id=" + toolBeanList.get(0).toolId + "&areaname=" + AppContext.getInstance().district);
@@ -203,28 +208,31 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
         if (toolBeanList.size() > 1) {
             tvCourse2.setText(toolBeanList.get(1).toolName);
-            GlideUtils.showImgWithDefaule(getActivity(), ivCourse2, toolBeanList.get(1).toolImage,R.drawable.activite2);
+            GlideUtils.showImgWithDefaule(getActivity(), ivCourse2, toolBeanList.get(1).toolImage, R.drawable.activite2);
             if (TextUtils.isEmpty(toolBeanList.get(1).toolUrl)) {
-                tvCourse1.setTag(AppConfig.BASE_URL_ORDER
-                        + "InformationDetail.aspx?id=" + toolBeanList.get(1).toolId + "&areaname=" + AppContext.getInstance().district);
-            } else {
-                tvCourse1.setTag(toolBeanList.get(1).toolUrl);
-            }
+            tvCourse2.setTag(AppConfig.BASE_URL_ORDER
+                    + "InformationDetail.aspx?id=" + toolBeanList.get(1).toolId + "&areaname=" + AppContext.getInstance().district);
+        } else {
+            tvCourse2.setTag(toolBeanList.get(1).toolUrl);
         }
+    }
-        if (toolBeanList.size() > 2) {
-            tvCourse3.setText(toolBeanList.get(2).toolName);
-            GlideUtils.showImgWithDefaule(getActivity(), ivCourse3, toolBeanList.get(2).toolImage,R.drawable.activite3);
-            if (TextUtils.isEmpty(toolBeanList.get(2).toolUrl)) {
-                tvCourse1.setTag(AppConfig.BASE_URL_ORDER
-                        + "InformationDetail.aspx?id=" + toolBeanList.get(2).toolId + "&areaname=" + AppContext.getInstance().district);
-            } else {
-                tvCourse1.setTag(toolBeanList.get(2).toolUrl);
-            }
+        if(toolBeanList.size()>2)
+
+    {
+        tvCourse3.setText(toolBeanList.get(2).toolName);
+        GlideUtils.showImgWithDefaule(getActivity(), ivCourse3, toolBeanList.get(2).toolImage, R.drawable.activite3);
+        if (TextUtils.isEmpty(toolBeanList.get(2).toolUrl)) {
+            tvCourse3.setTag(AppConfig.BASE_URL_ORDER
+                    + "InformationDetail.aspx?id=" + toolBeanList.get(2).toolId + "&areaname=" + AppContext.getInstance().district);
+        } else {
+            tvCourse3.setTag(toolBeanList.get(2).toolUrl);
         }
     }
-    public void refresh(){
+}
+
+    public void refresh() {
         addTools(AppContext.getInstance().district);
     }
 }