Commit 47b0ec03 authored by wanglei's avatar wanglei

...

parent 2e34f6fa
...@@ -14,6 +14,7 @@ import com.base.scanqrclear.base.BaseActivity ...@@ -14,6 +14,7 @@ import com.base.scanqrclear.base.BaseActivity
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_CONTACT 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_MESSAGE
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_TELEPHONE
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_TEXT import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_TEXT
...@@ -118,6 +119,15 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP ...@@ -118,6 +119,15 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP
generateQRCode() generateQRCode()
} }
KEY_MESSAGE -> {
pdfQrName = "QR_MESSAGE"
binding.tvQrType.text = "QR_MESSAGE"
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"
......
package com.base.scanqrclear.ui.message package com.base.scanqrclear.ui.message
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
...@@ -8,9 +9,11 @@ import com.base.scanqrclear.ads.AdsMgr ...@@ -8,9 +9,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_MESSAGE
import com.base.scanqrclear.bean.MessageUIBean import com.base.scanqrclear.bean.MessageUIBean
import com.base.scanqrclear.bean.config.AdConfigBean import com.base.scanqrclear.bean.config.AdConfigBean
import com.base.scanqrclear.databinding.ActivityMessageCodeBinding import com.base.scanqrclear.databinding.ActivityMessageCodeBinding
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
...@@ -107,7 +110,10 @@ class MessageCodeActivity : BaseActivity<ActivityMessageCodeBinding>(ActivityMes ...@@ -107,7 +110,10 @@ class MessageCodeActivity : BaseActivity<ActivityMessageCodeBinding>(ActivityMes
} }
} }
binding.llPdf.setOnClickListener { binding.llPdf.setOnClickListener {
toast("没实现") startActivity(Intent(this, ExportPdfActivity::class.java).apply {
putExtra("qrType", KEY_MESSAGE)
putExtra("qrString", qrString)
})
} }
binding.llDownload.setOnClickListener { binding.llDownload.setOnClickListener {
if (AdConfigBean.adsConfigBean.functionUseShowAd) { if (AdConfigBean.adsConfigBean.functionUseShowAd) {
......
...@@ -233,7 +233,6 @@ ...@@ -233,7 +233,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