2025年01月10日15:40:19

wjc

2025-01-10 2e91f8abdcb87feda9e237895d4460a19fd7aed8

2025年01月10日15:40:19

在扫二维码在申请权限

 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java

@@ -55,6 +55,7 @@
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
@@ -1008,9 +1009,8 @@
            public void onSuccess(String obj) {
                try {
                    Gson g = new Gson();
                    JsonObject jObject = g.fromJson(obj, JsonObject.class);
                    String deliveryUrl = jObject.get("deliveryUrl").toString();
                    uniSuccessCallback(type, deliveryUrl, callback);
                    QrcodeUrlBean qrcodeUrlBean = g.fromJson(obj, QrcodeUrlBean.class);
                    uniSuccessCallback(type, qrcodeUrlBean.getDeliveryUrl(), callback);
                } catch (Exception ignored) {
                    uniSuccessCallback(type, obj, callback);
                }

 app/src/main/java/com/hdl/photovoltaic/ui/bean/QrcodeUrlBean.java

New file
@@ -0,0 +1,28 @@
package com.hdl.photovoltaic.ui.bean;

import java.io.Serializable;

/**
 * 电站交付URL（B端）实体类
 */
public class QrcodeUrlBean implements Serializable {

    private String qrcodeUrl;
    private String deliveryUrl;

    public String getQrcodeUrl() {
        return qrcodeUrl == null ? "" : qrcodeUrl;
    }

    public void setQrcodeUrl(String qrcodeUrl) {
        this.qrcodeUrl = qrcodeUrl;
    }

    public String getDeliveryUrl() {
        return deliveryUrl == null ? "" : deliveryUrl;
    }

    public void setDeliveryUrl(String deliveryUrl) {
        this.deliveryUrl = deliveryUrl;
    }
}

 app/src/main/java/com/hdl/photovoltaic/ui/device/ScanActivity.java

@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.ui.device;

import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -46,6 +47,7 @@
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.jaeger.library.StatusBarUtil;
import com.zxing.IZxingActivity;
import com.zxing.camera.CameraManager;
@@ -122,7 +124,9 @@
        //设置根视图
        View mContentView = LayoutInflater.from(this).inflate(getRootLayoutId(), null);
        setContentView(mContentView);

        afterViewBind(mContentView, savedInstanceState);


    }

@@ -197,7 +201,9 @@
        }
        inactivityTimer.onPause();
        beepManager.close();
        if (cameraManager != null) {
        cameraManager.closeDriver();
        }
        if (!isHasSurface) {
            scanPreview.getHolder().removeCallback(this);
        }
@@ -247,6 +253,15 @@
    }

    private void initCamera(SurfaceHolder surfaceHolder) {
        PermissionUtils.requestPermissionsResultCallback(this, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {
            @Override
            public void Success(int value) {
                if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
                    Toast.makeText(ScanActivity.this, R.string.capture_no_camera, Toast.LENGTH_SHORT).show();
                    return;
                }

        if (surfaceHolder == null) {
            throw new IllegalStateException("No SurfaceHolder provided");
        }
@@ -259,20 +274,21 @@
            // Creating the handler starts the preview, which can also throw a
            // RuntimeException.
            if (handler == null) {
                handler = new CaptureActivityHandler(this, cameraManager, DecodeThread.ALL_MODE);
                        handler = new CaptureActivityHandler(ScanActivity.this, cameraManager, DecodeThread.ALL_MODE);
            }

            initCrop();
        } catch (IOException ioe) {
            Log.w(TAG, ioe);
            Toast.makeText(this, R.string.capture_no_camera, Toast.LENGTH_SHORT).show();
                    Toast.makeText(ScanActivity.this, R.string.capture_no_camera, Toast.LENGTH_SHORT).show();
            finish();
        } catch (RuntimeException e) {
            Log.w(TAG, "Unexpected error initializing camera", e);
            Toast.makeText(this, R.string.capture_no_camera, Toast.LENGTH_SHORT).show();
                    Toast.makeText(ScanActivity.this, R.string.capture_no_camera, Toast.LENGTH_SHORT).show();
            finish();
        }
    }
        }, true);
    }

    public void restartPreviewAfterDelay(long delayMS) {
        if (handler != null) {

 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java

@@ -124,25 +124,23 @@
        viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                // 未授权 如果应用程序没有所需的权限，则显示解释说明
                PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
                PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {
                    @Override
                    public void Success(int value) {
                        PermissionExplanationDialog.getInstance().dismiss();
                        if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
                            return;
                        }


//                        startActivity(CaptureActivity.class);
                        startActivity(ScanActivity.class);
                    }
                }, true);
//                String path = HDLUniMP.UNI_EVENT_OPEN_DEVICESCAN + "?scanType=addPowerStation";
//                HdlUniLogic.getInstance().openUniMP(path, null);
//                startActivity(FastScanActivity.class);

//                // 未授权 如果应用程序没有所需的权限，则显示解释说明
//                PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
//                PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() {
//                    @Override
//                    public void Success(int value) {
//                        PermissionExplanationDialog.getInstance().dismiss();
//                        if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
////                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
//                            return;
//                        }
//
//
//                        startActivity(ScanActivity.class);
//                    }
//                }, true);

            }
        });