Merge remote-tracking branch 'origin/main_lvmeng_0131' into main_lvmeng_0131

# Conflicts:
#	app/src/main/assets/best_embedding_model_mobile.pt
#	app/src/main/assets/data/class_info.json
#	app/src/main/assets/data/embeddings.json
#	app/src/main/assets/data/labels.json
This commit is contained in:
2026-04-28 15:42:47 +08:00
3 changed files with 19 additions and 3 deletions
@@ -44,7 +44,7 @@ object GlobalData {
* 具体业务 BaseUrl
*/
const val TEST_BASE_URL = "http://192.168.1.201:14801"
const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8081"
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 = ""
@@ -11,8 +11,10 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.sw.inbound.databinding.ActivityHomeBinding
import com.sw.inbound.dialog.EnvSwitchDialog
import com.sw.inbound.dialog.Loading
import com.sw.inbound.model.response.User
import com.sw.inbound.objbox.FoodModule
import com.sw.inbound.objbox.ObjectBox
import com.sw.inbound.sdk.SensorScaleUtils
import com.sw.inbound.utils.DateTimeUtils
import com.sw.inbound.utils.ThreadUtils
@@ -80,8 +82,18 @@ class HomeActivity : BaseActivity() {
}
// 时间点击:打开环境切换弹窗
binding.tvTime.setOnClickListener {
EnvSwitchDialog(this).show()
binding.tvTime.setOnClickListener { v ->
EnvSwitchDialog(context = this, onEnvChanged = {
Loading.show(this)
lifecycleScope.launch {
ObjectBox.removeAll()
FoodModule.init(this@HomeActivity)
v.postDelayed({
Loading.dismiss()
toast("服务重置完成")
}, 500)
}
}).show()
}
// 采购单入库入口
@@ -239,6 +239,10 @@ object ObjectBox {
getBox<Food>()?.query(Food_.name.equal(name))?.build()?.remove()
}
suspend fun removeAll() = safeDbOp {
getBox<Food>()?.removeAll()
}
private val dbMutex = Mutex() // 协程并发锁,保证写入操作原子性
private const val DB_DIR_NAME = "objectbox" // ObjectBox 默认数据库目录
private const val BACKUP_DIR_NAME = "objectbox_backup" // 备份目录