2024年04月29日17:03:06

mac

2024-04-29 e4cb9970046ef8e7392368a051cae2ab5c84799a

2024年04月29日17:03:06

备份

 app/build.gradle

@@ -30,7 +30,7 @@
        minSdk 23
        targetSdk 30
        versionCode 1
        versionName "1.3.2"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的
        versionName "1.3.3"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
        manifestPlaceholders = mfph

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

@@ -128,13 +128,12 @@
    /**
     * 获取固件升级文件全路径
     *
     * @param oid     该固件oid
     * @param imageId 镜像id
     * @param version 驱动版本
     * @return 全路径
     */
    public String getFirmwarePathFileName(String oid, String imageId, String version) {
        String fileName = oid + "_" + imageId + "_" + version + ".zip";
    public String getFirmwarePathFileName(String imageId, String version) {
        String fileName = imageId + "_" + version + ".zip";
        return HdlFileLogic.getInstance().getFirmwareRootPath() + "/" + fileName;
    }


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

@@ -640,10 +640,9 @@
                    String[] ary = path.split("/");
                    String[] driverInfoAry = ary[ary.length - 1].split("_");
                    DeviceFirmwareBean deviceFirmwareBean = new DeviceFirmwareBean();
                    deviceFirmwareBean.setOid(driverInfoAry[0]);
                    deviceFirmwareBean.setImageId(driverInfoAry[1]);
                    deviceFirmwareBean.setVersion(driverInfoAry[2].replace(".zip", ""));
                    deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), osImageId, deviceFirmwareBean.getVersion()));
                    deviceFirmwareBean.setImageId(driverInfoAry[0]);
                    deviceFirmwareBean.setVersion(driverInfoAry[1].replace(".zip", ""));
                    deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(osImageId, deviceFirmwareBean.getVersion()));
                    list.add(deviceFirmwareBean);
                }
            }
@@ -671,7 +670,7 @@
                HdlThreadLogic.runSubThread(new Runnable() {
                    @Override
                    public void run() {
                        String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
                        String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
                        //不在子线程读流会卡死主线程
                        boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type);
                        if (isBoolean) {
@@ -725,7 +724,7 @@
                        @Override
                        public void onServiceConnected(ComponentName name, IBinder service) {
                            //本地升级固件文件路径
                            String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version);
                            String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version);
                            byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName);
                            if (data == null || data.length == 0) {
                                uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_firmware_upgrade_file), callback);

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

@@ -251,8 +251,8 @@
    }

    private void initView() {
        viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_shome_page);//
        viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);//
        viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_shome_page);
        viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
        viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
        viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
        this.bottomViewChangeOfStyle();

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

@@ -9,6 +9,7 @@


