2025年01月03日09:53:42

wjc

2025-01-03 ae57b0e8ca15e818e66b4edd4696804d81796327

2025年01月03日09:53:42

 app/build.gradle

@@ -155,7 +155,7 @@
    //Link本地库（在线依赖网络库）
    implementation 'com.hdl.android:pmsdk:1.0.9'
//    implementation 'com.hdl.android:debugsdk:1.0.71'
    implementation project(path:':sdk')
    implementation project(path: ':sdk')

    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

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

@@ -304,16 +304,16 @@
     * @return 值
     */
    public int getUniBottomSafeDistanceBackgroundColor() {
        return uniBottomSafeDistanceBackgroundColor;
        return this.uniBottomSafeDistanceBackgroundColor;
    }

    /**
     * uni一级界面的安全距离背景颜色（0=电站详情界面，1=添加电站界面，2=设备调测界面）
     *
     * @param uniBottomSafeDistanceBackgroundColor （0=电站详情界面，1=添加电站界面，2=设备调测界面）
     * @param uniBottomSafeDistanceBackgroundColorValue （0=电站详情界面，1=添加电站界面，2=设备调测界面）
     */
    public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColor) {
        this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColor;
    public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColorValue) {
        this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColorValue;
    }

    /**

 app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java

@@ -5,6 +5,7 @@

import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;



 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java

@@ -6,6 +6,7 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.SystemClock;
import android.util.Log;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
@@ -278,11 +279,11 @@
            @Override
            public void onClick(int position, HouseIdBean houseIdBean) {
                //点击住宅详情
                HdlLogLogic.print("点击住宅详情---" + new Gson().toJson(houseIdBean), false);
                UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(0);
                HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
                String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
                HdlUniLogic.getInstance().openUniMP(path, null);
                HdlLogLogic.print("点击住宅详情---" + new Gson().toJson(houseIdBean), false);
            }

            @Override

 app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java

@@ -47,6 +47,7 @@
    private ActivityTestMainBinding viewBinding;
    private TestTitleAdapter testTitleAdapter;

    private List<HouseIdBean> mHouseIdBeanList = new ArrayList<>();
    private List<OidBean> mOidList;

    private GatewayBean mGatewayBean;
@@ -70,7 +71,12 @@
        viewBinding.listItemRl.setAdapter(testTitleAdapter);
        initView();
        initEvent();
        readData();

    }

    private void readData() {
        loadNextPageHouseList(true);
    }

    /**
@@ -429,25 +435,30 @@
    }

    /**
     * 刷新UI（设备）
     * 刷新UI（电站）
     *
     * @param isRefreshing 表示是下拉刷新的
     */
    private void loadNextPageDeviceList(boolean isRefreshing) {
    private void loadNextPageHouseList(boolean isRefreshing) {

        showLoading();
        if (isRefreshing) {
            showLoading(getString(R.string.device_loading));
        }
        //获取住宅(电站)ID列表
        HdlDeviceLogic.getInstance().getPowerStationDeviceList("", 1, 200, new CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>>() {
        HdlResidenceLogic.getInstance().getResidenceIdList("", "", "", "", "", "", 1, 200, new CloudCallBeak<HdlResidenceLogic.HouseBeanClass>() {
            @Override
            public void onSuccess(PageNumberObject<CloudInverterDeviceBean> pageNumberObject) {
            public void onSuccess(HdlResidenceLogic.HouseBeanClass houseBeanClass) {
                HdlThreadLogic.runMainThread(new Runnable() {
                    @Override
                    public void run() {
                        if (isRefreshing) {
                            hideLoading();
                        }
                        mHouseIdBeanList.clear();
                        //更新缓存
                        mHouseIdBeanList.addAll(houseBeanClass.getList());
                    }
                }, _mActivity, ShowErrorMode.YES);
                }, _mActivity, ShowErrorMode.NO);

            }

@@ -459,8 +470,9 @@
                        if (isRefreshing) {
                            hideLoading();
                        }

                    }
                }, _mActivity, ShowErrorMode.YES);
                }, _mActivity, ShowErrorMode.NO);
            }
        });
    }
