From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 93ddc2f..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
@@ -1,8 +1,12 @@
package com.hdl.photovoltaic.ui.device;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import android.Manifest;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Rect;
import android.hardware.Camera;
@@ -32,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;
@@ -46,7 +52,7 @@
import java.util.Hashtable;
public class FastScanActivity extends CustomBaseActivity implements IZxingActivity, SurfaceHolder.Callback {
- private static final String TAG = com.zxing.qrcode.CaptureActivity.class.getSimpleName();
+ private static final String TAG = "FastScanActivity";
private final int REQUEST_CODE = 33;
private CameraManager cameraManager;
private CaptureActivityHandler handler;
@@ -82,6 +88,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setStatusBarTranslucent();
// Window window = getWindow();
// window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
// //璁剧疆鏍硅鍥�
@@ -114,6 +121,7 @@
}
private void initEvent() {
+
viewBinding.newTopBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -121,12 +129,7 @@
}
});
- viewBinding.newTopMoreBtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //璺冲埌鍏ョ綉
- }
- });
+
viewBinding.newLightIv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -325,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