import androidx.appcompat.content.res.AppCompatResources;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
@@ -264,6 +265,15 @@
                viewBinding.yearMonthDayTv.setText(time);
            }
        });
        //设置下拉箭头颜色
        viewBinding.srl.setColorSchemeResources(R.color.text_FF245EC3);
        viewBinding.srl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
            @Override
            public void onRefresh() {
                viewBinding.srl.setRefreshing(false);
                readDate();
            }
        });
    }

    /**

 app/src/main/res/drawable/ascending_sort.png

 app/src/main/res/drawable/default_condition.png

 app/src/main/res/drawable/descending_order.png

 app/src/main/res/drawable/edit.png

 app/src/main/res/drawable/location.png

 app/src/main/res/drawable/search_bj_edeff2.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="@dimen/dp_17" />
    <solid android:color="@color/text_EDEFF2" />
</shape>

 app/src/main/res/drawable/search_path.png

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

@@ -27,8 +27,18 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/srl"
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_26"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv">

    <ScrollView
            android:id="@+id/sl"
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_26"
@@ -648,6 +658,7 @@


    </ScrollView>
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>


</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,27 +6,281 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <include
        android:id="@+id/toolbar_top_fragment_house_list_rl"
        layout="@layout/toolbar_top_view_52" />

    <RelativeLayout
        android:id="@+id/fragment_house_list_head_rl"
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/power_station_label_top_cl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_64"
        android:background="@color/text_F9FAFB"
        android:visibility="gone"
        android:layout_height="@dimen/dp_200"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
        app:layout_constraintTop_toTopOf="parent">

        <LinearLayout
            android:id="@+id/fragment_house_list_content_ll"
        <RelativeLayout
            android:id="@+id/title_cl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_31"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent">

            <TextView
                android:id="@+id/power_station_label"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_centerVertical="true"
                android:text="Power Station"
                android:textColor="@color/text_90000000"
                android:textSize="@dimen/text_20"
                android:textStyle="bold" />

            <TextView
                android:id="@+id/device_label"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_centerVertical="true"
                android:layout_marginStart="@dimen/dp_21"
                android:layout_toStartOf="@+id/edit_iv"
                android:layout_toEndOf="@+id/power_station_label"
                android:gravity=""
                android:text="Equipment"
                android:textColor="@color/text_40000000"
                android:textSize="@dimen/text_16"

                />

            <ImageView
                android:id="@+id/edit_iv"
                android:layout_width="@dimen/dp_31"
                android:layout_height="@dimen/dp_31"
                android:layout_marginEnd="@dimen/dp_13"
                android:layout_toStartOf="@+id/add_iv"
                android:src="@drawable/edit"

                />

            <ImageView
                android:id="@+id/add_iv"
                android:layout_width="@dimen/dp_31"
                android:layout_height="@dimen/dp_31"
                android:layout_alignParentEnd="true"
                android:src="@drawable/add" />


        </RelativeLayout>
        <!--搜索-->
        <RelativeLayout
            android:id="@+id/search_cl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_35"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"

            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/title_cl">

            <RelativeLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:orientation="horizontal">
                android:layout_marginEnd="@dimen/dp_17"
                android:layout_toStartOf="@+id/default_condition_iv"
                android:background="@drawable/search_bj_edeff2">

                <ImageView
                    android:id="@+id/search_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:layout_alignParentStart="true"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_13"
                    android:src="@drawable/search_path" />

                <TextView
                    android:id="@+id/search_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/search_iv"
                    android:text="Search the power station"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>

            <ImageView
                android:id="@+id/default_condition_iv"
                android:layout_width="@dimen/dp_31"
                android:layout_height="@dimen/dp_31"
                android:layout_alignParentEnd="true"
                android:layout_centerVertical="true"
                android:src="@drawable/default_condition" />


        </RelativeLayout>
        <!--条件筛选-->
        <LinearLayout
            android:id="@+id/screening_condition_ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_56"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_21"
            android:layout_marginEnd="@dimen/dp_16"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/search_cl">

            <LinearLayout
                android:id="@+id/screening_condition_1"
                android:layout_width="@dimen/dp_74"
                android:layout_height="@dimen/dp_56"
                android:layout_gravity="center_vertical"
                android:background="@drawable/station_status_no_ffffff"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/screening_condition_number1_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_25"
                    android:layout_marginTop="7dp"
                    android:gravity="center"
                    android:text="99"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_21"
                    android:textStyle="bold" />

                <TextView
                    android:id="@+id/screening_condition_text1_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_17"
                    android:layout_marginTop="1dp"
                    android:gravity="center"
                    android:text="state"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />

            </LinearLayout>

            <View
                android:layout_width="@dimen/dp_16"
                android:layout_height="match_parent" />

            <LinearLayout
                android:id="@+id/screening_condition_2"
                android:layout_width="@dimen/dp_74"
                android:layout_height="@dimen/dp_56"
                android:layout_gravity="center_vertical"
                android:background="@drawable/station_status_no_ffffff"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/screening_condition_number2_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_25"
                    android:layout_marginTop="7dp"
                    android:gravity="center"
                    android:text="99"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_21"
                    android:textStyle="bold" />

                <TextView
                    android:id="@+id/screening_condition_text2_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_17"
                    android:layout_marginTop="1dp"
                    android:gravity="center"
                    android:text="state"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />

            </LinearLayout>

            <View
                android:layout_width="@dimen/dp_16"
                android:layout_height="match_parent" />

            <LinearLayout
                android:id="@+id/screening_condition_3"
                android:layout_width="@dimen/dp_74"
                android:layout_height="@dimen/dp_56"
                android:layout_gravity="center_vertical"
                android:background="@drawable/station_status_no_ffffff"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/screening_condition_number3_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_25"
                    android:layout_marginTop="7dp"
                    android:gravity="center"
                    android:text="99"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_21"
                    android:textStyle="bold" />

                <TextView
                    android:id="@+id/screening_condition_text3_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_17"
                    android:layout_marginTop="1dp"
                    android:gravity="center"
                    android:text="state"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />

            </LinearLayout>

            <View
                android:layout_width="@dimen/dp_16"
                android:layout_height="match_parent" />

            <LinearLayout
                android:id="@+id/screening_condition_4"
                android:layout_width="@dimen/dp_74"
                android:layout_height="@dimen/dp_56"
                android:layout_gravity="center_vertical"
                android:background="@drawable/station_status_no_ffffff"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/screening_condition_number4_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_25"
                    android:layout_marginTop="7dp"
                    android:gravity="center"
                    android:text="99"
                    android:textColor="@color/text_90000000"
                    android:textSize="@dimen/text_21"
                    android:textStyle="bold" />

                <TextView
                    android:id="@+id/screening_condition_text4_tv"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_17"
                    android:layout_marginTop="1dp"
                    android:gravity="center"
                    android:text="state"
                    android:textColor="@color/text_40000000"
                    android:textSize="@dimen/text_14" />

            </LinearLayout>

        </LinearLayout>
        <!--升序降序功能-->
        <LinearLayout
            android:id="@+id/ascending_order_descending_order_parent_ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_17"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_21"
            android:layout_marginEnd="@dimen/dp_12"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/screening_condition_ll">

            <RelativeLayout
                android:id="@+id/fragment_house_list_content_title1_rl"
@@ -111,7 +365,9 @@

        </LinearLayout>

    </RelativeLayout>

    </androidx.constraintlayout.widget.ConstraintLayout>


    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/fragment_house_srl"
@@ -120,7 +376,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/fragment_house_list_head_rl">
        app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/fragment_house_srl_list_rc"
@@ -136,12 +392,11 @@
        layout="@layout/null_data_view"
        android:layout_width="match_parent"
        android:layout_height="224dp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        android:visibility="gone"
        />
        app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>


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

@@ -13,7 +13,7 @@
        android:layout_marginTop="7dp"
        android:text="99"
        android:textColor="@color/text_90000000"
        android:textSize="@dimen/text_14"
        android:textSize="@dimen/text_21"
        android:textStyle="bold"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"