From 8d78127aaf59c1b8eb2813b131c9279668984f0d Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Sat, 24 Mar 2018 09:43:02 +0800
Subject: [PATCH] no message

---
 .idea/modules.xml                                                        |  3 ++-
 app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java       | 11 +++++++----
 app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java |  3 +--
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java     | 23 ++++++++++++++++++++---
 app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java       | 10 ++++++----
 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java       |  2 --
 app/src/main/res/drawable-xhdpi/baogao_back.jpg                          | Bin 0 -> 8835 bytes
 app/src/main/res/layout/fragment_report.xml                              | 15 ++++++++++-----
 8 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/baogao_back.jpg

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 45d1910..051c5c9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,8 +4,9 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
-      <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
       <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />
+      <module fileurl="file://F:\parentwork\parentWorkHolper.iml" filepath="F:\parentwork\parentWorkHolper.iml" />
+      <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
       <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
       <module fileurl="file://$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" filepath="$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" />
     </modules>
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
index 6bc4e78..2d9fc11 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
@@ -3,7 +3,7 @@ package com.shunzhi.parent.adapter;
 import android.content.Context;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,7 +12,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
 import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
 import com.shunzhi.parent.AppConfig;
@@ -90,8 +89,12 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean
                 normal_content.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        WebViewActivity.getInstance(mContext, AppConfig.BASE_URL_ORDER
-                                +"InformationDetail.aspx?id="+object.getId()+"&areaname="+ AppContext.getInstance().district, -1);
+                        if(TextUtils.isEmpty(object.getUrl())) {
+                            WebViewActivity.getInstance(mContext, AppConfig.BASE_URL_ORDER
+                                    + "InformationDetail.aspx?id=" + object.getId() + "&areaname=" + AppContext.getInstance().district, -1);
+                        }else{
+                            WebViewActivity.getInstance(mContext, object.getUrl(), -1);
+                        }
                     }
                 });
             }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
index 4ebe66f..9859ff2 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java
@@ -60,8 +60,7 @@ public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract
             GlideUtils.showImg(this,user_image,url);
 //            Glide.with(this).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_image);
         } else {
-//            Glide.with(this).load(R.drawable.test).centerCrop().into(user_image);
-            GlideUtils.showImg(this,user_image,url);
+            Glide.with(this).load(R.drawable.defphoto).centerCrop().into(user_image);
         }
         user_image.setCornerRadius(20);
         user_image.setOval(true);
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 0c3dd6e..b4b3704 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
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -16,6 +17,7 @@ import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.ToastUtils;
+import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.ToolBean;
@@ -194,19 +196,34 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
         if (toolBeanList.size() > 0) {
             tvCourse1.setText(toolBeanList.get(0).toolName);
             GlideUtils.showImg(getActivity(), ivCourse1, toolBeanList.get(0).toolImage);
-            tvCourse1.setTag(toolBeanList.get(0).toolUrl);
+            if (TextUtils.isEmpty(toolBeanList.get(0).toolUrl)) {
+                tvCourse1.setTag(AppConfig.BASE_URL_ORDER
+                        + "InformationDetail.aspx?id=" + toolBeanList.get(0).toolId + "&areaname=" + AppContext.getInstance().district);
+            } else {
+                tvCourse1.setTag(toolBeanList.get(0).toolUrl);
+            }
         }
 
         if (toolBeanList.size() > 1) {
             tvCourse2.setText(toolBeanList.get(1).toolName);
             GlideUtils.showImg(getActivity(), ivCourse2, toolBeanList.get(1).toolImage);
-            tvCourse2.setTag(toolBeanList.get(1).toolUrl);
+            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);
+            }
         }
 
         if (toolBeanList.size() > 2) {
             tvCourse3.setText(toolBeanList.get(2).toolName);
             GlideUtils.showImg(getActivity(), ivCourse3, toolBeanList.get(2).toolImage);
-            tvCourse3.setTag(toolBeanList.get(2).toolUrl);
+            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);
+            }
         }
     }
 }
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 9e9ed0f..7a31cc4 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
@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
@@ -31,7 +32,7 @@ import com.shunzhi.parent.util.GlideUtils;
 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
         implements MineContract.IMineView, View.OnClickListener {
 
-    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback,top_layout,layout_afterLogin;
+    LinearLayout childlayout, personinfo, layout_orderDetail, layout_order, layout_cache, layout_about, layout_feedback, top_layout, layout_afterLogin;
 
     RoundedImageView user_photo;
     TextView user_name, user_mobile, tvExit, binding_state;
@@ -86,7 +87,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             if (!TextUtils.isEmpty(url)) {
                 GlideUtils.showImg(getContext(), user_photo, url);
             } else {
-                GlideUtils.showImg(getContext(), user_photo, url);
+                Glide.with(getActivity()).load(R.drawable.defphoto).into(user_photo);
                 user_photo.setCornerRadius(20);
             }
             user_photo.setCornerRadius(20);
@@ -100,6 +101,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
 
         } else {
             user_name.setVisibility(View.VISIBLE);
+            user_name.setText("登录/注册");
+            Glide.with(getActivity()).load(R.drawable.user_imge_defult).into(user_photo);
             user_mobile.setVisibility(View.GONE);
             layout_afterLogin.setVisibility(View.GONE);
             tvExit.setVisibility(View.GONE);
@@ -107,7 +110,6 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
     }
 
 
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -185,7 +187,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
             AppConfig.ISLOGIN = false;
             setPersonInfo();
             startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
-            getActivity().finish();
+//            getActivity().finish();
         }
     }
 
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 b827c28..8ed98c6 100644
--- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
+++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -86,7 +86,5 @@ public class TextAndImgShowView extends LinearLayout {
                 DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()
         )) / 4;
         layout.setLayoutParams(params);
-        LayoutParams params1 = new LayoutParams(52,52);
-        image.setLayoutParams(params1);
     }
 }
diff --git a/app/src/main/res/drawable-xhdpi/baogao_back.jpg b/app/src/main/res/drawable-xhdpi/baogao_back.jpg
new file mode 100644
index 0000000..a8733b7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baogao_back.jpg differ
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index bf5d335..601fa2b 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -48,18 +48,23 @@
             android:textColor="@color/textColor"
             android:textSize="@dimen/textSize16" />
     </LinearLayout>
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
 
+    >
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
         android:textSize="@dimen/size_dp_16"
         android:textColor="@color/xueqing_blue"
-        android:text="敬请期待"
-        android:gravity="center"
+        android:background="@drawable/baogao_back"
         android:lineSpacingExtra="@dimen/size_dp_5"
         android:id="@+id/tvNoData"
         />
-
+</RelativeLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
--
libgit2 0.21.0