diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2a69e70..6628eea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,10 @@ android:windowSoftInputMode="adjustPan" /> + diff --git a/app/src/main/java/com/sw/inbound/GlobalData.kt b/app/src/main/java/com/sw/inbound/GlobalData.kt index a6a40a3..5ffa047 100644 --- a/app/src/main/java/com/sw/inbound/GlobalData.kt +++ b/app/src/main/java/com/sw/inbound/GlobalData.kt @@ -43,7 +43,8 @@ object GlobalData { /** * 具体业务 BaseUrl */ - const val TEST_BASE_URL = "http://192.168.1.201:14801" +// const val TEST_BASE_URL = "http://192.168.1.201:14801" + const val TEST_BASE_URL = "http://192.168.10.118:14801" const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8083" const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443" var appBaseUrl: String = "" diff --git a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt index 7deb23f..a7a88de 100644 --- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt @@ -476,10 +476,12 @@ abstract class GoodsListActivity : BaseActivity() { val tempBinding = ListItemReceiptGoodsBinding.inflate(layoutInflater, binding.flContainer, false) binding.flContainer.addView(tempBinding.root) - } else { + } else if (this is SelfProcurementActivity) { val tempBinding = ListItemSelfProcurementBinding.inflate(layoutInflater, binding.flContainer, false) binding.flContainer.addView(tempBinding.root) + } else { + binding.flContainer.gone() } } diff --git a/app/src/main/java/com/sw/inbound/activity/HomeActivity.kt b/app/src/main/java/com/sw/inbound/activity/HomeActivity.kt index ac0e381..7879b45 100644 --- a/app/src/main/java/com/sw/inbound/activity/HomeActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/HomeActivity.kt @@ -107,6 +107,20 @@ class HomeActivity : BaseActivity() { putExtra(GoodsListActivity.IS_RECEIPT_PAGE, false) } } + + // 净材按钮点击提示 + binding.btnOrderPurchase.setOnClickListener { + startActivity { + //putExtra(GoodsListActivity.IS_RECEIPT_PAGE, false) + } + } + + // 毛菜按钮点击提示 + binding.btnOrderSelfProcurement.setOnClickListener { + startActivity { + //putExtra(GoodsListActivity.IS_RECEIPT_PAGE, false) + } + } } /** diff --git a/app/src/main/java/com/sw/inbound/activity/StoreActivity.kt b/app/src/main/java/com/sw/inbound/activity/StoreActivity.kt new file mode 100644 index 0000000..3cb7844 --- /dev/null +++ b/app/src/main/java/com/sw/inbound/activity/StoreActivity.kt @@ -0,0 +1,43 @@ +package com.sw.inbound.activity + +import android.os.Bundle +import androidx.recyclerview.widget.RecyclerView +import com.sw.inbound.model.response.DictType +import com.sw.inbound.utils.ext.gone +import dagger.hilt.android.AndroidEntryPoint + +/** + * 入库称重页面 + * 继承 GoodsListActivity 以复用秤监听、相机拍照、菜品识别弹窗等核心能力， + * 同时通过隐藏不需要的 View 精简界面，避免大量重复代码。 + */ +@AndroidEntryPoint +class StoreActivity : GoodsListActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + hideUnusedViews() + } + + /** 隐藏采购单列表、仓库下拉、提交按钮等本页面不需要的控件 */ + private fun hideUnusedViews() { + binding.flWarehouseDropdown.gone() + binding.cvDropdownBg.gone() + binding.tvPurchaseNo.gone() + binding.btnConfirmReceipt.gone() + binding.tvConfirmNum.gone() + binding.tvNotConfirmNum.gone() + binding.flContainer.gone() + binding.rvGoodsList.gone() + } + + override fun initRecyclerView() { + // 本页面无列表，空实现 + } + + override fun initView() { + // 本页面无额外初始化逻辑，空实现 + } + + override fun getWarehouseList(): List = emptyList() +} diff --git a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt index 69a3eca..4c5632b 100644 --- a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt +++ b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt @@ -14,11 +14,17 @@ import com.sw.inbound.activity.GoodsListActivity import com.sw.inbound.utils.ext.dp import com.sw.inbound.utils.ext.hideKeyboard +//测试设备，小屏幕 +private val devices = listOf( + "f0bcabbb-0d58-3b14-8bed-9863b7ec61ef", + "3dff871a-c66a-3fd8-93ce-81b57ead80f4" +) + abstract class BaseDialog( context: Context, var defWidth: Int = 1500.dp, // var defHeight: Int = 900.dp - var defHeight: Int = if ("f0bcabbb-0d58-3b14-8bed-9863b7ec61ef" == GlobalData.deviceId) 750.dp else 900.dp + var defHeight: Int = if (devices.contains(GlobalData.deviceId)) 750.dp else 900.dp ) : Dialog(context, R.style.DialogTheme) { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/res/drawable/bg_gradient_blue_btn.xml b/app/src/main/res/drawable/bg_gradient_blue_btn.xml new file mode 100644 index 0000000..af78694 --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_blue_btn.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_gradient_orange_btn.xml b/app/src/main/res/drawable/bg_gradient_orange_btn.xml new file mode 100644 index 0000000..0770e4f --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_orange_btn.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index b3f6fcf..1f49581 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -76,13 +76,14 @@ - + + android:orientation="horizontal" + android:visibility="gone"> + + + + +