Commit ad6c1732 authored by wanglei's avatar wanglei

...

parent b2e88f7d
......@@ -6,7 +6,6 @@
android:name="android.hardware.camera"
android:required="false" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
......@@ -37,6 +36,12 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.activity.news.NewsDetailActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".ui.activity.SplashActivity"
android:exported="false"
......
package com.base.browserwhite.ui.activity.news
import android.graphics.Color
import androidx.activity.addCallback
import androidx.core.view.updatePadding
import androidx.fragment.app.FragmentTransaction
import com.base.browserwhite.R
import com.base.browserwhite.databinding.ActivityNewsDetailBinding
import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.fragment.WebViewFragment
import com.base.browserwhite.utils.BarUtils
class NewsDetailActivity : BaseActivity<ActivityNewsDetailBinding>() {
override val binding: ActivityNewsDetailBinding by lazy {
ActivityNewsDetailBinding.inflate(layoutInflater)
}
private var currentFragment: WebViewFragment? = null
override fun initView() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
val url = intent.extras?.getString("url") ?: ""
addNewWebSite(url)
}
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback {
finishToMain()
}
binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
}
private fun addNewWebSite(uri: String) {
val myFragment = WebViewFragment(uri)
val transaction: FragmentTransaction = supportFragmentManager.beginTransaction()
transaction.replace(R.id.container, myFragment)
transaction.commit()
currentFragment = myFragment
}
}
\ No newline at end of file
......@@ -34,8 +34,8 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
val uri = intent.extras?.getString("url") ?: ""
binding.editWeb.setText(uri)
val url = intent.extras?.getString("url") ?: ""
binding.editWeb.setText(url)
val searchEngine = intent.extras?.getString("searchEngine") ?: GOOGLE
when (searchEngine) {
......@@ -71,7 +71,7 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
}
addNewWebSite(uri)
addNewWebSite(url)
}
......
......@@ -18,6 +18,7 @@ import com.base.browserwhite.bean.webSiteGroupBeanList
import com.base.browserwhite.databinding.FragmentHomeBinding
import com.base.browserwhite.service.StayNotificationService.Companion.restartStartStayNotification
import com.base.browserwhite.ui.activity.cleanjunk.ScanJunkActivity
import com.base.browserwhite.ui.activity.news.NewsDetailActivity
import com.base.browserwhite.ui.activity.scanqrc.ScanQRCActivity
import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
import com.base.browserwhite.ui.adapter.HeadWebsiteAdapter
......@@ -55,7 +56,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
newsAdapter = NewsAdapter { url ->
requireContext().startActivity(Intent(requireContext(), WebBrowserActivity::class.java).apply {
requireContext().startActivity(Intent(requireContext(), NewsDetailActivity::class.java).apply {
putExtra("url", url)
})
}
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activity.news.NewsDetailActivity">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/fl_fanhui"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="15dp"
tools:ignore="UselessParent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/h_fanhui"
tools:ignore="ContentDescription" />
</FrameLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
\ 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