diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt index e09120a4..69b13e0d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt @@ -2,11 +2,14 @@ package es.verdnatura.presentation.view.feature.controlador.fragment import android.content.Context +import android.content.Intent import android.graphics.drawable.Drawable +import android.net.Uri import android.os.Build import android.print.PrintAttributes import android.print.PrintManager import android.webkit.WebChromeClient +import android.webkit.WebSettings import android.webkit.WebView import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager @@ -42,7 +45,7 @@ class WebFragment( private fun setWeb() { - binding.webView.setWebChromeClient(WebChromeClient()) + binding.webView.webChromeClient = WebChromeClient() //binding.webView.getSettings (). setJavaScriptEnabled (true) // sergio:deprecated @@ -55,12 +58,20 @@ class WebFragment( webSettings.builtInZoomControls = true webSettings.displayZoomControls = false webSettings.setSupportZoom(true) + webSettings.allowFileAccess = true //webSettings.defaultTextEncodingName = "utf-8" var dataScanned = JSONObject(entryPoint) - binding.webView.loadUrl(dataScanned.get("web").toString()) + if (dataScanned.toString().contains("cmr?")){ + val pdfUrl = "${dataScanned.get("web")}" + val googleDocsViewerUrl = "https://docs.google.com/gview?embedded=true&url=$pdfUrl" + binding.webView.loadUrl(googleDocsViewerUrl) + }else{ + binding.webView.loadUrl(dataScanned.get("web").toString()) + } + } private fun setToolbar() { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt index cfb816e8..f0c896ba 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt @@ -19,8 +19,8 @@ class CmrExpeditionPalletViewModel(val context: Context) : BaseViewModel(context get() = _responsescan - fun cmrExpeditionPallet_add(vExpeditionPallet: Int, vCmrId: Int) { - silex.cmrExpeditionPallet_add(vExpeditionPallet, vCmrId) + fun cmrExpeditionPallet_add(vExpeditionPallet: Int, cmrFk: Int) { + silex.cmrExpeditionPallet_add(vExpeditionPallet, cmrFk) .enqueue(object : SilexCallback(context) { override fun onError(t: Throwable) { _responsescan.value = ResponseItemVO(