From cde2dccd04fb7c55f9a181768124e1eddaf79f2d Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Fri, 22 Aug 2025 09:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E6=9C=BA=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E9=A3=9F=E5=A0=82=E5=88=87=E6=8D=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 10 ++++ .../main/assets/default_seasoning_list.json | 24 ++++----- .../com/shuwei/dish/match/base/BaseApp.kt | 9 +++- .../shuwei/dish/match/dialog/BottomDialog.kt | 1 + .../com/shuwei/dish/match/http/UrlConfig.kt | 4 +- .../com/shuwei/dish/match/ui/HomeActivity.kt | 9 +++- .../shuwei/dish/match/utils/BootReceiver.kt | 17 +++++++ app/src/main/res/layout/activity_home.xml | 51 +++++++++++++++++-- 8 files changed, 105 insertions(+), 20 deletions(-) create mode 100644 app/src/main/java/com/shuwei/dish/match/utils/BootReceiver.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a756eb4..66527f8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,8 @@ + + + + + + + diff --git a/app/src/main/assets/default_seasoning_list.json b/app/src/main/assets/default_seasoning_list.json index 0b9fc26..a162ebd 100644 --- a/app/src/main/assets/default_seasoning_list.json +++ b/app/src/main/assets/default_seasoning_list.json @@ -11,7 +11,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "食盐、精制盐", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 0, "isDel" : 0, @@ -28,7 +28,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "鸡精、家乐鸡精", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 1, "isDel" : 0, @@ -45,7 +45,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "双桥味精，莲花味精、味精", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 2, "isDel" : 0, @@ -62,7 +62,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "老抽", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 3, "isDel" : 0, @@ -79,7 +79,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "白醋，唯加白醋", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 4, "isDel" : 0, @@ -96,7 +96,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "胡椒粉", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 5, "isDel" : 0, @@ -113,7 +113,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "酱油", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 6, "isDel" : 0, @@ -130,7 +130,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "料酒", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 7, "isDel" : 0, @@ -147,7 +147,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "五香粉", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 8, "isDel" : 0, @@ -164,7 +164,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "豆瓣酱、郫县豆瓣酱", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 9, "isDel" : 0, @@ -181,7 +181,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "生抽", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 11, "isDel" : 0, @@ -198,7 +198,7 @@ "allEdible" : 1, "useWeight" : 0.0, "popularName" : "菜籽油，爱菊菜籽油", - "canteenId" : "1678234139391512577", + "canteenId" : "0", "relateionType_dictText" : "食材原材料", "sort" : 10, "isDel" : 0, diff --git a/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt b/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt index 7fae0b5..850c69e 100644 --- a/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt +++ b/app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt @@ -2,9 +2,13 @@ package com.shuwei.dish.match.base import android.app.Application import android.content.Context +import android.content.Intent +import android.content.IntentFilter import android.content.SharedPreferences import com.shuwei.dish.match.R import com.shuwei.dish.match.db.DatabaseProvider +import com.shuwei.dish.match.utils.BootReceiver + class BaseApp : Application() { @@ -16,12 +20,15 @@ class BaseApp : Application() { override fun onCreate() { super.onCreate() instance = this + + val filter = IntentFilter(Intent.ACTION_BOOT_COMPLETED) + registerReceiver(BootReceiver(), filter) } companion object { // const val canteenId = "1678234139391512577" - const val canteenId = "0" + var canteenId = "0" @Volatile private var sharedPref: SharedPreferences? = null diff --git a/app/src/main/java/com/shuwei/dish/match/dialog/BottomDialog.kt b/app/src/main/java/com/shuwei/dish/match/dialog/BottomDialog.kt index 5907d44..d60e6ef 100644 --- a/app/src/main/java/com/shuwei/dish/match/dialog/BottomDialog.kt +++ b/app/src/main/java/com/shuwei/dish/match/dialog/BottomDialog.kt @@ -114,6 +114,7 @@ class BottomDialog( } } binding.refreshLayout.setEnableRefresh(false) + binding.refreshLayout.setEnableLoadMore(false) } private fun searchGoods(v: View) { 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 fe24123..65c8f0e 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 @@ -6,8 +6,8 @@ object UrlConfig { // 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 = "http://192.168.1.207:9102" + const val BASE_URL = "https://yyjk.shuziweidao.com/gateway" // const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName" const val DISH_DETAIL = "$BASE_URL/food/stFoodInfoMatching/queryById" diff --git a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt index fda3431..005932c 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt @@ -47,7 +47,14 @@ class HomeActivity : BaseActivity() { binding = ActivityHomeBinding.inflate(layoutInflater) setContentView(binding.root) setHeaderBackground(isHomePage = true) - + binding.radioGroup?.setOnCheckedChangeListener { group, checkedId -> + if (checkedId == R.id.radioSw) { + BaseApp.canteenId = "1678234139391512577" + } else { + BaseApp.canteenId = "0" + } + } + binding.radioGroup?.check(R.id.radioZk) initRecyclerView() getAppToken() WeightUtil.connect { connect -> diff --git a/app/src/main/java/com/shuwei/dish/match/utils/BootReceiver.kt b/app/src/main/java/com/shuwei/dish/match/utils/BootReceiver.kt new file mode 100644 index 0000000..6ef02d5 --- /dev/null +++ b/app/src/main/java/com/shuwei/dish/match/utils/BootReceiver.kt @@ -0,0 +1,17 @@ +package com.shuwei.dish.match.utils + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import com.shuwei.dish.match.ui.HomeActivity + +class BootReceiver : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (Intent.ACTION_BOOT_COMPLETED == intent.action) { + // 启动服务或Activity + val launchIntent = Intent(context, HomeActivity::class.java) + launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(launchIntent) + } + } +} diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 9e25cd6..bbf941e 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -4,16 +4,17 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:background="@color/bg_color" android:gravity="center_horizontal" - android:orientation="vertical"> + android:orientation="vertical" + tools:background="@color/bg_color" + tools:ignore="HardcodedText"> @@ -33,6 +34,48 @@ android:layout_marginTop="30dp" android:overScrollMode="never" tools:itemCount="3" - tools:listitem="@layout/list_item_home_mode"/> + tools:listitem="@layout/list_item_home_mode" /> + + + + + + + + + + + \ No newline at end of file