2024年03月14日16:58:55

mac

2024-03-14 90374cac911932ac9cb9f832cf80476166e2e6df

2024年03月14日16:58:55

备份代码

 app/src/main/java/com/hdl/photovoltaic/HDLApp.java

@@ -125,7 +125,7 @@
//        CrashReport.initCrashReport(this, Constant.BUGLY_APP_ID, true);
        //6.初始化DCUniMPSDK
        initDCUniMPSDK();
//        this.initUniMqtt();//如果是部署到/手机上正式使用，注释掉这行代码就可
        this.initUniMqtt();//如果是部署到/手机上正式使用，注释掉这行代码就可
//        //7.初始化自定义IconToast
//        ToastUtils.getInstance().initIconToast(this);
//        //8.对fastjson进行设置，解决fastjosn转换成字符串时首字母大小写问题
@@ -300,7 +300,7 @@
     */
    private void initUniMqtt() {
        try {
            String ip = NetworkUtils.getIPAddress(this);
            String ip = "10.10.35.79";//NetworkUtils.getIPAddress(this);
            if (TextUtils.isEmpty(ip)) {
                return;
            }

 app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java

@@ -14,11 +14,13 @@
    private static final String APP_KEY_ONLINE = "CSZEMDJL";
    private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
    private static final String APP_REGIONURL_ONLINE = "https://nearest.hdlcontrol.com";

    /*********测试环境*********/
    private static final String APP_KEY_TEST = "CTBGMNUV";
    private static final String APP_SECRET_TEST = "CTBGMNVLCTBGMNWB";
    private static final String APP_REGIONURL_TEST = "https://test-gz.hdlcontrol.com";


    /*********获取当前是否使用正式服务器环境*********/
    public static boolean isIsOnlineServer() {
        return isOnlineServer;

 app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java

@@ -47,7 +47,7 @@

    private static volatile HttpClient sHttpClient;

    private static final boolean isAddToMemory=false;
    private static final boolean isAddToMemory = false;

    public static synchronized HttpClient getInstance() {
        if (sHttpClient == null) {
@@ -73,7 +73,7 @@
    private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) {
        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        HdlLogLogic.print("http->发送->" + requestUrl + "\r\n" + body, isAddToMemory);
        return HxHttp.builder().url(requestUrl).raw(body).build().post().subscribeWith(new HDLResponse<String>() {
        return HxHttp.builder().headers("x-lbs-version", "hdl-yt").url(requestUrl).raw(body).build().post().subscribeWith(new HDLResponse<String>() {
            @Override
            public void onResponse(String str) {
                if (callBack != null) {

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

@@ -7,7 +7,6 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.GatewayType;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -37,7 +36,6 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

import io.dcloud.common.adapter.util.DeviceInfo;


/**
@@ -111,6 +109,7 @@
                    }
                    oidList.addAll(oidBeanList);
                    if (atomicInteger.get() == oidList.size()) {
                        //全部获取后再上传
                        fullUpdateOid(homeId, oidList, new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
@@ -180,10 +179,10 @@
    /**
     * 添加多个逆变器到云端上
     *
     * @param mac           -
     * @param list           逆变器列表
     * @param cloudCallBeak -
     */
    public void addAllInverterDeviceToCloud(String homeId, String mac, List<GatewayBean> list, CloudCallBeak<Boolean> cloudCallBeak) {
    public void addAllInverterDeviceToCloud(String homeId, List<GatewayBean> list, CloudCallBeak<Boolean> cloudCallBeak) {

        String requestUrl = HttpApi.POST_Device_Add_All;
        JsonObject json = new JsonObject();

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

@@ -48,21 +48,22 @@
     * @param isOpened             true=点击通知栏回调,false=收到推送通知回调;
     */
    public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
        //添加推送数据到缓存列表中;
        this.addPushDataToMemoryList(jPushMessageInfoBean);
        if (isOpened) {
            if (UserConfigManage.getInstance().isBAccount()) {
        if (UserConfigManage.getInstance().isBAccount()) {
            //添加推送数据到缓存列表中;
            this.addPushDataToMemoryList(jPushMessageInfoBean);
            if (isOpened) {
                //安装商跳转界面
                Intent intent = new Intent(context, MyPowerStationActivity.class);
                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                intent.putExtra("skip", "skip");//里面判断有这个标识就跳转到消息中心界面
                context.startActivity(intent);

            } else {
                BaseEventBus bus = new BaseEventBus();
                bus.setTopic(ConstantManage.message_function_push_post);
                bus.setType(MessageStateType.untreated);
                EventBus.getDefault().post(bus);
            }
        } else {
            BaseEventBus bus = new BaseEventBus();
            bus.setTopic(ConstantManage.message_function_push_post);
            bus.setType(MessageStateType.untreated);
            EventBus.getDefault().post(bus);
        }
    }


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

@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.other;


import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.utils.TimeUtils;

/**
@@ -8,11 +9,10 @@
 */
public class HdlLogLogic {

    //是否需要打印到Logcat上(true不需要打印)
    public static boolean isPrintLogcat = false;
    //是否需要打印到Logcat上(false不需要打印)
    public static boolean isPrintLogcat = true;
    //默认打印标题
    private static final String title = "自定义输出打印信息:";

    private static String logTitle = "自定义输出打印信息"+ (UserConfigManage.getInstance().isBAccount() ? "(B):" : "(C):");

    /**
     * java打印
@@ -53,15 +53,14 @@
     * @param isAddToMemory 是否加入内存(本地日志用到)
     */
    private static void printBase(String msg, String code, boolean isAddToMemory) {
        if (isPrintLogcat) {
            return;
        }
        CustomLogObject customLogObject = new CustomLogObject();
        customLogObject.msgOrData = msg;
        customLogObject.code = code;
        String json = title;
        String json =logTitle;
        json += customLogObject.getJointMessage();
        System.out.println(json);
        if (isPrintLogcat) {
            System.out.println(json);
        }
        if (isAddToMemory) {
            writeLog(customLogObject.getJointMessage());
        }

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

@@ -74,6 +74,21 @@
        return sortList(newList);
    }

    /**
     * 消息全部已读(本地缓存)
     *
     * @param isRead 是否读取(true已读取)
     */
    public void setAllRead(boolean isRead) {
        for (int i = 0; i < mListMessage.size(); i++) {
            MessageBean messageBean = mListMessage.get(i);
            if (messageBean == null) {
                continue;
            }
            messageBean.setRead(isRead);
        }
    }


    /**
     * 获取恢复中缓存列表
@@ -466,6 +481,7 @@
    /**
     * 获取指定页的获取消息列表(用于C端)
     *
     * @param homeId           电站id
     * @param pageNo           页码
     * @param messageStateType all:全部,UNTREATED:未处理,PROCESSED:已处理;
     * @param filter_key       类型（设备，等级，时间）
@@ -474,10 +490,12 @@
     *                         timeType（TODAY ：今天；LAST_3_DAYS: 近3天；LAST_7_DAYS ：近7天；LAST_30_DAYS ：近30天）；
     * @param cloudCallBeak    -
     */
    public void getPageNoMessageList_C(int pageNo, String messageStateType, String filter_key, String filter_value, CloudCallBeak<MessageListClass> cloudCallBeak) {
    public void getPageNoMessageList_C(String homeId, int pageNo, String messageStateType, String filter_key, String filter_value, CloudCallBeak<MessageListClass> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_List;
        JsonObject json = new JsonObject();

        if (!TextUtils.isEmpty(homeId)) {
            json.addProperty("homeId", homeId);
        }
        if (!MessageStateType.all.equals(messageStateType)) {
            json.addProperty("status", messageStateType);
        }

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

@@ -37,7 +37,7 @@
 */
public class HdlResidenceLogic {

    public static final int pageSize = 500;
    public static final int pageSize = 50;

    private static volatile HdlResidenceLogic sHdlResidenceLogic;


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

@@ -1379,7 +1379,7 @@
                                atomicInteger.set(atomicInteger.get() + 1);
                                //最后一条才做添加逆变器逻辑处理
                                if (atomicInteger.get() == list.size()) {
                                    HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, gatewayBean.getDevice_mac(), list, new CloudCallBeak<Boolean>() {
                                    HdlDeviceLogic.getInstance().addAllInverterDeviceToCloud(homeId, list, new CloudCallBeak<Boolean>() {
                                        @Override
                                        public void onSuccess(Boolean obj) {
                                            uniCallbackData(type, null, callback);
@@ -1448,7 +1448,7 @@
    private void uniSearchGateway(String type, DCUniMPJSCallback callback) {


        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
        HdlDeviceLogic.getInstance().searchAllNetworkGateway(new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                uniCallbackData(type, gatewayBeanList, callback);

 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java

@@ -245,8 +245,10 @@
                HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
                    @Override
                    public void onSuccess(HDLUserRegionBean obj) {
                        String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
                        //初始化服务域名
                        AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
//                       AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
                        AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
                        HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
                        HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
                            @Override

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

@@ -115,7 +115,8 @@
                    @Override
                    public void onSuccess(Boolean obj) {
                        hideLoading();
                        loadNextPageMessageList(1, true, mFilterKye, mFilterValue);
                        HdlMessageLogic.getInstance().setAllRead(true);
                        updateListData();
                    }

                    @Override
@@ -320,7 +321,7 @@
        } else {
            messageStateType = MessageStateType.processed;
        }
        HdlMessageLogic.getInstance().getPageNoMessageList_C(pageNo, messageStateType, filter_key, filter_value, new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
        HdlMessageLogic.getInstance().getPageNoMessageList_C(UserConfigManage.getInstance().getHomeId(), pageNo, messageStateType, filter_key, filter_value, new CloudCallBeak<HdlMessageLogic.MessageListClass>() {
            @Override
            public void onSuccess(HdlMessageLogic.MessageListClass messageListClass) {
                if (messageListClass != null) {
@@ -354,8 +355,6 @@


    }




    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)

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

@@ -118,6 +118,7 @@
                            //移动电站位置
                            HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId());
                            initData();//初始化缓存数据
                            setAllItemEdit(is_edit);
                            houseListAdapter.setList(houseListBeanIDList);//重新刷新列表
                            nullDataUpdateUi(houseListBeanIDList);//检测数据是否为空
                        }

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java

@@ -98,7 +98,8 @@
    /**
     * 监听相关回调
     */
    private void registerCallBack() {DCUniMPSDK.getInstance();
    private void registerCallBack() {
        DCUniMPSDK.getInstance();
        //1.设置小程序被关闭事件监听
        DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(new IUniMPOnCloseCallBack() {
            @Override
@@ -131,6 +132,8 @@
                HdlLogLogic.print("收到小程序通知    event=" + event);
                //暂时通过这个处理小程序同时多条相同的请求
                if (data == null) {
                    HdlLogLogic.print("收到小程序通知,data数据为null。", true);

                    return;
                }
//                String key= MD5Utils.getMd5(event+data.toString());
@@ -151,6 +154,8 @@
                    //除了统一处理，剩余其它特定场景的事件通知
                    if (onOtherUniMPEventCallBack != null) {
                        onOtherUniMPEventCallBack.onOtherUniMPEventReceive(appid, event, data, callback);
                    } else {
                        HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑    event=" + event + "\r\n" + "data=" + data, true);
                    }
                }
            }