diff --git a/app/src/main/java/com/nova/brain/glass/ui/FoActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/FoActivity.kt index 2234bef..7248404 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/FoActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/FoActivity.kt @@ -1,13 +1,12 @@ package com.nova.brain.glass.ui import android.os.Build -import android.text.Html -import android.text.Html.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE import com.nova.brain.glass.R import com.nova.brain.glass.databinding.ActivityFoBinding import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdServiceHelper import com.xuqm.base.ui.BaseActivity +import com.xuqm.base.web.XWebViewHelper class FoActivity : BaseActivity() { override fun getLayoutId(): Int =R.layout.activity_fo @@ -25,8 +24,19 @@ class FoActivity : BaseActivity() { } override fun initData() { super.initData() - val html = "加粗

换行

h1

" - binding.content.text = Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY) + val html = "

合格证操作

自动下料

记录操作规程版次：CD1386版次

下料机编号：


1、辅料准备

 材料名称

 CPM号

 揩布 6520
 轻质白棉纱手套 2714
 不溶解彩色标记铅笔 8237
 标记墨水笔 8247
 标记笔 8248


2、自动下料

采用自动下料机下料，检查材料是否符合FO的要求，按照复合材料零件自动下料操作规程CD1386进行下料。下好的料片应标记图号缩写、层号、方向。

记录下料信息如下：


具体信息请填写动态表格

记录下料总长度m 


3、按需回库 

若已经下好的料片需要回库冷藏请勾选该项。

按照M-W963SY147进行密封回库，并标记 FO系列号及零件号。使用 SAMC12-183记录回库及出库信息并上传至生产记录。低温储存材料如需回库，后续根据生产需求按需出库解冻。领出后需按照M-W963SY147要求解冻后方可继续使用。


制造依据：

编号名称版次
M-W963SY147非热压罐固化的碳纤维增强环氧树脂预浸料M56材料预鉴定试验件制造与检测要求C




" + val styledHtml = """${html}""" + with(binding.content) { + settings.javaScriptEnabled = false + settings.builtInZoomControls = false + settings.setSupportZoom(false) + setBackgroundColor(android.graphics.Color.TRANSPARENT) + loadDataWithBaseURL(null, styledHtml, "text/html", "UTF-8", null) + } + } override fun onResume() { diff --git a/app/src/main/res/layout/activity_fo.xml b/app/src/main/res/layout/activity_fo.xml index 1151459..58d80a6 100644 --- a/app/src/main/res/layout/activity_fo.xml +++ b/app/src/main/res/layout/activity_fo.xml @@ -18,15 +18,12 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - diff --git a/base/src/main/java/com/xuqm/base/web/XWebViewActivity.kt b/base/src/main/java/com/xuqm/base/web/XWebViewActivity.kt index f08dfd5..5f3ba75 100644 --- a/base/src/main/java/com/xuqm/base/web/XWebViewActivity.kt +++ b/base/src/main/java/com/xuqm/base/web/XWebViewActivity.kt @@ -22,6 +22,7 @@ import com.xuqm.base.R import com.xuqm.base.common.FileHelper import com.xuqm.base.common.GlideEngine import com.xuqm.base.common.LogHelper +import com.xuqm.base.common.ToolsHelper import com.xuqm.base.databinding.ActivityXWebviewBinding import com.xuqm.base.extensions.loge import com.xuqm.base.extensions.runWithPermission @@ -33,6 +34,7 @@ import java.io.File class XWebViewActivity : BaseActivity() { private lateinit var title: String private lateinit var url: String + private lateinit var content: String private var hasTopBar: Boolean = true @@ -85,6 +87,7 @@ class XWebViewActivity : BaseActivity() { intent?.apply { title = getStringExtra("title") ?: "" url = getStringExtra("url") ?: "" + content = getStringExtra("content") ?: "" } viewModel.title.observe(this) { @@ -111,7 +114,11 @@ class XWebViewActivity : BaseActivity() { LogHelper.e("lateInitView") LogHelper.e(url) setTitleText(title) - binding.XWebView.loadUrl(url) + if (ToolsHelper.isNull(url)){ + binding.XWebView.loadData(content, "text/html", "utf-8") + }else{ + binding.XWebView.loadUrl(url) + } } diff --git a/base/src/main/java/com/xuqm/base/web/XWebViewHelper.kt b/base/src/main/java/com/xuqm/base/web/XWebViewHelper.kt index f21737d..a6bf8b0 100644 --- a/base/src/main/java/com/xuqm/base/web/XWebViewHelper.kt +++ b/base/src/main/java/com/xuqm/base/web/XWebViewHelper.kt @@ -19,4 +19,11 @@ object XWebViewHelper { } context.startActivity(intent) } + fun startWebNoTopBarForContent(context: Context, content: String) { + val intent: Intent = Intent(context, XWebViewActivity::class.java).apply { + putExtra("content", content) + putExtra("hasTopBar", false) + } + context.startActivity(intent) + } } \ No newline at end of file diff --git a/base/src/main/res/layout/activity_x_webview.xml b/base/src/main/res/layout/activity_x_webview.xml index 6d37225..2906293 100644 --- a/base/src/main/res/layout/activity_x_webview.xml +++ b/base/src/main/res/layout/activity_x_webview.xml @@ -5,6 +5,7 @@ @@ -20,6 +21,7 @@ android:id="@+id/X_webView" android:layout_width="match_parent" android:layout_height="0dp" + android:background="@color/app_color_black" app:layout_constraintTop_toBottomOf="@id/X_progressBar" app:layout_constraintBottom_toBottomOf="parent"/>