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 @@
-
+
+
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 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
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
+
-
+