mac
2023-12-05 da53ba3b968531f4d9af8bc6487d174309281c0f
2023年12月05日16:13:31

备份代码
5个文件已修改
82 ■■■■ 已修改文件
app/src/main/AndroidManifest.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/AndroidManifest.xml
@@ -153,10 +153,10 @@
            android:value="812" />
        <meta-data
            android:name="design_width_in_dp"
            android:value="375" /> <!-- 不加这个作用域上去打开相册的是闪退 -->
            android:value="375" />
        <meta-data
            android:name="ScopedStorage"
            android:value="true" />
            android:value="true" /> <!-- 不加这个作用域上去打开相册的是闪退 -->
    </application>
</manifest>
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -103,14 +103,11 @@
     * 获取当前住宅的【主】逆变器列表
     */
    public GatewayBean getCurrentHomeMainGateway() {
        List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
        List<GatewayBean> list = this.getCurrentHomeGatewayList();
        if (list.size() > 0) {
            for (int i = 0; i < list.size(); i++) {
                GatewayBean gatewayBean = list.get(i);
                if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
                    continue;
                }
                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)) {
                    //找到返回
                    return gatewayBean;
                }
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -1,7 +1,6 @@
package com.hdl.photovoltaic.ui.me;
import android.content.Intent;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.text.TextUtils;
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -166,10 +166,15 @@
                startActivity(AsRegardsActivity.class);
            }
        });
        final int[] count = {0};
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(TestMainActivity.class);
                count[0] = count[0] + 1;
                if (count[0] > 3) {
                    count[0] = 0;
                    startActivity(TestMainActivity.class);
                }
            }
        });
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -9,14 +9,17 @@
import android.view.View;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityTestMainBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
@@ -34,6 +37,8 @@
    private ActivityTestMainBinding viewBinding;
    private TestTitleAdapter testTitleAdapter;
    private List<OidBean> mOidList;
    @Override
    public Object getContentView() {
@@ -114,6 +119,8 @@
        s.add("获取逆变器oid列表");
        s.add("读取逆变器详情");
        s.add("清除逆变器住宅Id");
        s.add("上传oid列表给云端");
        s.add("获取逆变器下挂设备列表");
        return s;
    }
@@ -134,7 +141,7 @@
                    @Override
                    public void onError(HDLLinkException e) {
                        setError(e);
                        setError(e.getMsg(), e.getCode());
                    }
                });
            }
@@ -144,12 +151,13 @@
                HdlDeviceLogic.getInstance().getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
                    @Override
                    public void onSuccess(List<OidBean> obj) {
                        mOidList = obj;
                        gsonConvertJsonStr(obj);
                    }
                    @Override
                    public void onError(HDLLinkException e) {
                        setError(e);
                        setError(e.getMsg(), e.getCode());
                    }
                });
            }
@@ -164,7 +172,7 @@
                    @Override
                    public void onError(HDLLinkException e) {
                        setError(e);
                        setError(e.getMsg(), e.getCode());
                    }
                });
            }
@@ -181,19 +189,62 @@
                            @Override
                            public void onError(HDLLinkException e) {
                                setError(e);
                                setError(e.getMsg(), e.getCode());
                            }
                        });
                    }
                });
            }
            break;
            case "上传oid列表给云端": {
                if (this.mOidList == null || this.mOidList.size() == 0) {
                    hideLoading();
                    HdlThreadLogic.toast(this, "没有oid列表数据,请先获取逆变器oid列表数据,再重新上传.");
                    return;
                }
                HdlDeviceLogic.getInstance().fullUpdateOid(this.mOidList, new CloudCallBeak<Boolean>() {
                    @Override
                    public void onSuccess(Boolean obj) {
                        gsonConvertJsonStr(obj);
                    }
                    @Override
                    public void onFailure(HDLException e) {
                        setError(e.getMsg(), e.getCode());
                    }
                });
            }
            break;
            case "获取逆变器下挂设备列表": {
                HdlDeviceLogic.getInstance().getInverterDeviceChildDeviceList(gatewayBean.getOid(), new CloudCallBeak<List<CloudInverterChildDeviceBean>>() {
                    @Override
                    public void onSuccess(List<CloudInverterChildDeviceBean> obj) {
                        gsonConvertJsonStr(obj);
                    }
                    @Override
                    public void onFailure(HDLException e) {
                        setError(e.getMsg(), e.getCode());
                    }
                });
            }
            break;
            default: {
                HdlThreadLogic.runMainThread(new Runnable() {
                    @Override
                    public void run() {
                        hideLoading();
                    }
                }, this, ShowErrorMode.YES);
                break;
            }
        }
    }
    private void setError(HDLLinkException hdlLinkException) {
        String error = hdlLinkException.getMsg() + "(" + hdlLinkException.getCode() + ")";
    private void setError(String msg, int code) {
        String error = msg + "(" + code + ")";
        showText(error);
    }