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

2026-03-20 15:58:40 +08:00
parent d0fa46a8c8 8a83de3238
commit 915e20cd23
2 changed files with 9 additions and 2 deletions
@@ -169,7 +169,6 @@ abstract class GoodsListActivity : BaseActivity() {
        binding.btnClearZero.setOnClickListener {
            SensorScaleUtils.tare()
        }
-        cameraUtils.setPreviewController(previewView)

        userViewModel.getInitInfo()
    }
@@ -177,9 +176,10 @@ abstract class GoodsListActivity : BaseActivity() {
    override fun onResume() {
        super.onResume()
        cameraUtils.bind()
+        cameraUtils.setPreviewController(previewView)
        binding.root.postDelayed({
            SensorScaleUtils.addWeightListener(weightIntCallback)
-        }, 1 * 1000)
+        }, 1 * 1500)
    }

    private var weightIntCallback: WeightCallback = {
@@ -478,6 +478,7 @@ abstract class GoodsListActivity : BaseActivity() {

    override fun onPause() {
        super.onPause()
+        SensorScaleUtils.removeWeightListener(weightIntCallback)
        unBindCamera()
    }

@@ -66,6 +66,12 @@ object SensorScaleUtils {
        }
    }

+    fun removeWeightListener(callback: WeightCallback) {
+        if (callbackList.contains(callback)) {
+            callbackList.remove(callback)
+        }
+    }
+
    /**
     * 开启称重
     * @param autoScale 是否开启自动读取