修复【产品体验】扫码批量投产进入配网流程

https://docs.qq.com/doc/DYWlScEd4WkpiZW1G

Change-Id: I268a79a06f01b627a7cbd2d193c71ad725b9f24c

Author: sevenhhe

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/DeviceCategoryActivity.kt

@@ -58,7 +58,11 @@ class DeviceCategoryActivity  : PActivity(), MyCallback, CRecyclerView.RecyclerI
     private val handler = Handler()
 
     private var permissions = arrayOf(
-        Manifest.permission.CAMERA
+        Manifest.permission.CAMERA,
+        Manifest.permission.ACCESS_WIFI_STATE,
+        Manifest.permission.CHANGE_WIFI_STATE,
+        Manifest.permission.CHANGE_WIFI_MULTICAST_STATE,
+        Manifest.permission.ACCESS_FINE_LOCATION
     )
 
     override fun getPresenter(): IPresenter? {

app/src/main/java/com/tencent/iot/explorer/link/kitlink/fragment/SCStepFragment.kt

@@ -83,17 +83,36 @@ class SCStepFragment(type: Int, productId: String) : BaseFragment() {
                     val config = JsonManager.parseJson(Data[0].Config, ProdConfigDetailEntity::class.java)
 
                     if (TextUtils.isEmpty(config.WifiSmartConfig)) {
+                        loadViewStandradInfo()
                         return
                     }
 
                     var json = JSONObject.parseObject(config.WifiSmartConfig)
                     if (json.containsKey(CommonField.HARD_WARE_GUIDE)) {
                         var hardwareGuide = JSONObject.parseObject(json.getString(CommonField.HARD_WARE_GUIDE), HardwareGuide::class.java)
-                        nextBtn?.setText(hardwareGuide.btnText)
-                        tipContent?.setText(hardwareGuide.message)
-                        Picasso.get().load(hardwareGuide.bgImg).placeholder(R.drawable.imageselector_default_error)
-                            .resize(App.data.screenWith / 5, App.data.screenWith / 5).centerCrop()
-                            .into(pic)
+                        if (!TextUtils.isEmpty(hardwareGuide.btnText)) {
+                            nextBtn?.setText(hardwareGuide.btnText)
+                        } else {
+                            nextBtn?.setText(R.string.smart_config_first_title)
+                        }
+
+                        if (!TextUtils.isEmpty(hardwareGuide.message)) {
+                            tipContent?.setText(hardwareGuide.message)
+                        } else {
+                            tipContent?.setText(R.string.smart_config_first_hint2)
+                        }
+
+                        if (TextUtils.isEmpty(hardwareGuide.bgImg)) {
+                            pic?.setImageResource(R.mipmap.image_smart_config)
+                        } else {
+                            Picasso.get().load(hardwareGuide.bgImg)
+                                .placeholder(R.drawable.imageselector_default_error)
+                                .resize(App.data.screenWith / 5, App.data.screenWith / 5)
+                                .centerCrop()
+                                .into(pic)
+                        }
+                    } else {
+                        loadViewStandradInfo()
                     }
                 }
 

app/src/main/java/com/tencent/iot/explorer/link/kitlink/fragment/SoftAppStepFragment.kt

@@ -1,6 +1,7 @@
 package com.tencent.iot.explorer.link.kitlink.fragment
 
 import android.text.TextUtils
+import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -79,17 +80,36 @@ class SoftAppStepFragment(type: Int, productId: String) : BaseFragment() {
                     val config = JsonManager.parseJson(Data[0].Config, ProdConfigDetailEntity::class.java)
 
                     if (TextUtils.isEmpty(config.WifiSoftAP)) {
+                        loadViewStandradInfo()
                         return
                     }
-
                     var json = JSONObject.parseObject(config.WifiSoftAP)
                     if (json.containsKey(CommonField.HARD_WARE_GUIDE)) {
+
                         var hardwareGuide = JSONObject.parseObject(json.getString(CommonField.HARD_WARE_GUIDE), HardwareGuide::class.java)
-                        nextBtn?.setText(hardwareGuide.btnText)
-                        tipContent?.setText(hardwareGuide.message)
-                        Picasso.get().load(hardwareGuide.bgImg).placeholder(R.drawable.imageselector_default_error)
-                            .resize(App.data.screenWith / 5, App.data.screenWith / 5).centerCrop()
-                            .into(pic)
+                        if (TextUtils.isEmpty(hardwareGuide.btnText)) {
+                            nextBtn?.setText(R.string.soft_ap_first_button)
+                        } else {
+                            nextBtn?.setText(hardwareGuide.btnText)
+                        }
+
+                        if (TextUtils.isEmpty(hardwareGuide.message)) {
+                            tipContent?.setText(R.string.soft_ap_first_toast)
+                        } else {
+                            tipContent?.setText(hardwareGuide.message)
+                        }
+
+                        if (TextUtils.isEmpty(hardwareGuide.bgImg)) {
+                            pic?.setImageResource(R.mipmap.image_soft_ap)
+                        } else {
+                            Picasso.get().load(hardwareGuide.bgImg)
+                                .placeholder(R.drawable.imageselector_default_error)
+                                .resize(App.data.screenWith / 5, App.data.screenWith / 5)
+                                .centerCrop()
+                                .into(pic)
+                        }
+                    } else {
+                        loadViewStandradInfo()
                     }
                 }
             }