Commit 0f1ded04 authored by wanglei's avatar wanglei

...

parent 1a49e244
...@@ -11,7 +11,8 @@ class NewsBean( ...@@ -11,7 +11,8 @@ class NewsBean(
val type: Int = 0, val type: Int = 0,
val linkPath: String = "",//网站链接 val linkPath: String = "",//网站链接
) { ) {
var uiType: Int = 0 var uiType: Int = 0//0新闻 1广告
} }
// 栏目类别 0:最新 , 101 :政治, 301:体育 ,娱乐:501 , // 栏目类别 0:最新 , 101 :政治, 301:体育 ,娱乐:501 ,
......
...@@ -27,9 +27,14 @@ class NewsAdapter( ...@@ -27,9 +27,14 @@ class NewsAdapter(
inner class NewsViewHolder(view: View) : ViewHolder(view) inner class NewsViewHolder(view: View) : ViewHolder(view)
override fun getItemViewType(position: Int, list: List<NewsBean>): Int {
return list[position].uiType
}
override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): NewsViewHolder { override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): NewsViewHolder {
return NewsViewHolder(R.layout.item_news.inflate(parent)) var layout = R.layout.item_news
if (viewType==1) layout = R.layout.item_news_ad
return NewsViewHolder(layout.inflate(parent))
} }
override fun onBindViewHolder(holder: NewsViewHolder, position: Int, item: NewsBean?) { override fun onBindViewHolder(holder: NewsViewHolder, position: Int, item: NewsBean?) {
......
...@@ -246,12 +246,14 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -246,12 +246,14 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
} }
} }
binding.ivMore.setOnClickListener { binding.ivMore.setOnClickListener {
val json = getAddedBookmarkJson(currentFragment?.bookmarkBean?.url ?: "")
showWebBrowserMoreDialog( showWebBrowserMoreDialog(
bookmarkAdded = json != null,
bookmarkAction = { bookmarkAction = {
startActivity(Intent(this, BookmarkActivity::class.java)) startActivity(Intent(this, BookmarkActivity::class.java))
}, },
joinAction = { joinAction = {
val json = getAddedBookmarkJson(currentFragment?.bookmarkBean?.url ?: "")
if (json == null) { if (json == null) {
currentFragment?.bookmarkBean?.let { SpBeanUtils.addSpBean(BOOKMARK_SP_KEY, it) } currentFragment?.bookmarkBean?.let { SpBeanUtils.addSpBean(BOOKMARK_SP_KEY, it) }
val dialog = showAddRootBookmarkDialog { val dialog = showAddRootBookmarkDialog {
......
package com.base.browserwhite.ui.views package com.base.browserwhite.ui.views
import android.annotation.SuppressLint
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
...@@ -328,7 +329,9 @@ object DialogViews { ...@@ -328,7 +329,9 @@ object DialogViews {
} }
@SuppressLint("SetTextI18n")
fun Context.showWebBrowserMoreDialog( fun Context.showWebBrowserMoreDialog(
bookmarkAdded: Boolean = false,
bookmarkAction: (() -> Unit)? = null,//打开书签 bookmarkAction: (() -> Unit)? = null,//打开书签
joinAction: (() -> Unit)? = null//加入书签 joinAction: (() -> Unit)? = null//加入书签
) { ) {
...@@ -346,6 +349,11 @@ object DialogViews { ...@@ -346,6 +349,11 @@ object DialogViews {
//展开 //展开
behavior.state = BottomSheetBehavior.STATE_EXPANDED behavior.state = BottomSheetBehavior.STATE_EXPANDED
if (bookmarkAdded) {
binding.ivJoinBookmark.setImageResource(R.mipmap.yijoin)
binding.tvJoinBookmark.text = "Added to\nBookmarks"
}
binding.tvCancel.setOnClickListener { binding.tvCancel.setOnClickListener {
dialog.dismiss() dialog.dismiss()
} }
......
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp"
android:orientation="vertical">
<include layout="@layout/layout_admob_native_download" />
</FrameLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment