diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/shunzhi/parent/adapter/ContextAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/ContextAdapter.java
deleted file mode 100644
index c8d1abc..0000000
--- a/app/src/main/java/com/shunzhi/parent/adapter/ContextAdapter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.shunzhi.parent.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-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.R;
-import com.shunzhi.parent.bean.channel.ChannelContextBean;
-
-/**
- * Created by lenovo on 2018/3/18.
- */
-
-public class ContextAdapter extends BaseRecyclerViewAdapter {
- Context context;
-
- public ContextAdapter(Context context) {
- this.context = context;
- }
-
-
- @Override
- public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(context).inflate(R.layout.layout_consult_content, null);
- return new MyViewHolder(view);
- }
-
- private class MyViewHolder extends BaseRecyclerViewHolder {
- TextView tvConsultTitle, tvConsultContent, tvPingLunNums, tvZhuanFaNums;
- ImageView iv_consult, image_ad;
- FrameLayout frame_ad;
- LinearLayout normal_content;
-
-
- public MyViewHolder(View view) {
- super(view);
- tvConsultContent = view.findViewById(R.id.tvConsultContent);
- tvConsultTitle = view.findViewById(R.id.tvConsultTitle);
- tvPingLunNums = view.findViewById(R.id.tvPingLunNums);
- tvZhuanFaNums = view.findViewById(R.id.tvZhuanFaNums);
- iv_consult = view.findViewById(R.id.iv_consult);
- frame_ad = view.findViewById(R.id.frame_ad);
- image_ad = view.findViewById(R.id.image_ad);
- normal_content = view.findViewById(R.id.normal_content);
-
- }
-
- @Override
- public void onBindViewHolder(final ChannelContextBean object, int position) {
- if (object.getIsAds() == 1) {
- frame_ad.setVisibility(View.VISIBLE);
- normal_content.setVisibility(View.GONE);
- Glide.with(context).load(object.getImage()).placeholder(R.color.xueqing_blue)
- .into(iv_consult);
- } else {
- frame_ad.setVisibility(View.GONE);
- normal_content.setVisibility(View.VISIBLE);
- tvConsultTitle.setText(object.getTitle());
- tvConsultContent.setText(object.getContent());
- Glide.with(context).load(object.getImage()).placeholder(R.color.xueqing_blue)
- .into(iv_consult);
- }
-
-
- }
-
- }
-
-
-}
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 d54a4a3..58d8c83 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
@@ -6,13 +6,19 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.FrameLayout;
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;
+import com.shunzhi.parent.AppContext;
import com.shunzhi.parent.R;
import com.shunzhi.parent.bean.channel.ChannelContextBean;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
/**
* Created by ToaHanDong on 2018/3/14.
@@ -20,16 +26,16 @@ import com.shunzhi.parent.bean.channel.ChannelContextBean;
public class MyConsultAdapter extends BaseRecyclerViewAdapter {
- private Context mContext=null;
+ private Context mContext = null;
- public MyConsultAdapter(Context context){
- mContext=context;
+ public MyConsultAdapter(Context context) {
+ mContext = context;
}
@Override
public void onAttachedToRecyclerView(RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView);
- LinearLayoutManager layoutManager=new LinearLayoutManager(mContext);
+ LinearLayoutManager layoutManager = new LinearLayoutManager(mContext);
layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
recyclerView.setLayoutManager(layoutManager);
}
@@ -40,25 +46,54 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter{
+ private class MyConsultViewHolder extends BaseRecyclerViewHolder {
TextView tvConsultTitle, tvConsultContent, tvPingLunNums, tvZhuanFaNums;
- ImageView iv_consult;
+ ImageView iv_consult, image_ad;
+ FrameLayout frame_ad;
+ LinearLayout normal_content;
+
public MyConsultViewHolder(View itemView) {
super(itemView);
- tvConsultTitle = itemView.findViewById(R.id.tvConsultTitle);
tvConsultContent = itemView.findViewById(R.id.tvConsultContent);
+ tvConsultTitle = itemView.findViewById(R.id.tvConsultTitle);
tvPingLunNums = itemView.findViewById(R.id.tvPingLunNums);
tvZhuanFaNums = itemView.findViewById(R.id.tvZhuanFaNums);
iv_consult = itemView.findViewById(R.id.iv_consult);
+ frame_ad = itemView.findViewById(R.id.frame_ad);
+ image_ad = itemView.findViewById(R.id.image_ad);
+ normal_content = itemView.findViewById(R.id.normal_content);
}
@Override
- public void onBindViewHolder(ChannelContextBean object, int position) {
- tvConsultContent.setText(object.getContent());
- tvConsultTitle.setText(object.getTitle());
-// tvPingLunNums.setText(object.getForwardingNum());
-// tvZhuanFaNums.setText(object.getTalkNum());
+ public void onBindViewHolder(final ChannelContextBean object, int position) {
+ if (object.getIsAds() == 1) {
+ frame_ad.setVisibility(View.VISIBLE);
+ normal_content.setVisibility(View.GONE);
+ Glide.with(mContext).load(object.getImage()).placeholder(R.color.xueqing_blue)
+ .into(iv_consult);
+ frame_ad.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ WebViewActivity.getInstance(mContext,object.getUrl(), -1);
+ }
+ });
+ } else {
+ frame_ad.setVisibility(View.GONE);
+ normal_content.setVisibility(View.VISIBLE);
+ tvConsultTitle.setText(object.getTitle());
+ tvConsultContent.setText(object.getContent());
+ Glide.with(mContext).load(object.getImage()).placeholder(R.color.xueqing_blue)
+ .into(iv_consult);
+ 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);
+ }
+ });
+ }
+
}
}
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
index f78ca57..fa45705 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/SelectSchoolActivity.java
@@ -71,7 +71,7 @@ public class SelectSchoolActivity extends BaseMVPCompatActivity imgesUrl = new ArrayList<>();
List describeList = new ArrayList<>();
@@ -82,7 +81,6 @@ public class ConsultFragment extends BaseMVPCompatFragment list) {
contextList.addAll(list);
if (contextAdapter == null) {
- contextAdapter = new ContextAdapter(getActivity());
+ contextAdapter = new MyConsultAdapter(getActivity());
contextAdapter.addAll(contextList);
recycler_context.setAdapter(contextAdapter);
} else {
@@ -268,7 +266,7 @@ public class ConsultFragment extends BaseMVPCompatFragment implements View.OnClickListener, ConsultOneContract.IConsultOneView {
@@ -215,9 +213,16 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment