2025年04月02日20:39:56

wjc

2025-04-02 fa09b7224961617b69fa4e5c169b0b48fce18517

2025年04月02日20:39:56

2025年04月02日20:39:58

 app/src/main/java/com/hdl/photovoltaic/enums/DebugStatus.java

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

/**
 * 电站的调试状态
 * 电站的调试状态（全部，调试中，调试完成，已交付，授权调试）
 */
public @interface DebugStatus {
    /**

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

@@ -4,6 +4,7 @@
import android.graphics.BitmapFactory;
import android.os.Build;
import android.text.TextUtils;
import android.util.Log;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
@@ -285,7 +286,6 @@
     *                 ascending:升序),
     */
    public void getResidenceIdList(String key, String keyValue, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {

        String requestUrl = HttpApi.POST_PowerStation_List;
        JsonObject json = new JsonObject();
        if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(keyValue)) {
@@ -346,7 +346,6 @@
                        }
                    });
                }

            }

            @Override

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java

@@ -76,6 +76,7 @@
        holder.home_location_tv.setText(houseIdBean.getHomeAddress());
        holder.item_parent_rl.setTag(position);
        setHomeStateTextViewStyle(holder.home_state_tv, houseIdBean.getPowerStationStatus());
        setHomeDebugStateTextViewStyle(holder.home_debug_state_tv, holder.home_debug_state_iv, houseIdBean.getDebugStatus());
        GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, 6);
//        HdlLogLogic.print("---电站名称:" + houseIdBean.getHomeName() + "---图片url:" + houseIdBean.getPowerStationImage(), false);
        holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
@@ -106,6 +107,7 @@
            //未交付完要显示删除按钮
            holder.home_del_ll.setVisibility(View.VISIBLE);
        }

        //删除电站
        holder.home_del_ll.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -154,59 +156,39 @@
    /**
     * 设置【电站调试状态】组件样式
     *
     * @param textView    显示组件
     *                    如果设备从来没上报过数据数据 状态：连接中
     *                    设备在线 但是当前处于故障 状态：故障
     *                    设备在线（有上报过数据，没有故障）  状态：在线
     *                    设备离线 状态：离线
     * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障)
     * @param textView   显示住宅状态文本组件
     * @param imageView  显示住宅状态图标组件
     * @param stateValue 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障)
     */
    private void setHomeDebugStateTextViewStyle(TextView textView, int state_value) {
    private void setHomeDebugStateTextViewStyle(TextView textView, ImageView imageView, String stateValue) {

        String text = mContext.getString(R.string.my_power_station_operation);
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
        if (mPowerStationStatus.equals(DebugStatus.All)) {
            switch (state_value) {
                case 1: {
                    text = mContext.getString(R.string.my_power_station_operation);
                }
                break;

                case 2: {
                    text = mContext.getString(R.string.my_power_station_off_line);
                    drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
                }
                break;
                case 3: {
                    text = mContext.getString(R.string.my_power_station_connecting);
                    drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
                }
                break;
                case 4:
                case 5: {
                    text = mContext.getString(R.string.my_power_station_malfunction);
                    drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
                }
                //5:离线有故障Offline_fault
                break;
//            case 5: {
//                text = mContext.getString(R.string.Offline_fault);
//                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
//            }
//            break;
        String text = mContext.getString(R.string.be_debugging);
        Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.debugging);
        switch (stateValue) {
            case DebugStatus.Debugging: {
                text = mContext.getString(R.string.be_debugging);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.debugging);
            }
        } else if (mPowerStationStatus.equals(PowerStationStatus.malfunction)) {
            text = mContext.getString(R.string.my_power_station_malfunction);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
        } else if (mPowerStationStatus.equals(PowerStationStatus.off)) {
            text = mContext.getString(R.string.my_power_station_off_line);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
        } else if (mPowerStationStatus.equals(PowerStationStatus.connecting)) {
            text = mContext.getString(R.string.my_power_station_connecting);
            drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
            break;

            case DebugStatus.WAIT_DELIVERED: {
                text = mContext.getString(R.string.debugging_completed);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.done);
            }
            break;
            case DebugStatus.Delivered: {
                text = mContext.getString(R.string.delivered);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.delivered);
            }
            break;
            case DebugStatus.SECONDARY_DEBUGGIN: {
                text = mContext.getString(R.string.authorization_debugging);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.authorization_debugging);
            }
            break;
        }
//        textView.setText(text);
        textView.setBackground(drawable);
        textView.setText(text);
        imageView.setBackground(drawable);


    }
@@ -279,6 +261,9 @@
        public ImageView homeIconIv;//住宅图片
        public TextView homeNameTv;//住宅名称

        public ImageView home_debug_state_iv;//住宅调试状态图标
        public TextView home_debug_state_tv;//住宅调试状态

        public TextView pv_value_tv;//组串容量
        public TextView pv_kw_unit;//发电功率单位
        public TextView generation_today_value_tv;//当日发电
@@ -298,6 +283,8 @@
            super(itemView);
            homeIconIv = itemView.findViewById(R.id.home_image_iv);
            homeNameTv = itemView.findViewById(R.id.home_name_tv);
            home_debug_state_iv = itemView.findViewById(R.id.home_debug_state_iv);
            home_debug_state_tv = itemView.findViewById(R.id.home_debug_state_tv);
            pv_value_tv = itemView.findViewById(R.id.pv_value_tv);
            pv_kw_unit = itemView.findViewById(R.id.pv_kw_unit);
            generation_today_value_tv = itemView.findViewById(R.id.generation_today_value_tv);

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

@@ -5,7 +5,9 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;

import androidx.recyclerview.widget.LinearLayoutManager;
@@ -72,7 +74,7 @@
        //初始化界面监听器
        initEvent();
        //后台读取住宅列表
        downReadData(false);
//        downReadData(false);
    }

    private void initData() {
@@ -196,8 +198,8 @@
                                    houseListAdapter.setList(houseListBeanIDList);
                                }

                            }

                            }
                        }
                        nullDataUpdateUi(list);
                    }

 app/src/main/res/drawable-xhdpi/add.png

 app/src/main/res/drawable-xhdpi/authorization_debugging.png

 app/src/main/res/drawable-xhdpi/condition_screening.png

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

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

Binary files differ

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

Binary files differ

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

@@ -119,7 +119,7 @@
                    android:layout_height="@dimen/dp_31"
                    android:layout_alignParentEnd="true"
                    android:layout_centerVertical="true"
                    android:src="@drawable/default_condition" />
                    android:src="@drawable/condition_screening" />


            </RelativeLayout>

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

@@ -79,8 +79,7 @@
                <ImageView
                    android:id="@+id/home_debug_state_iv"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="@dimen/dp_18"
                    android:src="@drawable/initiai" />
                    android:layout_height="@dimen/dp_18" />

                <TextView
                    android:id="@+id/home_debug_state_tv"
@@ -88,7 +87,6 @@
                    android:layout_height="match_parent"
                    android:paddingStart="0dp"
                    android:paddingEnd="@dimen/dp_16"
                    android:text="Initial"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_12" />
            </LinearLayout>