Merge branch '1.4.4' into dev

wjc

2 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -61,16 +61,16 @@
        holder.homeNameTv.setText(houseIdBean.getHomeName().trim());

        //组串容量(创建电站时输入的组串容量)
        holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(),UnitType.kWp));
        holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
        holder.pv_kw_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));
        //当日发电
        holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity(),UnitType.kWh));
        holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity(), UnitType.kWh));
        holder.generation_today_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getTodayElectricity()));
        //逆变器额定功率（单个逆变器额定功率*逆变器数量）
        holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower(),UnitType.kW));
        holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower(), UnitType.kW));
        holder.output_kw_unit.setText(HdlCommonLogic.convertKWUnit(houseIdBean.getInvPower()));
        //电池能量（容量*电池数量）
        holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity(),UnitType.kWh));
        holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity(), UnitType.kWh));
        holder.battery_storage_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity()));

        holder.home_location_tv.setText(houseIdBean.getHomeAddress());
@@ -103,9 +103,15 @@
            }
        });
        holder.home_del_ll.setVisibility(View.GONE);
        if (houseIdBean.getDeliverStatus().equals(DeliverStatus.UNDELIVERED)) {

        if (houseIdBean.getDebugStatus().equals(DebugStatus.Debugging)) {
            //未交付完要显示删除按钮
            holder.home_del_ll.setVisibility(View.VISIBLE);
        }
        if (houseIdBean.getDebugStatus().equals(DebugStatus.WAIT_DELIVERED)) {
            //更改成回滚图标
            holder.home_del_ll.setVisibility(View.VISIBLE);
            holder.del_home_iv.setImageResource(R.drawable.roll_back);
        }

        //删除电站
@@ -201,7 +207,7 @@
     *                    设备在线 但是当前处于故障 状态：故障
     *                    设备在线（有上报过数据，没有故障）  状态：在线
     *                    设备离线 状态：离线
     * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障)
     * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障,6:部分离线)
     */
    private void setHomeStateTextViewStyle(TextView textView, int state_value) {

@@ -214,7 +220,8 @@
                }
                break;

                case 2: {
                case 2:
                case 6: {
                    text = mContext.getString(R.string.my_power_station_off_line);
                    drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
                }
@@ -276,6 +283,7 @@
        public RelativeLayout item_parent_rl;//条目父容器
        public LinearLayout home_move_ll;//移动电站位置
        public LinearLayout home_del_ll;//删除电站
        public ImageView del_home_iv;
        public TextView home_location_tv;//电站地址
        public SwipeLayout item_parent_swipeLayout;//父容器

@@ -297,6 +305,7 @@
            item_parent_rl = itemView.findViewById(R.id.item_parent_rl);
            home_move_ll = itemView.findViewById(R.id.move_ll);
            home_del_ll = itemView.findViewById(R.id.del_ll);
            del_home_iv = itemView.findViewById(R.id.del_home_iv);
            home_location_tv = itemView.findViewById(R.id.home_location_tv);
            item_parent_swipeLayout = itemView.findViewById(R.id.item_parent_swipeLayout);
        }