diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt index 091d7ab..9c85662 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SingleFragmentActivity.kt @@ -94,7 +94,7 @@ class SingleFragmentActivity : BaseActivity() { */ private fun getTitleForPage(pageType: PageType): String = when (pageType) { PageType.FOOD_COLLECT -> "食材采集" - PageType.COOK_MODE -> "餐品模式" + PageType.COOK_MODE -> "菜品模式" PageType.SEASONING_CONFIG -> "调料区设置" } diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt index ead986b..28632cc 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/DeviceConfigFragment.kt @@ -13,6 +13,8 @@ import com.shuwei.dish.match.base.BaseFragment import com.shuwei.dish.match.databinding.FragmentDeviceConfigBinding import com.shuwei.dish.match.ui.SamplingModeActivity import com.shuwei.dish.match.ui.CookingModeActivity +import com.shuwei.dish.match.ui.HomeActivity +import com.shuwei.dish.match.utils.MultiClickDetector import com.shuwei.dish.match.utils.SpTool import com.shuwei.dish.match.utils.ext.appendText import com.shuwei.dish.match.utils.ext.buildSpannableString @@ -110,7 +112,13 @@ class DeviceConfigFragment : BaseFragment() { } activity?.finish() } + // TODO: 临时测试---------------------- + detector.setOnMultiClickListener(binding.tvSetting) { + activity?.startActivity() + } } + + val detector = MultiClickDetector(targetCount = 3, intervalMs = 500) // // /** // * 添加称重监听 diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 0366918..c35e545 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -23,7 +23,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="餐品模式" + android:text="菜品模式" android:textSize="32sp" android:textStyle="bold" android:layout_marginStart="32dp" diff --git a/app/src/main/res/layout/list_item_home_mode.xml b/app/src/main/res/layout/list_item_home_mode.xml index c59199f..608a5e4 100644 --- a/app/src/main/res/layout/list_item_home_mode.xml +++ b/app/src/main/res/layout/list_item_home_mode.xml @@ -11,7 +11,7 @@ android:id="@+id/tvLockRemind" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="30dp" + android:layout_marginVertical="15dp" android:text="@string/lock_remind" android:textColor="@color/lock_remind" android:textSize="26sp" @@ -22,14 +22,14 @@ android:layout_width="match_parent" android:layout_height="180dp" android:layout_marginStart="60dp" - android:layout_marginTop="30dp" + android:layout_marginVertical="15dp" android:layout_marginEnd="60dp" app:cardBackgroundColor="@color/white" app:cardCornerRadius="30dp" app:cardElevation="0dp" app:rippleColor="#B0BEC5"> - - - - - - + \ No newline at end of file