新接口调试

app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt

@@ -197,8 +197,8 @@ class FoodSearchActivity : BaseActivity() {
 
         val map = mutableMapOf<String, Any>(
             "foodName" to input.trim(),
-            "pageNum" to "$pageNo",
-            "pageSize" to "$pageSize",
+            "pageNum" to pageNo,
+            "pageSize" to pageSize,
             "placeId" to BaseApp.canteenId,
             "dinnerType" to getDinnerTypeText()
         )
@@ -207,10 +207,7 @@ class FoodSearchActivity : BaseActivity() {
             onSuccess = {
                 delayDismissLoading()
                 finishRefresh()
-                binding.refreshLayout.run {
-                    setEnableRefresh(true)
-                }
-//                if (it == null || it.records.isNullOrEmpty()) {
+                binding.refreshLayout.setEnableRefresh(true)
                 if (it.isNullOrEmpty()) {
 //                    toast("暂未搜索到相关菜品信息")
                     if (pageNo == 1) {
@@ -218,7 +215,6 @@ class FoodSearchActivity : BaseActivity() {
                     }
                     return@searchFoodList
                 }
-//                val records = it.records
                 if (pageNo == 1) {
                     list.clear()
                 }

app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt

@@ -44,12 +44,11 @@ class InitActivity : BaseActivity() {
         BaseApp.appVersion = AppUtil.getAppVersionCode(this).toString()
 
         // 获取 ANDROID_ID
-        var androidId =
-            Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-        androidId = "39a7abdd06b3c7ab"
-        BaseApp.deviceId = androidId
-        SpTool.put(SpTool.DEVICE_ID, androidId)
-        BaseApp.configUrl = UrlConfig.BASE_URL
+//        var androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
+//        androidId = "39a7abdd06b3c7ab"
+//        BaseApp.deviceId = androidId
+//        SpTool.put(SpTool.DEVICE_ID, androidId)
+//        BaseApp.configUrl = UrlConfig.BASE_URL
         BaseApp.canteenId = "0"
 //        // TODO:  以上保存deviceId用于临时使用，后续改为下面注释方式
 
@@ -150,18 +149,18 @@ class InitActivity : BaseActivity() {
         }
     }
 
-    private fun initConfig() {
-        binding.ivQrCode.setImageBitmap(
-            QRCodeUtil.generateQRCode(
-                content = BaseApp.deviceId ?: "",
-                size = 200.dp
-            )
-        )
-        binding.btnInit.setOnClickListener {
-//            HttpUtil.loopGetToken = false
-//            getDeviceConfig()
-        }
-    }
+//    private fun initConfig() {
+//        binding.ivQrCode.setImageBitmap(
+//            QRCodeUtil.generateQRCode(
+//                content = BaseApp.deviceId ?: "",
+//                size = 200.dp
+//            )
+//        )
+//        binding.btnInit.setOnClickListener {
+////            HttpUtil.loopGetToken = false
+////            getDeviceConfig()
+//        }
+//    }
 
 //    private fun getDeviceConfig() {
 //        val tokenUrl =
@@ -203,18 +202,18 @@ class InitActivity : BaseActivity() {
         var canteenId: String? = null
     )
 
-    private fun checkConfigData(data: String): Boolean {
-        if (data.isBlank()) {
-            return false
-        }
-        val config = data.toObject<DeviceConfigBean?>()
-        if (config == null) {
-            return false
-        }
-        BaseApp.configUrl = config.appPackageUrl ?: ""
-        BaseApp.canteenId = config.canteenId ?: ""
-        return true
-    }
+//    private fun checkConfigData(data: String): Boolean {
+//        if (data.isBlank()) {
+//            return false
+//        }
+//        val config = data.toObject<DeviceConfigBean?>()
+//        if (config == null) {
+//            return false
+//        }
+//        BaseApp.configUrl = config.appPackageUrl ?: ""
+//        BaseApp.canteenId = config.canteenId ?: ""
+//        return true
+//    }
 
     override fun onDestroy() {
         WeightUtil.stopContinuousRead()

app/src/main/java/com/shuwei/dish/match/ui/fragment/DishListFragment.kt

@@ -156,10 +156,10 @@ class DishListFragment : BaseFragment<FragmentDishListBinding>() {
                 "placeId" to BaseApp.canteenId,
                 "dinnerType" to getDinnerTypeText()
             ),
-            onSuccess = { recordBean ->
+            onSuccess = { records ->
                 activity.delayDismissLoading()
                 finishRefresh()
-                loadDishList(recordBean)
+                loadDishList(records)
             },
             onFailure = { code, msg ->
                 if (isAdded.not()) {