From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java
index ba49e66..92474de 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java
@@ -36,6 +36,8 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.databinding.ActivityFastScanBinding;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.zxing.IZxingActivity;
import com.zxing.camera.CameraManager;
import com.zxing.decode.DecodeThread;
@@ -86,6 +88,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setStatusBarTranslucent();
// Window window = getWindow();
// window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
// //璁剧疆鏍硅鍥�
@@ -118,6 +121,7 @@
}
private void initEvent() {
+
viewBinding.newTopBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -125,12 +129,7 @@
}
});
- viewBinding.newTopMoreBtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //璺冲埌鍏ョ綉
- }
- });
+
viewBinding.newLightIv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -329,6 +328,12 @@
intent.putExtra("data", result);
setResult(RESULT_OK, intent);
finish();
+
+ //EventBus浜嬩欢鍒嗗彂
+ HdlCommonLogic.getInstance().postEventBusSticky(
+ HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
+ HDLUniMP.UNI_EVENT_REPLY_HOME_ADD,
+ result);
}
}
--
Gitblit v1.8.0