| app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/fragment_house_list.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/item_plant_details.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/layout/swipe_right_layout.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/res/values/colors.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -592,25 +592,10 @@ /** * 电站状态概览(安装商) * * @param debugStatus (调试状态:Debugging = 调试中,WAIT_DELIVERED = 调试完成,Delivered = 已交付,SECONDARY_DEBUGGIN = 授权调试) * @param installedCapacityMin 最小组串容量(装机容量) * @param installedCapacityMax 最大组串容量(装机容量) */ public void getStatusOverview(String debugStatus, String installedCapacityMin, String installedCapacityMax, CloudCallBeak<StatusOverviewBean> cloudCallBeak) { public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) { String requestUrl = HttpApi.POST_statusOverview; JsonObject json = new JsonObject(); if (!TextUtils.isEmpty(installedCapacityMin)) { json.addProperty("installedCapacityMin", installedCapacityMin); } if (!TextUtils.isEmpty(installedCapacityMax)) { json.addProperty("installedCapacityMin", installedCapacityMax); } if (!TextUtils.isEmpty(debugStatus)) { json.addProperty("debugStatus", debugStatus); } // json.addProperty("zoneType", zoneType);//区域 HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { @Override app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -14,12 +14,13 @@ import androidx.appcompat.content.res.AppCompatResources; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.enums.DebugStatus; import com.hdl.photovoltaic.enums.DeliverStatus; import com.hdl.photovoltaic.enums.PowerStationStatus; import com.hdl.photovoltaic.enums.UnitType; import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.utils.GlideUtils; import com.hdl.photovoltaic.widget.SwipeLayout; @@ -59,24 +60,22 @@ HouseIdBean houseIdBean = this.mList.get(position); holder.homeNameTv.setText(houseIdBean.getHomeName().trim()); //装机容量 String capacity = HdlCommonLogic.getBigDecimal(houseIdBean.getInstalledCapacity()).toString(); holder.capacityTv.setText(capacity); //发电功率 holder.power_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getPower())); holder.power_kw_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getPower(), UnitType.kW)); //当日发电量 holder.day_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity())); holder.day_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getTodayElectricity(), UnitType.kWh)); //电池容量 holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity())); holder.month_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getBatteryCapacity(), UnitType.kWh)); //组串容量(创建电站时输入的组串容量) holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity())); holder.pv_kw_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity())); //当日发电 holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity())); holder.generation_today_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getTodayElectricity())); //逆变器额定功率（单个逆变器额定功率*逆变器数量） holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower())); holder.output_kw_unit.setText(HdlCommonLogic.convertKWUnit(houseIdBean.getInvPower())); //电池能量 holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity())); holder.battery_storage_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity())); holder.home_location_tv.setText(houseIdBean.getHomeAddress()); holder.plant_details_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()); setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus()); GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, 6); // HdlLogLogic.print("---电站名称:" + houseIdBean.getHomeName() + "---图片url:" + houseIdBean.getPowerStationImage(), false); holder.item_parent_rl.setOnClickListener(new View.OnClickListener() { @@ -91,7 +90,7 @@ } }); //移动电站位置 holder.home_move_ll.setOnClickListener(new View.OnClickListener() { holder.move_home_ll.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { try { @@ -102,14 +101,13 @@ } } }); holder.home_del_ll.setVisibility(View.GONE); if (houseIdBean.getDeliverStatus().equals(DeliverStatus.UNDELIVERED)) { holder.del_home_ll.setVisibility(View.GONE); if (houseIdBean.getDeliverStatus().equals("UNDELIVERED")) { //未交付完要显示删除按钮 holder.home_del_ll.setVisibility(View.VISIBLE); holder.del_home_ll.setVisibility(View.VISIBLE); } //删除电站 holder.home_del_ll.setOnClickListener(new View.OnClickListener() { holder.del_home_ll.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { try { @@ -154,47 +152,7 @@ } /** * 设置【电站调试状态】组件样式 * * @param textView 显示住宅状态文本组件 * @param imageView 显示住宅状态图标组件 * @param stateValue 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障) */ private void setHomeDebugStateTextViewStyle(TextView textView, ImageView imageView, String stateValue) { 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); } 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); imageView.setBackground(drawable); } /** * 设置【电站状态】组件样式 * 改变组件样式 * * @param textView 显示组件 * 如果设备从来没上报过数据数据 状态：连接中 @@ -203,7 +161,7 @@ * 设备离线 状态：离线 * @param state_value 电站状态(1:正常(运行),2:离线,3:连接中,4:故障,5:离线有故障) */ private void setHomeStateTextViewStyle(TextView textView, int state_value) { private void setTextViewStyle(TextView textView, int state_value) { String text = mContext.getString(R.string.my_power_station_operation); Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494); @@ -260,44 +218,36 @@ 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;//当日发电 public TextView generation_today_kw_unit;//当日发电单位 public TextView output_value_tv;//额定功率 public TextView output_kw_unit;//额定功率单位 public TextView battery_storage_value_tv;//电池能量 public TextView battery_storage_kw_unit;//电池能量单位 public TextView home_state_tv;//电站状态(连接中,运行,离线,故障); public TextView capacityTv;//装机容量 public TextView power_value_tv;//发电功率 public TextView power_kw_unit;//发电功率单位 public TextView day_value_tv;//当日发电量 public TextView day_kwh_unit;//当日发电量单位 public TextView month_value_tv;//当月发电量 public TextView month_kwh_unit;//当月发电量单位 public TextView stateTv;//电站状态(连接中,运行,离线,故障); public RelativeLayout item_parent_rl;//条目父容器 public LinearLayout home_move_ll;//移动电站位置 public LinearLayout home_del_ll;//删除电站 public TextView home_location_tv;//电站地址 public LinearLayout move_home_ll;//移动电站位置 public LinearLayout del_home_ll;//删除电站 public TextView plant_details_location_tv;//电站地址 public SwipeLayout item_parent_swipeLayout;//父容器 public MyViewHolder(@NonNull View itemView) { 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); generation_today_kw_unit = itemView.findViewById(R.id.generation_today_kw_unit); output_value_tv = itemView.findViewById(R.id.output_value_tv); output_kw_unit = itemView.findViewById(R.id.output_kw_unit); battery_storage_value_tv = itemView.findViewById(R.id.battery_storage_value_tv); battery_storage_kw_unit = itemView.findViewById(R.id.battery_storage_kw_unit); home_state_tv = itemView.findViewById(R.id.home_state_tv); homeIconIv = itemView.findViewById(R.id.device_details_image_iv); homeNameTv = itemView.findViewById(R.id.device_details_name_tv); capacityTv = itemView.findViewById(R.id.device_details_value_tv); power_value_tv = itemView.findViewById(R.id.power_value_tv); power_kw_unit = itemView.findViewById(R.id.power_kw_unit); day_value_tv = itemView.findViewById(R.id.day_value_tv); day_kwh_unit = itemView.findViewById(R.id.day_kwh_unit); month_value_tv = itemView.findViewById(R.id.month_value_tv); month_kwh_unit = itemView.findViewById(R.id.month_kwh_unit); stateTv = itemView.findViewById(R.id.device_state_tv); 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); home_location_tv = itemView.findViewById(R.id.home_location_tv); move_home_ll = itemView.findViewById(R.id.move_ll); del_home_ll = itemView.findViewById(R.id.del_ll); plant_details_location_tv = itemView.findViewById(R.id.plant_details_location_tv); item_parent_swipeLayout = itemView.findViewById(R.id.item_parent_swipeLayout); } } app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -501,7 +501,7 @@ * 电站状态概览 */ private void getStatusOverview() { HdlResidenceLogic.getInstance().getStatusOverview("","","",new CloudCallBeak<StatusOverviewBean>() { HdlResidenceLogic.getInstance().getStatusOverview(new CloudCallBeak<StatusOverviewBean>() { @Override public void onSuccess(StatusOverviewBean statusOverviewBean) { if (statusOverviewBean == null) { app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -1,13 +1,18 @@ package com.hdl.photovoltaic.ui.powerstation; import android.Manifest; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.location.LocationManager; import android.os.Bundle; import android.os.SystemClock; import android.provider.Settings; import android.util.Log; import android.view.View; import android.view.Window; import android.widget.ImageView; import android.widget.RelativeLayout; @@ -40,6 +45,7 @@ import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlDialogLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlOtaLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.other.HdlUniLogic; @@ -51,6 +57,7 @@ import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.GPSManagerUtils; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.photovoltaic.utils.ProcessManagerUtils; import com.hdl.photovoltaic.utils.URLEncodingUtils; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; import com.hdl.photovoltaic.widget.DefaultFilteringDialog; @@ -167,12 +174,6 @@ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC)); viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -185,12 +186,6 @@ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff)); viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC)); viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -203,12 +198,6 @@ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff)); viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC)); viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -221,11 +210,6 @@ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff)); viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC)); getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -267,7 +251,6 @@ installedCapacityMinValue = min;//最小组串容量(装机容量) installedCapacityMaxValue = max;//最大组串容量(装机容量) screeningConditionStatus = state;//调试状态(全部;调试中;调试完成;已交付;授权调试) getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -404,39 +387,32 @@ } }); //PV筛选 // //电站编辑按钮 // viewBinding.editIv.setOnClickListener(new View.OnClickListener() { // @Override // public void onClick(View v) { // startActivity(HouseListEditActivity.class); // } // }); //电站名称筛选 viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { boolean isSelected = !v.isSelected(); screenIconState(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected); key = SortType.installedCapacitySort; key = SortType.homeNameSort; value = isSelected ? SortValue.ascending : SortValue.descending; getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); //额定功率筛选 //电站发电功率筛选 viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { boolean isSelected = !v.isSelected(); screenIconState(viewBinding.stationPowerRl, viewBinding.stationPowerIv, isSelected); key = SortType.invPowerSort; key = SortType.powerSort; value = isSelected ? SortValue.ascending : SortValue.descending; getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); //电站电池容量筛选 viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { boolean isSelected = !v.isSelected(); screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected); key = SortType.batteryCapacitySort; value = isSelected ? SortValue.ascending : SortValue.descending; getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -448,7 +424,17 @@ screenIconState(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected); key = SortType.todayElectricitySort; value = isSelected ? SortValue.ascending : SortValue.descending; getStatusOverview(); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); //电站电池容量筛选 viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { boolean isSelected = !v.isSelected(); screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected); key = SortType.batteryCapacitySort; value = isSelected ? SortValue.ascending : SortValue.descending; loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } }); @@ -567,11 +553,6 @@ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC)); viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B)); //电站标签 houseInfoAdapter = new HouseInfoAdapter(_mActivity); viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity)); @@ -684,7 +665,6 @@ // if (MqttRecvClient.getInstance() != null) { // MqttRecvClient.getInstance().removeAllTopic(); // } loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true); } } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) { @@ -765,7 +745,7 @@ * 电站状态概览 */ private void getStatusOverview() { HdlResidenceLogic.getInstance().getStatusOverview(screeningConditionStatus,installedCapacityMinValue,installedCapacityMaxValue,new CloudCallBeak<StatusOverviewBean>() { HdlResidenceLogic.getInstance().getStatusOverview(new CloudCallBeak<StatusOverviewBean>() { @Override public void onSuccess(StatusOverviewBean statusOverviewBean) { if (statusOverviewBean == null) { @@ -858,7 +838,7 @@ if (isRefreshing) { hideLoading(); } HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")"); } }, _mActivity, ShowErrorMode.YES); } @@ -927,7 +907,6 @@ if (isRefreshing) { hideLoading(); } HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")"); } }, _mActivity, ShowErrorMode.YES); } app/src/main/res/layout/fragment_house_list.xml
@@ -25,7 +25,7 @@ android:layout_centerVertical="true" android:gravity="center" android:text="@string/power_station" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_18" /> <TextView @@ -37,11 +37,19 @@ android:layout_toEndOf="@+id/power_station_label" android:gravity="center" android:text="@string/device" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <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" android:visibility="gone" /> <ImageView android:id="@+id/add_iv" @@ -109,7 +117,7 @@ android:layout_marginStart="@dimen/dp_11" android:layout_toEndOf="@+id/power_station_search_iv" android:text="@string/search_station" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -153,7 +161,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="0" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_16" /> <TextView @@ -164,7 +172,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="@string/message_all" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -190,7 +198,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="0" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_16" /> <TextView @@ -201,7 +209,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="@string/my_power_station_malfunction" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -227,7 +235,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="0" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_16" /> <TextView @@ -238,7 +246,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="@string/my_power_station_off_line" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -264,7 +272,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="0" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_16" /> <TextView @@ -275,7 +283,7 @@ android:paddingStart="@dimen/dp_2" android:paddingEnd="@dimen/dp_2" android:text="@string/to_be_added" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -305,8 +313,8 @@ android:id="@+id/station_name_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/pv" android:textColor="@color/text_FFACACAC" android:text="@string/station_name" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> @@ -338,8 +346,8 @@ android:id="@+id/station_power_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/output" android:textColor="@color/text_FFACACAC" android:text="@string/generated_power" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <ImageView @@ -348,6 +356,36 @@ android:layout_height="@dimen/dp_18" android:layout_toEndOf="@+id/station_power_tv" android:background="@drawable/ascending_descending_order_select" /> </RelativeLayout> <View android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" /> <RelativeLayout android:id="@+id/station_day_rl" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_horizontal" android:orientation="horizontal"> <TextView android:id="@+id/station_day_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/day_power_generation" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/station_day_iv" android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_18" android:layout_toEndOf="@+id/station_day_tv" android:background="@drawable/ascending_descending_order_select" /> </RelativeLayout> @@ -368,7 +406,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/battery_capacity_indicator" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <ImageView @@ -378,37 +416,6 @@ android:layout_toEndOf="@+id/station_month_tv" android:background="@drawable/ascending_descending_order_select" /> </RelativeLayout> <View android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" /> <RelativeLayout android:id="@+id/station_day_rl" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_horizontal" android:orientation="horizontal"> <TextView android:id="@+id/station_day_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/day_generation" android:textColor="@color/text_FFACACAC" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/station_day_iv" android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_18" android:layout_toEndOf="@+id/station_day_tv" android:background="@drawable/ascending_descending_order_select" /> </RelativeLayout> </LinearLayout> @@ -493,7 +500,7 @@ android:layout_marginStart="@dimen/dp_11" android:layout_toEndOf="@+id/device_search_iv" android:text="@string/enter_the_device_sn_and_device_name" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -535,8 +542,3 @@ </androidx.constraintlayout.widget.ConstraintLayout>
@@ -12,361 +12,298 @@ <RelativeLayout android:id="@+id/item_parent_rl" android:layout_width="match_parent" android:layout_height="204.5dp"> android:layout_height="160.5dp"> <RelativeLayout android:id="@+id/device_details_info_rl" android:layout_width="match_parent" android:layout_height="194.5dp" android:layout_height="150.5dp" android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/bj_ff1c1c1e"> <!--电站图片--> <ImageView android:id="@+id/home_image_iv" android:id="@+id/device_details_image_iv" android:layout_width="44dp" android:layout_height="42dp" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_13" android:scaleType="centerCrop" /> <!--电站名称以及地址--> <LinearLayout android:id="@+id/home_name_ll" android:layout_width="match_parent" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_5" android:layout_marginStart="@dimen/dp_11" android:layout_marginTop="14.5dp" android:layout_toStartOf="@+id/home_debug_state_ll" android:layout_toEndOf="@+id/home_image_iv" android:layout_toEndOf="@+id/device_details_image_iv" android:gravity="center_vertical" android:orientation="horizontal"> <LinearLayout android:layout_width="@dimen/dp_19" android:layout_height="@dimen/dp_19" android:gravity="center"> <TextView android:id="@+id/home_state_tv" android:id="@+id/device_state_tv" android:layout_width="7dp" android:layout_height="7dp" android:background="@drawable/device_state_ff38c494" /> </LinearLayout> <TextView android:id="@+id/home_name_tv" android:id="@+id/device_details_name_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:ellipsize="end" android:gravity="center_vertical|start" android:paddingStart="0dp" android:paddingEnd="@dimen/dp_5" android:paddingStart="@dimen/dp_6" android:paddingEnd="@dimen/dp_20" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </LinearLayout> <!--电站状态--> <LinearLayout android:id="@+id/home_debug_state_ll" <TextView android:id="@+id/device_details_sn_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_18" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:layout_marginTop="@dimen/dp_14" android:orientation="horizontal"> <ImageView android:id="@+id/home_debug_state_iv" android:layout_width="@dimen/dp_18" android:layout_height="@dimen/dp_18" /> <TextView android:id="@+id/home_debug_state_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="0dp" android:paddingEnd="@dimen/dp_16" android:textColor="@color/text_FFACACAC" android:textSize="@dimen/text_12" /> </LinearLayout> <!--电站地址--> <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_19" android:layout_below="@+id/home_name_ll" android:layout_alignStart="@+id/home_name_ll"> <ImageView android:layout_width="@dimen/dp_19" android:layout_height="@dimen/dp_19" android:src="@drawable/location" /> <TextView android:id="@+id/home_location_tv" android:layout_width="match_parent" android:layout_height="match_parent" android:ellipsize="end" android:gravity="center_vertical|start" android:paddingStart="0dp" android:paddingEnd="@dimen/dp_5" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_FF5B5B5B" android:textSize="@dimen/text_12" /> </LinearLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/home_image_iv" android:layout_alignStart="@+id/home_image_iv" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:orientation="vertical"> android:layout_below="@+id/home_name_ll" android:layout_alignStart="@+id/home_name_ll" android:layout_marginTop="2.5dp" android:gravity="center_vertical" android:text="@string/string_capacity" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> <TextView android:id="@+id/device_details_value_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/home_name_ll" android:layout_marginStart="3dp" android:layout_marginTop="1.5dp" android:layout_toEndOf="@+id/device_details_sn_tv" android:text="0.00" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/kwp_unit" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignBottom="@+id/device_details_value_tv" android:layout_marginStart="4dp" android:layout_marginBottom="2dp" android:layout_toEndOf="@+id/device_details_value_tv" android:text="kWp" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_10" /> <LinearLayout android:id="@+id/screening_condition_ll" android:layout_width="match_parent" android:layout_height="37.5dp" android:layout_height="@dimen/dp_37" android:layout_below="@+id/device_details_image_iv" android:layout_alignStart="@+id/device_details_image_iv" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_32" android:orientation="horizontal"> <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"> <ImageView android:layout_width="37.5dp" android:layout_height="37.5dp" android:layout_marginEnd="@dimen/dp_12" android:src="@drawable/pv" /> <LinearLayout android:id="@+id/pv_ll" android:id="@+id/power_ll" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_20"> <!--组串容量值--> android:layout_height="@dimen/dp_18"> <TextView android:id="@+id/pv_value_tv" android:id="@+id/power_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical|start" android:text="0" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/pv_kw_unit" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="3dp" android:gravity="bottom" android:text="kWp" android:textColor="@color/text_FF5B5B5B" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/pv_type_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_14" android:layout_marginTop="3dp" android:gravity="center_vertical|start" android:text="@string/pv" android:textColor="@color/text_FF5B5B5B" android:textSize="@dimen/text_12" /> </LinearLayout> </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"> <ImageView android:layout_width="37.5dp" android:layout_height="37.5dp" android:layout_marginEnd="@dimen/dp_12" android:src="@drawable/generation_today" /> <LinearLayout android:id="@+id/generation_today_ll" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_20"> <TextView android:id="@+id/generation_today_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical|start" android:text="0" android:textColor="@color/text_FFACACAC" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/generation_today_kw_unit" android:id="@+id/power_kw_unit" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="3dp" android:gravity="bottom" android:text="kW" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/generation_today_type_tv" android:id="@+id/power_type_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_14" android:layout_height="@dimen/dp_15" android:layout_marginTop="3dp" android:gravity="center_vertical|start" android:text="@string/day_generation" android:textColor="@color/text_FF5B5B5B" android:text="@string/generated_power" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> <LinearLayout android:layout_width="@dimen/dp_0" android:layout_height="match_parent" android:layout_weight="1" android:gravity="center"> <View android:layout_width="0.5dp" android:layout_height="17.5dp" android:layout_gravity="center" android:background="@color/text_1AFFFFFF" /> </LinearLayout> </LinearLayout> <LinearLayout android:id="@+id/day_ll" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_32"> android:layout_height="@dimen/dp_18"> <TextView android:id="@+id/day_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_horizontal" android:gravity="start|center_horizontal" android:text="0" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/day_kwh_unit" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="3dp" android:gravity="bottom" android:text="kWh" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/day_type_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_15" android:layout_marginTop="3dp" android:gravity="start|center_horizontal" android:text="@string/day_power_generation" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> <LinearLayout android:layout_width="@dimen/dp_0" android:layout_height="match_parent" android:layout_weight="1" android:gravity="center"> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_width="0.5dp" android:layout_height="17.5dp" android:layout_gravity="center" android:background="@color/text_1AFFFFFF" /> </LinearLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="37.5dp" android:orientation="horizontal"> <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"> <ImageView android:layout_width="37.5dp" android:layout_height="37.5dp" android:layout_marginEnd="@dimen/dp_12" android:src="@drawable/output" /> <LinearLayout android:id="@+id/output_ll" android:id="@+id/month_ll" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_20"> <!--组串容量值--> android:layout_height="@dimen/dp_18"> <TextView android:id="@+id/output_value_tv" android:id="@+id/month_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical|start" android:text="0" android:textColor="@color/text_FFACACAC" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/output_kw_unit" android:id="@+id/month_kwh_unit" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="3dp" android:gravity="bottom" android:text="kWh" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/output_type_tv" android:id="@+id/month_type_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_14" android:layout_marginTop="3dp" android:gravity="center_vertical|start" android:text="@string/output" android:textColor="@color/text_FF5B5B5B" android:textSize="@dimen/text_12" /> </LinearLayout> </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"> <ImageView android:layout_width="37.5dp" android:layout_height="37.5dp" android:layout_marginEnd="@dimen/dp_12" android:src="@drawable/battery_storage" /> <LinearLayout android:id="@+id/battery_storage_ll" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_20"> <TextView android:id="@+id/battery_storage_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical|start" android:text="0" android:textColor="@color/text_FFACACAC" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/battery_storage_kw_unit" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginStart="3dp" android:gravity="bottom" android:text="kWh" android:textColor="@color/text_FF5B5B5B" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/battery_storage_type_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_14" android:layout_height="@dimen/dp_15" android:layout_marginTop="3dp" android:gravity="center_vertical|start" android:text="@string/battery_capacity_indicator" android:textColor="@color/text_FF5B5B5B" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> </LinearLayout> </LinearLayout> </LinearLayout> <View android:id="@+id/line" android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_below="@+id/screening_condition_ll" android:layout_alignStart="@+id/device_details_image_iv" android:layout_marginTop="@dimen/dp_7" android:layout_marginEnd="@dimen/dp_16" android:background="@color/text_1AFFFFFF" /> <!--电站地址--> <RelativeLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_35" android:layout_below="@+id/line" android:layout_marginStart="11dp"> <ImageView android:id="@+id/plant_details_location_iv" android:layout_width="@dimen/dp_19" android:layout_height="@dimen/dp_19" android:layout_centerVertical="true" android:src="@drawable/location" /> <TextView android:id="@+id/plant_details_location_tv" android:layout_width="290dp" android:layout_height="@dimen/dp_17" android:layout_centerVertical="true" android:layout_toEndOf="@+id/plant_details_location_iv" android:ellipsize="end" android:gravity="center_vertical|start" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </RelativeLayout> </RelativeLayout> @@ -375,4 +312,3 @@ </RelativeLayout> </com.hdl.photovoltaic.widget.SwipeLayout>
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="66dp" android:layout_height="194.5dp" android:layout_height="148dp" android:orientation="vertical"> <LinearLayout app/src/main/res/values/colors.xml
@@ -67,5 +67,7 @@ <color name="text_FF8E8E8E">#FF8E8E8E</color> <color name="text_FF222222">#FF222222</color> <color name="text_FF484848">#FF484848</color> <color name="text_66FFFFFF">#66FFFFFF</color> <color name="text_E6FFFFFF">#FFACACAC</color> </resources> sdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -88,7 +88,7 @@ private String sid; private String spk = "energy.hdl_inverter"; private String spk = ""; private String systemStatusDesc;//云端-状态
