fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

电池电量icon优化

Browse Source
This commit is contained in:
fengjignqi
2026-06-02 13:58:54 +08:00
parent b7ab2e69a4
commit 03e67932b1
49 changed files with 293 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/ckkj/water/index/IndexFragment.java
View File

@@ -3,6 +3,7 @@ package com.ckkj.water.index;
import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.view.View;
import androidx.annotation.NonNull;
@@ -15,6 +16,7 @@ import com.ckkj.water.custom.view.CustomRefreshHeader;
import com.ckkj.water.databinding.IndexFragmentLayoutBinding;
import com.ckkj.water.device.AddDeviceActivity;
import com.ckkj.water.device.DeviceControlActivity;
import com.ckkj.water.history.entity.WateringRecord;
import com.ckkj.water.index.adapter.DeviceAdapter;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.index.mvp.IndexContract;
@@ -155,7 +157,6 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
*/
@Override
public void getDeviceListSuccess(List<WaterDeviceEntity> list, int total) {
hideDialogLoading();
List<WaterDeviceEntity> pageList = list == null ? new ArrayList<>() : list;
if (mCurrentPage == 1) {

19
app/src/main/java/com/ckkj/water/index/adapter/DeviceAdapter.java
View File

@@ -1,6 +1,8 @@
package com.ckkj.water.index.adapter;
import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.Nullable;
@@ -8,6 +10,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.ckkj.water.R;
import com.ckkj.water.index.entity.WaterDeviceEntity;
import com.ckkj.water.utils.manager.PowerIconManage;
import com.esafirm.imagepicker.model.Image;
import java.util.List;
@@ -21,10 +25,21 @@ public class DeviceAdapter extends BaseQuickAdapter<WaterDeviceEntity, BaseViewH
@Override
protected void convert(BaseViewHolder holder, WaterDeviceEntity item) {
ImageView imgPower = holder.getView(R.id.img_battery);
View viewStatus = holder.getView(R.id.view_status_dot);
holder.setText(R.id.tv_device_name,item.getDeviceName());
holder.setText(R.id.tv_device_serial,item.getDeviceSn());
holder.setText(R.id.tv_device_status,"工作中");
holder.setText(R.id.tv_battery_level,"80");
holder.setText(R.id.tv_device_status,item.getWorkStatus().equals("0") ?
mContext.getString(R.string.device_status_not_working) :
mContext.getString(R.string.device_status_working));
holder.setTextColor(R.id.tv_device_status,item.getWorkStatus().equals("0") ?
mContext.getResources().getColor(R.color.color_999999) :
mContext.getResources().getColor(R.color.color_24B326));
viewStatus.setBackground(item.getWorkStatus().equals("0") ?
mContext.getResources().getDrawable(R.drawable.shape_status_dot_999999)
: mContext.getResources().getDrawable(R.drawable.shape_status_dot_green));
holder.setText(R.id.tv_battery_level,item.getPowerLevel());
imgPower.setImageResource(PowerIconManage.getInstance().getPowerIcon(Integer.parseInt(item.getPowerLevel())));
}

5
app/src/main/java/com/ckkj/water/index/entity/WaterDeviceEntity.java
View File

@@ -34,7 +34,8 @@ public class WaterDeviceEntity implements Serializable {
private String deviceName;
private Object deviceImg;
private String status;
private Object powerLevel;
private String workStatus;
private String powerLevel;
private Object powerLevelUpdatatime;
private String wifiName;
private String wifiPassword;
@@ -55,7 +56,7 @@ public class WaterDeviceEntity implements Serializable {
private Object deviceImg;
private String status;
private String workStatus;
private Object powerLevel;
private String powerLevel;
private Object powerLevelUpdatatime;
private String wifiName;
private String wifiPassword;