diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index d9dbe77..8d63fbb 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -1,15 +1,17 @@ package com.casic.qd.smartwell.view +import android.view.ViewGroup import android.widget.LinearLayout import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import com.casic.qd.smartwell.utils.Constant import com.just.agentweb.AgentWeb import kotlinx.android.synthetic.main.activity_web.* -import kotlinx.android.synthetic.main.include_base_title.* class WebsiteActivity : BaseActivity() { private lateinit var agentWeb: AgentWeb + private lateinit var url: String override fun initLayoutView(): Int = R.layout.activity_web @@ -19,15 +21,46 @@ } override fun initData() { + url = intent.getStringExtra(Constant.INTENT_PARAM)!! agentWeb = AgentWeb.with(this) - .setAgentWebParent(containerView, LinearLayout.LayoutParams(-1, -1)) + .setAgentWebParent( + containerView, + LinearLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT + ) + ) .useDefaultIndicator() + .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) + .interceptUnkownUrl() .createAgentWeb() .ready() - .go("https://www.cnoocengineering.com") + .go(url) + val webView = agentWeb.webCreator.webView + webView.settings.useWideViewPort = true + webView.settings.builtInZoomControls = true + webView.settings.setSupportZoom(true) + webView.settings.displayZoomControls = false + webView.setInitialScale(4) } override fun initEvent() { + rightOptionView.setOnClickListener { + agentWeb.webCreator.webView.loadUrl(url) + } + } + override fun onResume() { + agentWeb.webLifeCycle.onResume() + super.onResume() + } + + override fun onPause() { + agentWeb.webLifeCycle.onPause() + super.onPause() + } + + override fun onDestroy() { + agentWeb.webLifeCycle.onDestroy() + super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index d9dbe77..8d63fbb 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -1,15 +1,17 @@ package com.casic.qd.smartwell.view +import android.view.ViewGroup import android.widget.LinearLayout import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import com.casic.qd.smartwell.utils.Constant import com.just.agentweb.AgentWeb import kotlinx.android.synthetic.main.activity_web.* -import kotlinx.android.synthetic.main.include_base_title.* class WebsiteActivity : BaseActivity() { private lateinit var agentWeb: AgentWeb + private lateinit var url: String override fun initLayoutView(): Int = R.layout.activity_web @@ -19,15 +21,46 @@ } override fun initData() { + url = intent.getStringExtra(Constant.INTENT_PARAM)!! agentWeb = AgentWeb.with(this) - .setAgentWebParent(containerView, LinearLayout.LayoutParams(-1, -1)) + .setAgentWebParent( + containerView, + LinearLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT + ) + ) .useDefaultIndicator() + .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) + .interceptUnkownUrl() .createAgentWeb() .ready() - .go("https://www.cnoocengineering.com") + .go(url) + val webView = agentWeb.webCreator.webView + webView.settings.useWideViewPort = true + webView.settings.builtInZoomControls = true + webView.settings.setSupportZoom(true) + webView.settings.displayZoomControls = false + webView.setInitialScale(4) } override fun initEvent() { + rightOptionView.setOnClickListener { + agentWeb.webCreator.webView.loadUrl(url) + } + } + override fun onResume() { + agentWeb.webLifeCycle.onResume() + super.onResume() + } + + override fun onPause() { + agentWeb.webLifeCycle.onPause() + super.onPause() + } + + override fun onDestroy() { + agentWeb.webLifeCycle.onDestroy() + super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_reload.xml b/app/src/main/res/drawable/ic_reload.xml new file mode 100644 index 0000000..0cd7b0e --- /dev/null +++ b/app/src/main/res/drawable/ic_reload.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt index d9dbe77..8d63fbb 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/WebsiteActivity.kt @@ -1,15 +1,17 @@ package com.casic.qd.smartwell.view +import android.view.ViewGroup import android.widget.LinearLayout import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity +import com.casic.qd.smartwell.utils.Constant import com.just.agentweb.AgentWeb import kotlinx.android.synthetic.main.activity_web.* -import kotlinx.android.synthetic.main.include_base_title.* class WebsiteActivity : BaseActivity() { private lateinit var agentWeb: AgentWeb + private lateinit var url: String override fun initLayoutView(): Int = R.layout.activity_web @@ -19,15 +21,46 @@ } override fun initData() { + url = intent.getStringExtra(Constant.INTENT_PARAM)!! agentWeb = AgentWeb.with(this) - .setAgentWebParent(containerView, LinearLayout.LayoutParams(-1, -1)) + .setAgentWebParent( + containerView, + LinearLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT + ) + ) .useDefaultIndicator() + .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) + .interceptUnkownUrl() .createAgentWeb() .ready() - .go("https://www.cnoocengineering.com") + .go(url) + val webView = agentWeb.webCreator.webView + webView.settings.useWideViewPort = true + webView.settings.builtInZoomControls = true + webView.settings.setSupportZoom(true) + webView.settings.displayZoomControls = false + webView.setInitialScale(4) } override fun initEvent() { + rightOptionView.setOnClickListener { + agentWeb.webCreator.webView.loadUrl(url) + } + } + override fun onResume() { + agentWeb.webLifeCycle.onResume() + super.onResume() + } + + override fun onPause() { + agentWeb.webLifeCycle.onPause() + super.onPause() + } + + override fun onDestroy() { + agentWeb.webLifeCycle.onDestroy() + super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_reload.xml b/app/src/main/res/drawable/ic_reload.xml new file mode 100644 index 0000000..0cd7b0e --- /dev/null +++ b/app/src/main/res/drawable/ic_reload.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml index 1649b21..8e8f091 100644 --- a/app/src/main/res/layout/activity_web.xml +++ b/app/src/main/res/layout/activity_web.xml @@ -4,7 +4,37 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + + + + + + +