From e269e75bc6c52ba37abb5e8e649443810d49e677 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Tue, 16 Sep 2025 08:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4=E8=8F=9C?= =?UTF-8?q?=E5=93=81=E6=97=B6=E9=87=8D=E9=87=8F=E7=B4=AF=E5=8A=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=81=E5=85=B6=E5=AE=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 13 +++-- app/release/output-metadata.json | 6 +-- .../com/shuwei/dish/match/http/UrlConfig.kt | 4 +- .../dish/match/ui/DishSamplingActivity.kt | 49 +++++++++++-------- .../com/shuwei/dish/match/ui/InitActivity.kt | 3 +- .../dish/match/ui/PrepareCookActivity.kt | 2 +- .../dish/match/ui/SubmitFoodActivity.kt | 5 +- .../res/layout/activity_dish_sampling.xml | 2 + 8 files changed, 50 insertions(+), 34 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e07af65..6302638 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,11 +17,14 @@ android { versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" -// ndk { -// //设置支持的SO库架构 -// abiFilters.addAll(listOf("armeabi", "armeabi-v7a")) -// //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' -// } + ndk { + //设置支持的SO库架构 + abiFilters.addAll(listOf("armeabi-v7a")) + //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' + } + + // 设置输出APK文件名格式 + setProperty("archivesBaseName", "菜品配比终端v${versionName}") } signingConfigs { create("debug_507") { diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 4dd93a2..c565a6b 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -13,7 +13,7 @@ "attributes": [], "versionCode": 1, "versionName": "1.0", - "outputFile": "app-release.apk" + "outputFile": "菜品配比终端v1.0-release.apk" } ], "elementType": "File", @@ -22,14 +22,14 @@ "minApi": 28, "maxApi": 30, "baselineProfiles": [ - "baselineProfiles/1/app-release.dm" + "baselineProfiles/1/菜品配比终端v1.0-release.dm" ] }, { "minApi": 31, "maxApi": 2147483647, "baselineProfiles": [ - "baselineProfiles/0/app-release.dm" + "baselineProfiles/0/菜品配比终端v1.0-release.dm" ] } ], diff --git a/app/src/main/java/com/shuwei/dish/match/http/UrlConfig.kt b/app/src/main/java/com/shuwei/dish/match/http/UrlConfig.kt index 035d9ce..0139639 100644 --- a/app/src/main/java/com/shuwei/dish/match/http/UrlConfig.kt +++ b/app/src/main/java/com/shuwei/dish/match/http/UrlConfig.kt @@ -13,12 +13,12 @@ object UrlConfig { */ const val DEVICE_CONFIG = "${DEVICE_BASE_URL}/equipment/stEquipment/queryByEquipmentCode" - const val BASE_URL = "http://vip.shuziweidao.com/shuwei-zhct" +// const val BASE_URL = "http://vip.shuziweidao.com/shuwei-zhct" // const val DISH_DETAIL = "$BASE_URL/scales/goodsUseList?foodId={foodId}&foodWeight={foodWeight}" // const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName" // const val BASE_URL = "http://192.168.1.207:9102" -// const val BASE_URL = "https://yyjk.shuziweidao.com/gateway" + const val BASE_URL = "https://yyjk.shuziweidao.com/gateway" // const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName" diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt index c6246a8..8b76b9f 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt @@ -156,34 +156,18 @@ class DishSamplingActivity : BaseActivity() { LinearLayoutManager(this@DishSamplingActivity, LinearLayoutManager.VERTICAL, false) adapter = dishAdapter } - + binding.etInputDishType.addOnActionSearchListener { + searchDishType() + } binding.ivDishTypeSearch.setOnClickListener { - val inputText = binding.etInputDishType.text.toString().trim() - BottomDialog(goodsType = 0, defGoodsName = inputText).show(this@DishSamplingActivity) { item -> - val filterResult = list.firstOrNull { it.goodsName == item.goodsName } - if (filterResult != null) { - toast("不允许重复添加同一食材") - return@show - } - binding.etInputDishType.setText(item.goodsName) - tempDishEntity = CookFoodGoodsEntity().apply { - goodsId = item.goodsId - goodsName = item.goodsName - - relateionType = item.relateionType ?: 0 - goodsOrRelationCode = item.goodsOrRelationCode - - // TODO: 待定 - //allEdible = item.allEdible - } - } + searchDishType() } binding.ivWeightClear.setOnClickListener { WeightUtil.tareTwo(AddressUtil.ONE) } WeightUtil.addWeightListener(getWeight = { address, state, weight -> - Log.d(TAG, "addViewClickListener: address=$address,state=$state,weight=$weight") + //Log.d(TAG, "addViewClickListener: address=$address,state=$state,weight=$weight") if (address == AddressUtil.ONE) { tempDishEntity?.useWeight = weight.toDouble() binding.tvDishPartWeight.text = "${weight}" @@ -276,4 +260,27 @@ class DishSamplingActivity : BaseActivity() { } KeyboardUtil.hideKeyboard(v.context, v) } + + private fun searchDishType() { + val inputText = binding.etInputDishType.text.toString().trim() + BottomDialog(goodsType = 0, defGoodsName = inputText).show(this@DishSamplingActivity) { item -> + val filterResult = list.firstOrNull { it.goodsName == item.goodsName } + if (filterResult != null) { + toast("不允许重复添加同一食材") + return@show + } + binding.etInputDishType.setText(item.goodsName) + tempDishEntity = CookFoodGoodsEntity().apply { + goodsId = item.goodsId + goodsName = item.goodsName + + relateionType = item.relateionType ?: 0 + goodsOrRelationCode = item.goodsOrRelationCode + + // TODO: 待定 + //allEdible = item.allEdible + } + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt index fcf0e5e..dada9e2 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt @@ -46,8 +46,9 @@ class InitActivity : BaseActivity() { setHeaderBackground(isHomePage = true) // 获取 ANDROID_ID - val androidId = + 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 diff --git a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt index a287093..fb47968 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt @@ -77,7 +77,7 @@ class PrepareCookActivity : BaseActivity() { WeightUtil.tareTwo(AddressUtil.ONE) } WeightUtil.addWeightListener(getWeight = { address, state, weight -> - Log.d(TAG, "addViewClickListener: address=$address,state=$state,weight=$weight") + //Log.d(TAG, "addViewClickListener: address=$address,state=$state,weight=$weight") if (address == AddressUtil.ONE) { binding.tvDishPartWeight.text = "${weight}" } diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt index dcab40b..4271ee5 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt @@ -212,7 +212,8 @@ class SubmitFoodActivity : BaseActivity() { private fun getCookingSeasoning(address: Int): Double { if (isCooking.not()) return 0.toDouble() if (seasoningItems.isEmpty()) return 0.toDouble() - val weight = seasoningItems[weightRelateArray2.get(address)].useWeight ?: 0.toDouble() +// val weight = seasoningItems[weightRelateArray2.get(address)].useWeight ?: 0.toDouble() + val weight = seasoningCookingItems?.get(weightRelateArray2.get(address))?.useWeight ?: 0.toDouble() //Log.i(TAG, "getCookingSeasoning: weight[${address}]=$weight,seasoningList=${seasoningList.toJsonString()}") return weight } @@ -408,11 +409,13 @@ class SubmitFoodActivity : BaseActivity() { } private var seasoningItems = mutableListOf() + private var seasoningCookingItems: List ?= null private fun loadTextCell(list: MutableList) { seasoningItems.clear() seasoningItems.addAll(list) initConfigData() setGridData(list) + seasoningCookingItems = seasoningItems.map { it.copy() }.toList() } private fun initConfigData() { diff --git a/app/src/main/res/layout/activity_dish_sampling.xml b/app/src/main/res/layout/activity_dish_sampling.xml index 0c21f2b..1c94ed4 100644 --- a/app/src/main/res/layout/activity_dish_sampling.xml +++ b/app/src/main/res/layout/activity_dish_sampling.xml @@ -83,6 +83,8 @@ android:hint="@string/dish_search_hint2" android:textColor="@color/black333" android:textColorHint="@color/gray_c8" + android:imeOptions="actionSearch" + android:inputType="text" android:textSize="28sp" android:maxLines="1" android:paddingEnd="6dp"