Commit 774a06f9 authored by wanglei's avatar wanglei

...

parent db71488a
package com.base.scanqrclear.ui.email package com.base.scanqrclear.ui.email
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
...@@ -12,6 +13,7 @@ import com.base.scanqrclear.bean.EmailUIBean.Companion.createEmailQrString ...@@ -12,6 +13,7 @@ import com.base.scanqrclear.bean.EmailUIBean.Companion.createEmailQrString
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EMAIL import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EMAIL
import com.base.scanqrclear.bean.config.AdConfigBean import com.base.scanqrclear.bean.config.AdConfigBean
import com.base.scanqrclear.databinding.ActivityEmailCodeBinding import com.base.scanqrclear.databinding.ActivityEmailCodeBinding
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
...@@ -110,7 +112,10 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo ...@@ -110,7 +112,10 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo
} }
} }
binding.llPdf.setOnClickListener { binding.llPdf.setOnClickListener {
toast("没实现") startActivity(Intent(this, ExportPdfActivity::class.java).apply {
putExtra("qrType", KEY_EMAIL)
putExtra("qrString", qrString)
})
} }
binding.llDownload.setOnClickListener { binding.llDownload.setOnClickListener {
if (AdConfigBean.adsConfigBean.functionUseShowAd) { if (AdConfigBean.adsConfigBean.functionUseShowAd) {
......
...@@ -11,8 +11,10 @@ import androidx.core.view.updatePadding ...@@ -11,8 +11,10 @@ import androidx.core.view.updatePadding
import com.base.scanqrclear.R import com.base.scanqrclear.R
import com.base.scanqrclear.ads.AdsMgr import com.base.scanqrclear.ads.AdsMgr
import com.base.scanqrclear.base.BaseActivity import com.base.scanqrclear.base.BaseActivity
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_EMAIL
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_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_WIFI import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WIFI
import com.base.scanqrclear.databinding.ActivityExportPdfBinding import com.base.scanqrclear.databinding.ActivityExportPdfBinding
import com.base.scanqrclear.utils.BarUtils import com.base.scanqrclear.utils.BarUtils
...@@ -65,6 +67,26 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP ...@@ -65,6 +67,26 @@ class ExportPdfActivity : BaseActivity<ActivityExportPdfBinding>(ActivityExportP
generateQRCode() generateQRCode()
} }
KEY_EMAIL -> {
pdfQrName = "QR_EMAIL"
binding.tvQrType.text = "QR_EMAIL"
val content = qrString.replace(";", "\n")
binding.tvQr.text = content
qrStringArray = content.split("\n").toTypedArray()
generateQRCode()
}
KEY_WEBSITE -> {
pdfQrName = "QR_URL"
binding.tvQrType.text = "QR_URL"
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.website package com.base.scanqrclear.ui.website
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_WEBSITE
import com.base.scanqrclear.bean.WebsiteUIBean import com.base.scanqrclear.bean.WebsiteUIBean
import com.base.scanqrclear.bean.config.AdConfigBean import com.base.scanqrclear.bean.config.AdConfigBean
import com.base.scanqrclear.databinding.ActivityWebsiteCodeBinding import com.base.scanqrclear.databinding.ActivityWebsiteCodeBinding
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
...@@ -126,6 +129,12 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb ...@@ -126,6 +129,12 @@ class WebsiteCodeActivity : BaseActivity<ActivityWebsiteCodeBinding>(ActivityWeb
toast("No application was found to handle the http view", true) toast("No application was found to handle the http view", true)
} }
} }
binding.llPdf.setOnClickListener {
startActivity(Intent(this, ExportPdfActivity::class.java).apply {
putExtra("qrType", KEY_WEBSITE)
putExtra("qrString", qrString)
})
}
} }
} }
\ No newline at end of file
...@@ -234,7 +234,6 @@ ...@@ -234,7 +234,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
......
...@@ -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