Browse Source

优化需求

wbspool 1 year ago
parent
commit
8a69c4e596

+ 4 - 1
BusinessCommon/src/main/java/com/develop/common/dialog/ShareQRCodeDialog.kt

@@ -20,6 +20,7 @@ class ShareQRCodeDialog : FullScreenTransparentDialog() {
 
     private lateinit var binding: DialogShareQrCodeBinding
     var recipeNum: String = ""
+    var lang : String = ""
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -52,8 +53,10 @@ class ShareQRCodeDialog : FullScreenTransparentDialog() {
     var dp20 = (com.develop.common.R.dimen.convert_10px).resId2Dimension()
 
     private fun loadQRCode(width: Int, height: Int) {
+
+        //todo 暂时写死分享路径
         ThreadUtils.runOnWorkThread({
-            val bitmap = QRCodeUtils.createQRCodeBitmap(recipeNum, width, height)
+            val bitmap = QRCodeUtils.createQRCodeBitmap("https://icook.cofarcn.com/h5/index.html?number=${recipeNum}&lang=${lang}", width, height)
             binding.ivQrCode.post {
                 binding.loading.setGone()
                 binding.ivQrCode.setImageBitmap(bitmap)

+ 1 - 1
BusinessCommon/src/main/res/values/themes.xml

@@ -18,7 +18,7 @@
 
     <style name="SplashTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
-        <item name="android:windowBackground">@drawable/splash_logo</item>
+        <item name="android:windowBackground">@drawable/splash_logo_010</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>

+ 4 - 0
BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -280,12 +280,16 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         }
         binding.tvMoreShare.setOnClickListener {
             val number = viewModel.getRecipeLiveData().value?.recipe?.number
+            val lang2 = viewModel.getRecipeLiveData().value?.recipe?.lang
             if (number.isNullOrEmpty()) {
                 return@setOnClickListener
             }
             binding.clFuncMore.setGone()
             shareQRCodeDialog.apply {
                 recipeNum = number
+                if (lang2 != null) {
+                    lang = lang2
+                }
                 showDialog(supportFragmentManager, "ShareQRCodeDialog")
             }
         }