@@ -523,7 +535,8 @@
     * 选择电站调试
     */
    public void selectHome() {
        List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList();
//        List<HouseIdBean> list = HdlResidenceLogic.getInstance().getHouseIdList();
        List<HouseIdBean> list = this.mHouseIdBeanList;
        DialogHomeList dialogHomeList = new DialogHomeList(_mActivity, list);
        dialogHomeList.show();
        dialogHomeList.DeviceOnclickListener(new HomeAdapter.OnclickListener() {

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

@@ -31,25 +31,9 @@
        LayoutInflater inflater = LayoutInflater.from(context);

        // 通过inflate方法将布局文件转换为View对象

        splashView = inflater.inflate(R.layout.activity_b_splash, null);

        try {

            //设置导航条背景颜色

            if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 0) {

                Activity activity = (Activity) context;

                activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));

            } else if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 1) {

                Activity activity = (Activity) context;

                activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));



            } else if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 2) {

                Activity activity = (Activity) context;

                activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));

            }

        } catch (Exception ignored) {

        }









        //设置导航条背景颜色

        Activity activity = (Activity) context;

        activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF000000));

        //只能通过这种方式调用

        Intent intent = new Intent();

        intent.setPackage("com.hdl.photovoltaic");

@@ -62,6 +46,7 @@


    static ServiceConnection stringservice = new ServiceConnection() {

        private WeakReference<Context> contextWeakReference;



        @Override

        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {

            IUniappAidlInterface iUniappAidlInterface = IUniappAidlInterface.Stub.asInterface(iBinder);


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

@@ -1,11 +1,23 @@
package com.hdl.photovoltaic.uni;



import android.app.Activity;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.ServiceConnection;

import android.os.IBinder;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import com.hdl.photovoltaic.HDLApp;

import com.hdl.photovoltaic.IUniappAidlInterface;

import com.hdl.photovoltaic.R;

import com.hdl.photovoltaic.config.UserConfigManage;

import com.hdl.photovoltaic.utils.ProcessManagerUtils;



import java.lang.ref.WeakReference;



import io.dcloud.feature.sdk.Interface.IDCUniMPAppSplashView;



@@ -17,10 +29,44 @@
        // 在Activity中，可以直接使用this获取LayoutInflater

        LayoutInflater inflater = LayoutInflater.from(context);

        // 通过inflate方法将布局文件转换为View对象

        splashView = inflater.inflate(R.layout.activity_c_splash, null);

        splashView = inflater.inflate(R.layout.activity_b_splash, null);

        //设置导航条背景颜色

        Activity activity = (Activity) context;

        activity.getWindow().setNavigationBarColor(HDLApp.getInstance().getColor(R.color.text_FF1C1C1E));

        //只能通过这种方式调用

        Intent intent = new Intent();

        intent.setPackage("com.hdl.photovoltaic");

        intent.setAction("UniappService.ACTION");

        context.bindService(intent, stringservice, Context.BIND_AUTO_CREATE);



        return splashView;

    }





    static ServiceConnection stringservice = new ServiceConnection() {

        private WeakReference<Context> contextWeakReference;



        @Override

        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {

            IUniappAidlInterface iUniappAidlInterface = IUniappAidlInterface.Stub.asInterface(iBinder);

            try {

                iUniappAidlInterface.sendMsg("建立连接");

            } catch (Exception e) {

            }

        }



        @Override

        public void onServiceDisconnected(ComponentName componentName) {

            Log.i("BSplashView", "连接已断开");

            Context context = contextWeakReference.get();

            ProcessManagerUtils.killAllProcess(contextWeakReference.get());

        }



        public void setContextWeakReference(WeakReference<Context> contextWeakReference) {

            this.contextWeakReference = contextWeakReference;

        }

    };



    @Override

    public void onCloseSplash(ViewGroup rootView) {

        if (rootView != null)


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

@@ -277,12 +277,11 @@
                UniMPOpenConfiguration uniMPOpenConfiguration = new UniMPOpenConfiguration();
                uniMPOpenConfiguration.path = path;
                uniMPOpenConfiguration.extraData = jsonObject;
//                if(UserConfigManage.getInstance().isBAccount()){
                uniMPOpenConfiguration.splashClass = BSplashView.class;
//                }
//                else {
//                    uniMPOpenConfiguration.splashClass = CSplashView.class;
//                }
                if (UserConfigManage.getInstance().getUniBottomSafeDistanceBackgroundColor() == 0) {
                    uniMPOpenConfiguration.splashClass = CSplashView.class;
                } else {
                    uniMPOpenConfiguration.splashClass = BSplashView.class;
                }
                uniMP = DCUniMPSDK.getInstance().openUniMP(mContext, uniAppId, uniMPOpenConfiguration);
            }
//            //android14有些设备有问题，需要等待

 app/src/main/res/layout/item_title_test.xml

@@ -2,11 +2,11 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="71dp">
    android:layout_height="52dp">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="71dp"
        android:layout_height="52dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">