app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
@@ -45,10 +45,10 @@ CloudInverterDeviceBean deviceBean = this.mList.get(position); holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName()); holder.device_details_sn_tv.setText("SN:" + deviceBean.getOsn()); holder.device_details_sn_tv.setText(deviceBean.getOsn()); holder.device_label_run_state_value_tv.setText(deviceBean.getSystemStatusDesc()); holder.device_label_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getOutputActivePower(), UnitType.kW)); holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getTotalElectricityPvToday(), UnitType.kWh)); holder.device_label_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getOutputActivePower(), UnitType.kW, false)); holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getTotalElectricityPvToday(), UnitType.kWh, false)); holder.device_label_location_tv.setText(deviceBean.getHomeAddress()); setTextViewStyle(holder.device_label_state_tv, deviceBean.getDeviceStatus()); holder.itemView.setTag(position); @@ -94,16 +94,16 @@ */ 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.state_06b92a); Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494); switch (state_value) { case 1: { text = mContext.getString(R.string.my_power_station_connecting); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300); drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300); } break; case 2: { text = mContext.getString(R.string.my_power_station_malfunction); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343); drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252); } break; case 3: { @@ -112,7 +112,7 @@ break; case 4: { text = mContext.getString(R.string.my_power_station_off_line); drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9); drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9); } break; @@ -143,13 +143,13 @@ super(itemView); device_icon_iv = itemView.findViewById(R.id.device_details_image_iv); homeNameTv = itemView.findViewById(R.id.device_details_name_tv); device_details_sn_tv = itemView.findViewById(R.id.device_details_sn_tv); device_details_sn_tv = itemView.findViewById(R.id.device_details_value_tv); device_label_run_state_value_tv = itemView.findViewById(R.id.device_label_run_state_value_tv); device_label_power_value_tv = itemView.findViewById(R.id.device_label_power_value_tv); device_label_day_value_tv = itemView.findViewById(R.id.device_label_day_value_tv); device_label_location_tv = itemView.findViewById(R.id.device_label_location_tv); device_label_state_tv = itemView.findViewById(R.id.device_label_state_tv); device_label_state_tv = itemView.findViewById(R.id.device_state_tv); } } app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -64,11 +64,11 @@ String capacity = HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp, false); holder.capacityTv.setText(capacity); //发电功率 holder.power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getPower(), UnitType.kW)); holder.power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getPower(), UnitType.kW, false)); //当日发电量 holder.day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getTodayElectricity(), UnitType.kWh)); holder.day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getTodayElectricity(), UnitType.kWh, false)); //当月发电量 holder.month_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getMonthElectricity(), UnitType.kWh)); holder.month_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getMonthElectricity(), UnitType.kWh, false)); holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress()); holder.item_parent_rl.setTag(position); setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus()); app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchHistoryAdapter.java
@@ -40,10 +40,14 @@ @Override public void onBindViewHolder(@NonNull SearchHistoryAdapter.MyViewHolder holder, int position) { String history_title = this.mList.get(position); holder.history_title_tv.setText(history_title); holder.itemView.setTag(position); if (position == 0) { holder.line_top.setVisibility(View.VISIBLE); } holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -87,11 +91,13 @@ public TextView history_title_tv; public View line_top; public MyViewHolder(@NonNull View itemView) { super(itemView); history_title_tv = itemView.findViewById(R.id.history_title_tv); line_top = itemView.findViewById(R.id.line_top); } } } app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchHouseAdapter.java
@@ -44,6 +44,9 @@ holder.power_station_name_tv.setText(houseIdBean.getHomeName()); holder.power_station_location_tv.setText(houseIdBean.getHomeAddress()); holder.itemView.setTag(position); if (position == 0) { holder.line_top.setVisibility(View.VISIBLE); } holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -91,12 +94,14 @@ public TextView power_station_name_tv; public TextView power_station_location_tv; public View line_top; public MyViewHolder(@NonNull View itemView) { super(itemView); power_station_name_tv = itemView.findViewById(R.id.message_name_tv); power_station_location_tv = itemView.findViewById(R.id.power_station_location_tv); line_top = itemView.findViewById(R.id.line_top); } } } app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -4,8 +4,6 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.content.res.AppCompatResources; @@ -152,7 +150,7 @@ @Override public void onClick(View v) { powerStationStatusValue = PowerStationStatus.All; viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff)); viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff)); 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)); @@ -165,7 +163,7 @@ public void onClick(View v) { powerStationStatusValue = PowerStationStatus.malfunction; viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff)); 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)); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); @@ -178,7 +176,7 @@ powerStationStatusValue = PowerStationStatus.off; viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_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)); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); } @@ -191,7 +189,7 @@ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff)); 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_yer_ffffff)); viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff)); loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true); } }); @@ -508,7 +506,7 @@ private void initView() { viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE); viewBinding.deviceLabelParent.setVisibility(View.GONE); viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff)); viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff)); 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)); app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -1,7 +1,5 @@ package com.hdl.photovoltaic.widget; import android.annotation.SuppressLint; import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.text.TextUtils; @@ -9,7 +7,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; @@ -20,8 +17,6 @@ import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding; import com.hdl.photovoltaic.enums.GridType; import com.hdl.photovoltaic.enums.UnitType; import com.hdl.photovoltaic.other.HdlCommonLogic; import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; public class DefaultFilteringDialog extends BaseDialog { @@ -244,33 +239,21 @@ */ private void setBackgroundColor(TextView textView, TitleType titleType) { if (titleType == TitleType.string_capacity) { viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text1Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); } else { viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000)); viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_E6000000)); viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129)); } if (textView != null) { textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.selected_38c494)); textView.setTextColor(mContext.getColor(R.color.text_FFFFFFFF)); textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_yes_129)); } } app/src/main/res/drawable/ascending_sort.pngapp/src/main/res/drawable/back.pngapp/src/main/res/drawable/clear.pngapp/src/main/res/drawable/config_129.xml
New file @@ -0,0 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:radius="129.5dp" /> <stroke android:width="@dimen/dp_1" android:color="@color/text_FF5C5F60" /> </shape> app/src/main/res/drawable/config_yes_129.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="129.5dp" /> <solid android:color="@color/text_FF555859" /> </shape> app/src/main/res/drawable/descending_order.pngapp/src/main/res/drawable/history_del.pngapp/src/main/res/drawable/l_r_13.xml
New file @@ -0,0 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:topLeftRadius="@dimen/dp_13" android:topRightRadius="@dimen/dp_13"/> <solid android:color="@color/text_FF333738"/> </shape> app/src/main/res/drawable/location.pngapp/src/main/res/drawable/reset.pngapp/src/main/res/drawable/station_status_yes_ffffff.xml
app/src/main/res/layout/activity_device_search.xml
@@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/text_FFECECEC" android:background="@color/text_FF161616" tools:context=".ui.powerstation.DeviceSearchActivity"> <!--搜索--> @@ -24,12 +24,12 @@ <ImageView android:id="@+id/power_station_back_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_17" android:layout_width="@dimen/dp_30" android:layout_height="@dimen/dp_30" android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:src="@drawable/search_back" /> android:layout_marginStart="@dimen/dp_10" android:src="@drawable/back" /> </RelativeLayout> @@ -63,8 +63,8 @@ android:background="@null" android:gravity="start|center_vertical" android:hint="@string/enter_the_device_sn_and_device_name" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView @@ -86,8 +86,8 @@ android:layout_marginEnd="@dimen/dp_21" android:gravity="center" android:text="@string/search" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -109,9 +109,8 @@ android:layout_marginTop="@dimen/dp_23" android:layout_marginEnd="@dimen/dp_21" android:text="@string/history_search" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_16" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
@@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/text_FFECECEC" android:background="@color/text_FF161616" tools:context=".ui.powerstation.HouseSearchActivity"> <!--搜索--> <RelativeLayout @@ -23,12 +23,12 @@ <ImageView android:id="@+id/power_station_back_iv" android:layout_width="@dimen/dp_10" android:layout_height="@dimen/dp_17" android:layout_width="@dimen/dp_30" android:layout_height="@dimen/dp_30" android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:src="@drawable/search_back" /> android:layout_marginStart="@dimen/dp_10" android:src="@drawable/back" /> </RelativeLayout> @@ -62,8 +62,8 @@ android:background="@null" android:gravity="start|center_vertical" android:hint="@string/search_station" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <ImageView @@ -85,8 +85,8 @@ android:layout_marginEnd="@dimen/dp_21" android:gravity="center" android:text="@string/search" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -108,9 +108,8 @@ android:layout_marginTop="@dimen/dp_23" android:layout_marginEnd="@dimen/dp_21" android:text="@string/history_search" android:textColor="@color/text_E6000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_16" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
@@ -17,7 +17,7 @@ android:id="@+id/default_filtering_cl" android:layout_width="match_parent" android:layout_height="447dp" android:background="@color/ffffff" android:background="@drawable/l_r_13" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> @@ -44,8 +44,8 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:text="@string/loading_cancel" android:textColor="@color/text_66000000" android:textSize="@dimen/text_18" /> android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> </LinearLayout> <TextView @@ -57,8 +57,10 @@ android:layout_toEndOf="@+id/cancel_ll" android:gravity="center" android:text="@string/filtering" android:textColor="@color/text_E6000000" android:textSize="@dimen/dp_18" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/dp_18" android:visibility="gone" /> <LinearLayout android:id="@+id/affirm_ll" @@ -73,15 +75,15 @@ android:layout_height="match_parent" android:gravity="center_vertical|start" android:text="@string/loading_affirm" android:textColor="@color/text_38C494" android:textSize="@dimen/text_18" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </LinearLayout> <View android:layout_width="match_parent" android:layout_height="@dimen/dp_1" android:layout_height="0.5dp" android:layout_alignParentBottom="true" android:background="@color/text_E1E1E1" /> android:background="@color/text_1AFFFFFF" /> </RelativeLayout> @@ -93,7 +95,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_18" android:text="@string/string_capacity" android:textColor="@color/text_E6000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_16" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" /> @@ -113,16 +115,16 @@ android:layout_width="@dimen/dp_135" android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:inputType="number" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> <View android:layout_width="@dimen/dp_16" android:layout_height="1dp" android:layout_height="0.5dp" android:layout_alignParentStart="true" android:layout_marginStart="@dimen/dp_180" android:layout_marginTop="@dimen/dp_19" @@ -135,11 +137,11 @@ android:layout_alignParentEnd="true" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:inputType="number" android:textColor="@color/text_E6000000" android:textColorHint="@color/text_66000000" android:textColor="@color/text_E6FFFFFF" android:textColorHint="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> </RelativeLayout> @@ -149,11 +151,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_18" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="0-5" android:text="0 ~ 5" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -164,11 +166,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_18" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="5-10" android:text="5 ~ 10" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text1_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -179,11 +181,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_18" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="10-15" android:text="10 ~ 15" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text2_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -194,11 +196,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_66" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="15-30" android:text="15 ~ 30" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -209,11 +211,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_66" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="30-100" android:text="30 ~ 100" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text4_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -224,11 +226,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_66" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="100-300" android:text="100 ~ 300" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text5_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -239,11 +241,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="114dp" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="300-500" android:text="300 ~ 500" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -254,11 +256,11 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="114dp" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:tag="500+" android:text="500+" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/text7_tv" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -270,7 +272,7 @@ android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="167dp" android:text="@string/grid_connected_state" android:textColor="@color/text_E6000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_16" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/min_max_rl" /> @@ -281,10 +283,10 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="13dp" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:text="@string/message_all" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="@+id/min_max_rl" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> @@ -295,10 +297,10 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="13dp" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:text="@string/grid_connected" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/all_tv" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> @@ -309,10 +311,10 @@ android:layout_height="@dimen/dp_35" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="13dp" android:background="@drawable/search_bj_ff05000000" android:background="@drawable/config_129" android:gravity="center" android:text="@string/off_network" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toEndOf="@+id/grid_connected_tv" app:layout_constraintTop_toBottomOf="@+id/grid_connected_state_title_tv" /> @@ -321,7 +323,7 @@ android:id="@+id/reset_rl" android:layout_width="0dp" android:layout_height="@dimen/dp_52" android:background="@color/text_38C494" android:background="@color/text_FF555859" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> @@ -335,20 +337,20 @@ <ImageView android:layout_width="@dimen/dp_19" android:layout_height="@dimen/dp_17" android:layout_height="@dimen/dp_19" android:src="@drawable/reset" /> <View android:layout_width="@dimen/dp_2" android:layout_height="wrap_content" /> android:layout_width="@dimen/dp_7" android:layout_height="match_parent" /> <TextView android:id="@+id/reset_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_25" android:layout_height="wrap_content" android:text="@string/reset" android:textColor="@color/text_FFFFFFFF" android:textSize="@dimen/text_18" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> </LinearLayout> </RelativeLayout>
@@ -500,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_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_14" /> </RelativeLayout>
@@ -25,7 +25,7 @@ android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/ffffff_13"> android:background="@drawable/bj_ff333738"> <ImageView android:id="@+id/device_details_image_iv" @@ -37,29 +37,51 @@ android:scaleType="centerCrop" /> <TextView android:id="@+id/device_details_name_tv" android:layout_width="170dp" android:layout_height="@dimen/dp_19" android:id="@+id/device_state_tv" android:layout_width="7dp" android:layout_height="7dp" android:layout_marginStart="@dimen/dp_11" android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_21" android:layout_toEndOf="@+id/device_details_image_iv" android:background="@drawable/device_state_ff38c494" /> <TextView android:id="@+id/device_details_name_tv" android:layout_width="match_parent" android:layout_height="@dimen/dp_19" android:layout_marginStart="@dimen/dp_6" android:layout_marginTop="@dimen/dp_15" android:layout_marginEnd="@dimen/dp_6" android:layout_toEndOf="@+id/device_state_tv" android:ellipsize="end" android:gravity="center_vertical|start" android:singleLine="true" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textStyle="bold" /> android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/device_details_sn_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_height="wrap_content" android:layout_below="@+id/device_details_name_tv" android:layout_alignStart="@+id/device_details_name_tv" android:layout_alignStart="@+id/device_state_tv" android:layout_marginTop="@dimen/dp_3" android:gravity="center_vertical" android:textColor="@color/text_66000000" android:text="SN:" 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/device_details_name_tv" android:layout_marginStart="3dp" android:layout_marginTop="1.5dp" android:layout_toEndOf="@+id/device_details_sn_tv" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <LinearLayout android:id="@+id/screening_condition_ll" @@ -84,7 +106,7 @@ android:layout_height="@dimen/dp_18" android:gravity="start" android:text="0" android:textColor="@color/text_E6000000" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_15" /> <TextView @@ -94,10 +116,16 @@ android:layout_marginTop="3dp" android:gravity="start" android:text="@string/device_run_state" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> <View android:layout_width="0.5dp" android:layout_height="17.5dp" android:layout_gravity="center" android:background="@color/text_1AFFFFFF" /> <LinearLayout android:id="@+id/device_label_power_ll" @@ -106,14 +134,31 @@ android:layout_weight="1" android:orientation="vertical"> <TextView android:id="@+id/device_label_power_value_tv" <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_18" android:gravity="center" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> android:gravity="center"> <TextView android:id="@+id/device_label_power_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_horizontal" android:text="0" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/day_kwp_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_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/device_label_power_type_tv" @@ -122,10 +167,16 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/active_power" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> <View android:layout_width="0.5dp" android:layout_height="17.5dp" android:layout_gravity="center" android:background="@color/text_1AFFFFFF" /> <LinearLayout android:id="@+id/device_label_day_ll" @@ -134,14 +185,31 @@ android:layout_weight="1" android:orientation="vertical"> <TextView android:id="@+id/device_label_day_value_tv" <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_18" android:gravity="end" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> android:layout_height="@dimen/dp_18"> <TextView android:id="@+id/device_label_day_value_tv" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:gravity="center_vertical|end" android:text="0" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/month_kwp_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_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/device_label_day_type_tv" @@ -150,7 +218,7 @@ android:layout_marginTop="3dp" android:gravity="end" android:text="@string/day_power_generation" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -161,12 +229,12 @@ <View android:id="@+id/line" android:layout_width="match_parent" android:layout_height="1dp" android:layout_height="0.5dp" android:layout_below="@+id/screening_condition_ll" android:layout_marginStart="@dimen/dp_17" android:layout_marginTop="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_16" android:background="@color/text_E1E1E1" /> android:background="@color/text_1AFFFFFF" /> <!--电站地址--> <RelativeLayout android:layout_width="match_parent" @@ -191,22 +259,9 @@ android:gravity="center_vertical|start" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </RelativeLayout> <TextView android:id="@+id/device_label_state_tv" android:layout_width="69dp" android:layout_height="@dimen/dp_33" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:background="@drawable/state_ffb300" android:gravity="center" android:text="@string/my_power_station_connecting" android:textColor="@color/text_FFFFFFFF" android:textSize="@dimen/text_12" /> </RelativeLayout> app/src/main/res/layout/item_history_title.xml
@@ -2,18 +2,38 @@ <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="@dimen/dp_51"> android:layout_height="@dimen/dp_52"> <View android:id="@+id/line_top" android:layout_width="match_parent" android:layout_height="0.5dp" android:background="@color/text_1AFFFFFF" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/history_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_23" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:ellipsize="end" android:singleLine="true" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginBottom="0.5dp" android:background="@color/text_1AFFFFFF" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/item_plant_details.xml
@@ -53,8 +53,7 @@ android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" /> <TextView android:id="@+id/device_details_sn_tv" @@ -74,8 +73,8 @@ android:layout_height="wrap_content" android:layout_below="@+id/device_details_name_tv" android:layout_marginStart="3dp" android:layout_toEndOf="@+id/device_details_sn_tv" 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" /> @@ -110,14 +109,29 @@ android:layout_weight="1" android:orientation="vertical"> <TextView android:id="@+id/power_value_tv" <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_18" android:gravity="center_vertical|start" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> android:layout_height="wrap_content"> <TextView 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_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/power_kwp_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_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/power_type_tv" @@ -126,10 +140,16 @@ android:layout_marginTop="3dp" android:gravity="center_vertical|start" android:text="@string/generated_power" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> <View android:layout_width="0.5dp" android:layout_height="17.5dp" android:layout_gravity="center" android:background="@color/text_1AFFFFFF" /> <LinearLayout android:id="@+id/day_ll" @@ -138,14 +158,32 @@ android:layout_weight="1" android:orientation="vertical"> <TextView android:id="@+id/day_value_tv" <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_18" android:gravity="center" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> android:gravity="center"> <TextView android:id="@+id/day_value_tv" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_horizontal" android:text="0" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/day_kwp_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_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/day_type_tv" @@ -154,10 +192,16 @@ android:layout_marginTop="3dp" android:gravity="center" android:text="@string/day_power_generation" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> <View android:layout_width="0.5dp" android:layout_height="17.5dp" android:layout_gravity="center" android:background="@color/text_1AFFFFFF" /> <LinearLayout android:id="@+id/month_ll" @@ -166,14 +210,31 @@ android:layout_weight="1" android:orientation="vertical"> <TextView android:id="@+id/month_value_tv" <LinearLayout android:layout_width="match_parent" android:layout_height="@dimen/dp_18" android:gravity="center_vertical|end" android:text="0" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_15" /> android:layout_height="@dimen/dp_18"> <TextView android:id="@+id/month_value_tv" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:gravity="center_vertical|end" android:text="0" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/month_kwp_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_66FFFFFF" android:textSize="@dimen/text_10" /> </LinearLayout> <TextView android:id="@+id/month_type_tv" @@ -182,7 +243,7 @@ android:layout_marginTop="3dp" android:gravity="center_vertical|end" android:text="@string/month_power_generation" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </LinearLayout> @@ -193,12 +254,12 @@ <View android:id="@+id/line" android:layout_width="match_parent" android:layout_height="1dp" 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_E1E1E1" /> android:background="@color/text_1AFFFFFF" /> <!--电站地址--> <RelativeLayout android:layout_width="match_parent" @@ -223,7 +284,7 @@ android:gravity="center_vertical|start" android:singleLine="true" android:text="@string/power_station" android:textColor="@color/text_66000000" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_12" /> </RelativeLayout>
@@ -2,7 +2,7 @@ <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="@dimen/dp_75"> android:layout_height="@dimen/dp_52"> <!-- <ImageView--> <!-- android:id="@+id/power_station_search_iv"--> @@ -12,28 +12,46 @@ <!-- android:src="@drawable/search_path"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent" />--> <View android:id="@+id/line_top" android:layout_width="match_parent" android:layout_height="0.5dp" android:background="@color/text_1AFFFFFF" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/message_name_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_23" android:layout_height="@dimen/dp_20" android:layout_marginTop="6.5dp" android:layout_marginStart="@dimen/dp_16" android:ellipsize="end" android:singleLine="true" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_16" android:textColor="@color/text_E6FFFFFF" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/power_station_location_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_17" android:layout_marginTop="@dimen/dp_7" android:textColor="@color/text_66000000" android:textSize="@dimen/text_12" android:layout_height="@dimen/dp_15" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_11" app:layout_constraintStart_toStartOf="@+id/message_name_tv" app:layout_constraintTop_toBottomOf="@+id/message_name_tv" /> <View android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginBottom="0.5dp" android:background="@color/text_1AFFFFFF" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/null_data_view.xml
@@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="224dp"> android:layout_height="wrap_content"> <ImageView android:id="@+id/null_data_gif_animation_iv" android:layout_width="289.5dp" android:layout_height="189.5dp" android:layout_width="246dp" android:layout_height="158.5dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -16,11 +16,10 @@ <TextView android:id="@+id/null_data_tv" android:layout_width="match_parent" android:layout_width="0dp" android:layout_height="22.5dp" android:layout_marginTop="11.5dp" android:gravity="center" android:textColor="@color/text_7C8590" android:textColor="@color/text_66FFFFFF" android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
