Commit 6967935633040ffd3ceec906af09684b504e3994
Exists in
yxb_dev
and in
2 other branches
no message
Showing
4 changed files
with
5 additions
and
7 deletions
Show diff stats
app/src/main/AndroidManifest.xml
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
| ... | ... | @@ -19,7 +19,6 @@ import android.widget.TextView; |
| 19 | 19 | import com.share.mvpsdk.base.activity.BaseCompatActivity; |
| 20 | 20 | import com.share.mvpsdk.utils.AppUtils; |
| 21 | 21 | import com.share.mvpsdk.utils.NetworkConnectionUtils; |
| 22 | -import com.share.mvpsdk.utils.ToastUtils; | |
| 23 | 22 | import com.share.mvpsdk.widgets.NestedScrollWebView; |
| 24 | 23 | import com.shunzhi.parent.AppConfig; |
| 25 | 24 | import com.shunzhi.parent.R; |
| ... | ... | @@ -40,7 +39,6 @@ public class WebViewActivity extends BaseCompatActivity { |
| 40 | 39 | Intent intent = new Intent(context, WebViewActivity.class); |
| 41 | 40 | intent.putExtra("url", url); |
| 42 | 41 | intent.putExtra("type", type); |
| 43 | - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); | |
| 44 | 42 | context.startActivity(intent); |
| 45 | 43 | } |
| 46 | 44 | ... | ... |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
| ... | ... | @@ -15,7 +15,6 @@ import android.widget.ImageView; |
| 15 | 15 | import android.widget.LinearLayout; |
| 16 | 16 | import android.widget.TextView; |
| 17 | 17 | |
| 18 | -import com.bumptech.glide.Glide; | |
| 19 | 18 | import com.jcodecraeer.xrecyclerview.XRecyclerView; |
| 20 | 19 | import com.share.mvpsdk.base.BasePresenter; |
| 21 | 20 | import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; |
| ... | ... | @@ -55,6 +54,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu |
| 55 | 54 | |
| 56 | 55 | List<String> imgesUrl = new ArrayList<>(); |
| 57 | 56 | List<String> describeList = new ArrayList<>(); |
| 57 | + List<GuangGaoBean> guanggaoList = new ArrayList<>(); | |
| 58 | 58 | List<ChannelContextBean> contextList = new ArrayList<>(); |
| 59 | 59 | |
| 60 | 60 | JZVideoPlayerStandard videoplayer; |
| ... | ... | @@ -214,6 +214,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu |
| 214 | 214 | public void showBanners(List<GuangGaoBean> guangGaoBeanList) { |
| 215 | 215 | describeList.clear(); |
| 216 | 216 | imgesUrl.clear(); |
| 217 | + guanggaoList=guangGaoBeanList; | |
| 217 | 218 | for (int i = 0; i < guangGaoBeanList.size(); i++) { |
| 218 | 219 | imgesUrl.add(AppConfig.BASE_URL_FILE + guangGaoBeanList.get(i).fileSrc); |
| 219 | 220 | describeList.add(guangGaoBeanList.get(i).describe); | ... | ... |
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
| ... | ... | @@ -6,7 +6,6 @@ import android.support.annotation.Nullable; |
| 6 | 6 | import android.support.v7.widget.LinearLayoutManager; |
| 7 | 7 | import android.support.v7.widget.RecyclerView; |
| 8 | 8 | import android.text.TextUtils; |
| 9 | -import android.util.Log; | |
| 10 | 9 | import android.view.LayoutInflater; |
| 11 | 10 | import android.view.View; |
| 12 | 11 | import android.view.ViewGroup; |
| ... | ... | @@ -223,13 +222,14 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon |
| 223 | 222 | } |
| 224 | 223 | |
| 225 | 224 | @Override |
| 226 | - public void onBindViewHolder(final GuangGaoBean object, int position) { | |
| 225 | + public void onBindViewHolder(final GuangGaoBean object, final int position) { | |
| 227 | 226 | GlideUtils.showImg(mContext, iv_grally, object.fileSrc); |
| 228 | 227 | tv_grally_title.setText(object.describe + ""); |
| 229 | 228 | iv_grally.setOnClickListener(new View.OnClickListener() { |
| 230 | 229 | @Override |
| 231 | 230 | public void onClick(View v) { |
| 232 | - WebViewActivity.getInstance(mContext, object.url, -1); | |
| 231 | +// WebViewActivity.getInstance(mContext, object.url, -1); | |
| 232 | + WebViewActivity.getInstance(getActivity(), object.url, -1); | |
| 233 | 233 | } |
| 234 | 234 | }); |
| 235 | 235 | } | ... | ... |