Merge branch 'wjc_new' into feature/hxb

mac

2024-05-29 a77dcb0250488ca6567490ed9fb5ce969bf41db7

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

@@ -156,6 +156,7 @@

            }
            break;
            case 5:
            case 2: {
                text = mContext.getString(R.string.my_power_station_off_line);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
@@ -166,17 +167,18 @@
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
            }
            break;
            case 4: {
            case 4:
            {
                text = mContext.getString(R.string.my_power_station_malfunction);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
            }
            //5:离线有故障Offline_fault
            break;
            case 5: {
                text = mContext.getString(R.string.Offline_fault);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
            }
            break;
//            case 5: {
//                text = mContext.getString(R.string.Offline_fault);
//                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
//            }
//            break;
        }
        textView.setText(text);
        textView.setBackground(drawable);