Commit 2e34f6fa authored by wanglei's avatar wanglei

...

parent 150896f2
...@@ -15,6 +15,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_CONTACT ...@@ -15,6 +15,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_CONTACT
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EMAIL import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EMAIL
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EVENT import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EVENT
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_PRODUCT import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_PRODUCT
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_TELEPHONE
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_TEXT import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_TEXT
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WEBSITE import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WEBSITE
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WIFI import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WIFI
...@@ -108,6 +109,15 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP ...@@ -108,6 +109,15 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP
generateQRCode(0.4f, 2.5f) generateQRCode(0.4f, 2.5f)
} }
KEY_TELEPHONE -> {
pdfQrName = "QR_TELEPHONE"
binding.tvQrType.text = "QR_TELEPHONE"
binding.tvQr.text = qrString
qrStringArray = arrayOf(qrString)
generateQRCode()
}
KEY_PRODUCT -> { KEY_PRODUCT -> {
pdfQrName = "QR_PRODUCT" pdfQrName = "QR_PRODUCT"
binding.tvQrType.text = "QR_PRODUCT" binding.tvQrType.text = "QR_PRODUCT"
...@@ -156,7 +166,7 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP ...@@ -156,7 +166,7 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP
true true
) )
val flag = generatePdfWithTextAndImage(tempPdf, scaledBitmap, qrType, qrStringArray, imageYRate) val flag = generatePdfWithTextAndImage(tempPdf, scaledBitmap, pdfQrName, qrStringArray, imageYRate)
if (flag) { if (flag) {
LogEx.logDebug(TAG, "${tempPdf.absoluteFile}") LogEx.logDebug(TAG, "${tempPdf.absoluteFile}")
pdfTempFile = tempPdf pdfTempFile = tempPdf
......
package com.base.scanqrclear.ui.telephone package com.base.scanqrclear.ui.telephone
import android.Manifest import android.Manifest
import android.content.Intent
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
...@@ -9,9 +10,11 @@ import com.base.scanqrclear.ads.AdsMgr ...@@ -9,9 +10,11 @@ import com.base.scanqrclear.ads.AdsMgr
import com.base.scanqrclear.ads.AdsShowCallBack import com.base.scanqrclear.ads.AdsShowCallBack
import com.base.scanqrclear.base.BaseActivity import com.base.scanqrclear.base.BaseActivity
import com.base.scanqrclear.bean.FunctionUIBean import com.base.scanqrclear.bean.FunctionUIBean
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_TELEPHONE
import com.base.scanqrclear.bean.TelephoneUIBean import com.base.scanqrclear.bean.TelephoneUIBean
import com.base.scanqrclear.bean.config.AdConfigBean import com.base.scanqrclear.bean.config.AdConfigBean
import com.base.scanqrclear.databinding.ActivityTelephoneCodeBinding import com.base.scanqrclear.databinding.ActivityTelephoneCodeBinding
import com.base.scanqrclear.ui.exportpdf.ExportPdfActivity
import com.base.scanqrclear.ui.vm.QrViewModel import com.base.scanqrclear.ui.vm.QrViewModel
import com.base.scanqrclear.ui.widget.InputNameDialog.showInputNameDialog import com.base.scanqrclear.ui.widget.InputNameDialog.showInputNameDialog
import com.base.scanqrclear.utils.BarUtils import com.base.scanqrclear.utils.BarUtils
...@@ -176,6 +179,12 @@ class TelephoneCodeActivity : BaseActivity<ActivityTelephoneCodeBinding>(Activit ...@@ -176,6 +179,12 @@ class TelephoneCodeActivity : BaseActivity<ActivityTelephoneCodeBinding>(Activit
} }
} }
} }
binding.llPdf.setOnClickListener {
startActivity(Intent(this, ExportPdfActivity::class.java).apply {
putExtra("qrType", KEY_TELEPHONE)
putExtra("qrString", qrString)
})
}
} }
private fun callPhone() { private fun callPhone() {
......
...@@ -209,7 +209,6 @@ ...@@ -209,7 +209,6 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<ImageView <ImageView
......
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