diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e98ec0..719698d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e98ec0..719698d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 58e699b..9b64c44 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,8 +2,10 @@ import android.app.Activity import android.content.Context +import android.content.Intent import android.graphics.Color import android.graphics.drawable.Drawable +import android.net.Uri import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan @@ -19,7 +21,6 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity -import com.casic.xz.meterage.view.notice.PreviewDocumentActivity import com.casic.xz.meterage.view.notice.PreviewPdfActivity import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson @@ -38,6 +39,7 @@ import java.util.concurrent.ExecutionException import kotlin.math.abs + /** * String扩展方法 */ @@ -209,7 +211,11 @@ urls.add(this.combineImagePath()) context.navigatePageTo(0, urls) } else { - context.navigatePageTo(this) + //跳转系统自带浏览器，后续操作用户自行决定 + val url = this.combineFilePath() + val uri = Uri.parse(url) + val intent = Intent(Intent.ACTION_VIEW, uri) + context.startActivity(intent) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e98ec0..719698d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 58e699b..9b64c44 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,8 +2,10 @@ import android.app.Activity import android.content.Context +import android.content.Intent import android.graphics.Color import android.graphics.drawable.Drawable +import android.net.Uri import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan @@ -19,7 +21,6 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity -import com.casic.xz.meterage.view.notice.PreviewDocumentActivity import com.casic.xz.meterage.view.notice.PreviewPdfActivity import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson @@ -38,6 +39,7 @@ import java.util.concurrent.ExecutionException import kotlin.math.abs + /** * String扩展方法 */ @@ -209,7 +211,11 @@ urls.add(this.combineImagePath()) context.navigatePageTo(0, urls) } else { - context.navigatePageTo(this) + //跳转系统自带浏览器，后续操作用户自行决定 + val url = this.combineFilePath() + val uri = Uri.parse(url) + val intent = Intent(Intent.ACTION_VIEW, uri) + context.startActivity(intent) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt index 40680e0..fdd4377 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt @@ -4,7 +4,7 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import kotlinx.android.synthetic.main.activity_preview_doc.* +import kotlinx.android.synthetic.main.activity_privacy.* import kotlinx.android.synthetic.main.include_base_title.* class PrivacyActivity : ApplicationBaseActivity() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e98ec0..719698d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 58e699b..9b64c44 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,8 +2,10 @@ import android.app.Activity import android.content.Context +import android.content.Intent import android.graphics.Color import android.graphics.drawable.Drawable +import android.net.Uri import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan @@ -19,7 +21,6 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity -import com.casic.xz.meterage.view.notice.PreviewDocumentActivity import com.casic.xz.meterage.view.notice.PreviewPdfActivity import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson @@ -38,6 +39,7 @@ import java.util.concurrent.ExecutionException import kotlin.math.abs + /** * String扩展方法 */ @@ -209,7 +211,11 @@ urls.add(this.combineImagePath()) context.navigatePageTo(0, urls) } else { - context.navigatePageTo(this) + //跳转系统自带浏览器，后续操作用户自行决定 + val url = this.combineFilePath() + val uri = Uri.parse(url) + val intent = Intent(Intent.ACTION_VIEW, uri) + context.startActivity(intent) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt index 40680e0..fdd4377 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt @@ -4,7 +4,7 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import kotlinx.android.synthetic.main.activity_preview_doc.* +import kotlinx.android.synthetic.main.activity_privacy.* import kotlinx.android.synthetic.main.include_base_title.* class PrivacyActivity : ApplicationBaseActivity() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt deleted file mode 100644 index 2f8159a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.xz.meterage.view.notice - -import android.graphics.Bitmap -import android.util.Log -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.xz.meterage.R -import com.casic.xz.meterage.base.ApplicationBaseActivity -import com.casic.xz.meterage.extensions.combineFilePath -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.gyf.immersionbar.ImmersionBar -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.utils.Constant -import kotlinx.android.synthetic.main.activity_preview_doc.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class PreviewDocumentActivity : ApplicationBaseActivity() { - - private val kTag = "PreviewDocumentActivity" - private lateinit var agentWeb: AgentWeb - - override fun initData() { - val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!! - titleView.text = minioFileName - - val url = minioFileName.combineFilePath() - Log.d(kTag, "initData: $url") - - //转为在线预览DOC - val previewUrl = "https://view.xdocin.com/view?src=${url}" - - agentWeb = AgentWeb.with(this) - .setAgentWebParent( - containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ) - .useDefaultIndicator() - .setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }) - .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(previewUrl) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_preview_doc - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - } - - 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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2e98ec0..719698d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,7 +47,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 58e699b..9b64c44 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,8 +2,10 @@ import android.app.Activity import android.content.Context +import android.content.Intent import android.graphics.Color import android.graphics.drawable.Drawable +import android.net.Uri import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan @@ -19,7 +21,6 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity -import com.casic.xz.meterage.view.notice.PreviewDocumentActivity import com.casic.xz.meterage.view.notice.PreviewPdfActivity import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson @@ -38,6 +39,7 @@ import java.util.concurrent.ExecutionException import kotlin.math.abs + /** * String扩展方法 */ @@ -209,7 +211,11 @@ urls.add(this.combineImagePath()) context.navigatePageTo(0, urls) } else { - context.navigatePageTo(this) + //跳转系统自带浏览器，后续操作用户自行决定 + val url = this.combineFilePath() + val uri = Uri.parse(url) + val intent = Intent(Intent.ACTION_VIEW, uri) + context.startActivity(intent) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt index 40680e0..fdd4377 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/PrivacyActivity.kt @@ -4,7 +4,7 @@ import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar -import kotlinx.android.synthetic.main.activity_preview_doc.* +import kotlinx.android.synthetic.main.activity_privacy.* import kotlinx.android.synthetic.main.include_base_title.* class PrivacyActivity : ApplicationBaseActivity() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt deleted file mode 100644 index 2f8159a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewDocumentActivity.kt +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.xz.meterage.view.notice - -import android.graphics.Bitmap -import android.util.Log -import android.view.ViewGroup -import android.webkit.WebView -import android.widget.LinearLayout -import com.casic.xz.meterage.R -import com.casic.xz.meterage.base.ApplicationBaseActivity -import com.casic.xz.meterage.extensions.combineFilePath -import com.casic.xz.meterage.extensions.initLayoutImmersionBar -import com.gyf.immersionbar.ImmersionBar -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebViewClient -import com.pengxh.kt.lite.utils.Constant -import kotlinx.android.synthetic.main.activity_preview_doc.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class PreviewDocumentActivity : ApplicationBaseActivity() { - - private val kTag = "PreviewDocumentActivity" - private lateinit var agentWeb: AgentWeb - - override fun initData() { - val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!! - titleView.text = minioFileName - - val url = minioFileName.combineFilePath() - Log.d(kTag, "initData: $url") - - //转为在线预览DOC - val previewUrl = "https://view.xdocin.com/view?src=${url}" - - agentWeb = AgentWeb.with(this) - .setAgentWebParent( - containerView, LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT - ) - ) - .useDefaultIndicator() - .setWebViewClient(object : WebViewClient() { - override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - - } - - override fun onPageFinished(view: WebView?, url: String?) { - - } - }) - .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK) - .interceptUnkownUrl() - .createAgentWeb() - .ready() - .go(previewUrl) - val webView = agentWeb.webCreator.webView - webView.settings.useWideViewPort = true - webView.settings.builtInZoomControls = true - webView.settings.setSupportZoom(true) - webView.settings.displayZoomControls = false - } - - override fun initEvent() { - leftBackView.setOnClickListener { finish() } - } - - override fun initLayoutView(): Int = R.layout.activity_preview_doc - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - initLayoutImmersionBar(rootView) - } - - 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/layout/activity_preview_doc.xml b/app/src/main/res/layout/activity_preview_doc.xml deleted file mode 100644 index fbbcde5..0000000 --- a/app/src/main/res/layout/activity_preview_doc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - \ No newline at end of file