From 935f129cf1a7e76c7ef8ed3b48c1956a698fcdfc Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Thu, 22 Mar 2018 18:17:25 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                                      | 1 -
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java       | 2 --
 app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java                 | 5 +++--
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java | 8 ++++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a2a12c..3ac22ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -173,7 +173,6 @@
 
         <activity
             android:name=".ui.activity.mywebview.WebViewActivity"
-            android:launchMode="singleInstance"
             android:screenOrientation="portrait" />
 
         <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
index fdb4463..b740c4b 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -19,7 +19,6 @@ import android.widget.TextView;
 import com.share.mvpsdk.base.activity.BaseCompatActivity;
 import com.share.mvpsdk.utils.AppUtils;
 import com.share.mvpsdk.utils.NetworkConnectionUtils;
-import com.share.mvpsdk.utils.ToastUtils;
 import com.share.mvpsdk.widgets.NestedScrollWebView;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
@@ -40,7 +39,6 @@ public class WebViewActivity extends BaseCompatActivity {
         Intent intent = new Intent(context, WebViewActivity.class);
         intent.putExtra("url", url);
         intent.putExtra("type", type);
-        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         context.startActivity(intent);
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index 7e5da96..c8b70d2 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -15,7 +15,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
@@ -55,6 +54,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
 
     List<String> imgesUrl = new ArrayList<>();
     List<String> describeList = new ArrayList<>();
+    List<GuangGaoBean> guanggaoList = new ArrayList<>();
     List<ChannelContextBean> contextList = new ArrayList<>();
 
     JZVideoPlayerStandard videoplayer;
@@ -140,7 +140,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() {
             @Override
             public void onItemClick(XBanner banner, int position) {
-                WebViewActivity.getInstance(getContext(), describeList.get(position), -1);
+                WebViewActivity.getInstance(getContext(), guanggaoList.get(position).url, -1);
             }
         });
 
@@ -215,6 +215,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     public void showBanners(List<GuangGaoBean> guangGaoBeanList) {
         describeList.clear();
         imgesUrl.clear();
+        guanggaoList=guangGaoBeanList;
         for (int i = 0; i < guangGaoBeanList.size(); i++) {
             imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc);
             describeList.add(guangGaoBeanList.get(i).describe);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
index 1ef9a6f..e85e7dd 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
@@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -97,7 +96,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
         pageIndex = 1;
         mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel), 0, pageIndex);
 
-        mPresenter.getBanners("4", AppContext.getInstance().district);
+        mPresenter.getBanners("3", AppContext.getInstance().district);
 
     }
 
@@ -223,13 +222,14 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
             }
 
             @Override
-            public void onBindViewHolder(final GuangGaoBean object, int position) {
+            public void onBindViewHolder(final GuangGaoBean object, final int position) {
                 GlideUtils.showImg(mContext, iv_grally, object.fileSrc);
                 tv_grally_title.setText(object.describe + "");
                 iv_grally.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        WebViewActivity.getInstance(mContext, object.url, -1);
+//                        WebViewActivity.getInstance(mContext, object.url, -1);
+                        WebViewActivity.getInstance(getActivity(), object.url, -1);
                     }
                 });
             }
--
libgit2 0.21.0