Commit d56ba35a authored by wanglei's avatar wanglei

...

parent 9ba560cb
......@@ -22,6 +22,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_PAYPAL
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_SPOTIFY
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WHATSAPP
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_X
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_YOUTUBE
import com.base.scanqrclear.bean.InstagramUIBean
import com.base.scanqrclear.bean.InstagramUIBean.Companion.createInstagramQrString
import com.base.scanqrclear.bean.OpenFoodBean
......@@ -34,6 +35,8 @@ import com.base.scanqrclear.bean.WhatsappUIBean
import com.base.scanqrclear.bean.WhatsappUIBean.Companion.createWhatsappQrString
import com.base.scanqrclear.bean.XUIBean
import com.base.scanqrclear.bean.XUIBean.Companion.createXUIBeanQrString
import com.base.scanqrclear.bean.YoutubeUIBean
import com.base.scanqrclear.bean.YoutubeUIBean.Companion.createYoutubeQrString
import com.base.scanqrclear.databinding.ActivityQrResultsBinding
import com.base.scanqrclear.utils.BarUtils
import com.base.scanqrclear.utils.BitmapUtils.saveBitmapToFile
......@@ -82,6 +85,16 @@ class QrResultsActivity : BaseActivity<ActivityQrResultsBinding>(ActivityQrResul
generateEAN()
}
KEY_YOUTUBE -> {
bean = Gson().fromJson(data, YoutubeUIBean::class.java)
qrString = (bean as YoutubeUIBean).createYoutubeQrString()
binding.ivQrIcon.setImageResource(R.mipmap.h_youtube)
binding.tvQrTypeTitle.text = "Youtube"
qrTitle = "Content:"
createNormalContent()
generateQR()
}
KEY_WHATSAPP -> {
bean = Gson().fromJson(data, WhatsappUIBean::class.java)
qrString = (bean as WhatsappUIBean).createWhatsappQrString()
......
......@@ -29,6 +29,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_PAYPAL
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_SPOTIFY
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WHATSAPP
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_X
import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_YOUTUBE
import com.base.scanqrclear.bean.InstagramUIBean.Companion.createInstagramUIBean
import com.base.scanqrclear.bean.InstagramUIBean.Companion.isInstagramQR
import com.base.scanqrclear.bean.MessageUIBean.Companion.createMessageBean
......@@ -52,6 +53,8 @@ import com.base.scanqrclear.bean.WifiUIBean.Companion.createWifiBean
import com.base.scanqrclear.bean.WifiUIBean.Companion.isWifiQR
import com.base.scanqrclear.bean.XUIBean.Companion.createXUIBean
import com.base.scanqrclear.bean.XUIBean.Companion.isXUIBeanQR
import com.base.scanqrclear.bean.YoutubeUIBean.Companion.createYoutubeUIBean
import com.base.scanqrclear.bean.YoutubeUIBean.Companion.isYoutubeUIBeanQR
import com.base.scanqrclear.databinding.FragmentScanBinding
import com.base.scanqrclear.qr.QRImageAnalyzer
import com.base.scanqrclear.qr.QrResultsActivity
......@@ -322,6 +325,25 @@ class ScanFragment : BaseFragment<FragmentScanBinding>(FragmentScanBinding::infl
return
}
if (isYoutubeUIBeanQR(qrCodeValue)) {
if (scanJump.get()) return
scanJump.set(true)
AdsMgr.showInsert(activity, true, object : AdsShowCallBack() {
override fun close(where: Int) {
jumpQrResultsActivity(activity, qrCodeValue, KEY_YOUTUBE)
}
override fun failed(where: Int) {
jumpQrResultsActivity(activity, qrCodeValue, KEY_YOUTUBE)
}
override fun googleFailed(where: Int) {
jumpQrResultsActivity(activity, qrCodeValue, KEY_YOUTUBE)
}
})
return
}
if (isWebsiteQR(qrCodeValue)) {
if (scanJump.get()) return
scanJump.set(true)
......@@ -436,8 +458,6 @@ class ScanFragment : BaseFragment<FragmentScanBinding>(FragmentScanBinding::infl
return
}
if (valueType == Barcode.TYPE_TEXT) {
if (scanJump.get()) return
scanJump.set(true)
......@@ -490,6 +510,7 @@ class ScanFragment : BaseFragment<FragmentScanBinding>(FragmentScanBinding::infl
KEY_X -> createXUIBean(qrCodeValue)
KEY_SPOTIFY -> createSpotifyUIBean(qrCodeValue)
KEY_PAYPAL -> createPaypalUIBean(qrCodeValue)
KEY_YOUTUBE -> createYoutubeUIBean(qrCodeValue)
KEY_FOOD -> otherScanBean
else -> ScanBean()
}
......
......@@ -85,7 +85,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="10dp"
android:visibility="visible"
android:visibility="gone"
app:cardCornerRadius="5dp"
app:cardElevation="0dp">
......@@ -365,13 +365,13 @@
android:layout_marginHorizontal="14dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="10dp"
android:text="Phone number:whatsapp://send?phone=+8617608923756"
android:textColor="#666666"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/llOperation2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivQrIcon" />
app:layout_constraintTop_toBottomOf="@id/ivQrIcon"
tools:text="Phone number:whatsapp://send?phone=+8617608923756" />
<LinearLayout
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:id="@+id/container"
android:name="com.base.scanqrclear.ui.main.ScanFragment"
android:layout_height="match_parent"/>
\ No newline at end of file
android:layout_width="match_parent"
android:layout_height="match_parent" />
\ No newline at end of file
......@@ -48,7 +48,7 @@
android:clickable="true"
android:focusable="true"
android:padding="8dp"
tools:ignore="UselessParent">
tools:ignore="UselessParent,SpeakableTextPresentCheck,TouchTargetSizeCheck">
<ImageView
android:layout_width="wrap_content"
......@@ -80,7 +80,7 @@
android:clickable="true"
android:focusable="true"
android:padding="8dp"
tools:ignore="UselessParent">
tools:ignore="UselessParent,SpeakableTextPresentCheck,TouchTargetSizeCheck">
<ImageView
android:layout_width="wrap_content"
......
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