Update README.md

README.md

@@ -24,19 +24,12 @@ max: 80                      # 当前地区最大值
 mode: 湿度                   # 【温度】或者【湿度】
 ~~~
 
-## 功能2：HA版本更新卡(手机平板端通用)
+## 功能2：HA信息卡(手机平板端通用)
 **引用示例**
 ~~~
 type: custom:xiaoshi-update-card
 width: 100%
-theme: on
+skip_updates: false    #是否包含已跳过的更新
-~~~
-
-## 功能3：HA离线设备卡(手机平板端通用)
-**引用示例**
-~~~
-type: custom:xiaoshi-offline-card
-width: 100%
 theme: on
 exclude_devices:
   - *设备*
@@ -44,7 +37,7 @@ exclude_entities:
   - *shiti*
 ~~~
 
-## 功能4：电话信息余额卡(手机平板端通用)
+## 功能3：电话信息余额卡(手机平板端通用)
 **引用示例**
 ~~~
 type: custom:xiaoshi-balance-card
@@ -68,7 +61,7 @@ entities:
       warning: "99"
 ~~~
 
-## 功能5：待办事项卡(手机平板端通用)
+## 功能4：待办事项卡(手机平板端通用)
 **引用示例**
 ~~~
 type: custom:xiaoshi-todo-card
@@ -78,3 +71,29 @@ entities:
   - todo.kuai_di
   - todo.ji_shi_ben
 ~~~
+
+## 功能5：耗材信息卡片(手机平板端通用)
+**引用示例**
+~~~
+type: custom:xiaoshi-consumables-card
+width: 100%
+global_warning: <8
+columns: "2"
+entities:
+  - entity_id: input_text.aaa
+    overrides:
+      name: 奥斯卡德拉萨达实打实实打实
+      unit_of_measurement: "%"
+      warning: <10
+      conversion: "*2"
+      icon: ""
+  - entity_id: input_text.aaa1
+  - entity_id: input_text.aaa2
+  - entity_id: input_text.aaa3
+  - entity_id: input_text.aaa4
+  - entity_id: input_text.aaa5
+  - entity_id: input_text.aaa6
+  - entity_id: input_text.aaa7
+~~~
+
+

xiaoshi-device-balance-card.js

@@ -466,11 +466,12 @@ class XiaoshiBalanceCardEditor extends LitElement {
       newEntities = currentEntities.filter(e => e.entity_id !== entityId);
     } else {
       // 添加实体
-      newEntities = [...currentEntities, { 
+      const newEntity = { 
         entity_id: entityId,
-        attribute: null,
         overrides: undefined
-      }];
+      };
+      // 只有在明确指定属性时才添加 attribute 字段
+      newEntities = [...currentEntities, newEntity];
     }
     
     this.config = {
@@ -510,10 +511,17 @@ class XiaoshiBalanceCardEditor extends LitElement {
     const newEntities = [...currentEntities];
     
     if (newEntities[index]) {
-      newEntities[index] = {
+      const updatedEntity = { ...newEntities[index] };
-        ...newEntities[index],
+      
-        attribute: attributeValue.trim() || null
+      if (attributeValue.trim()) {
-      };
+        // 只有当属性值不为空时才设置 attribute 字段
+        updatedEntity.attribute = attributeValue.trim();
+      } else {
+        // 如果属性值为空，则移除 attribute 字段
+        delete updatedEntity.attribute;
+      }
+      
+      newEntities[index] = updatedEntity;
     }
     
     this.config = {
@@ -1062,12 +1070,10 @@ class XiaoshiBalanceCard extends LitElement {
                   // 首先检查明细预警，如果存在且满足条件，直接设为预警状态
                   if (balanceData.warning_threshold && balanceData.warning_threshold.trim() !== '') {
                     isWarning = this._evaluateWarningCondition(balanceData.value, balanceData.warning_threshold); 
-                    console.log(`明细预警 - 实体: ${balanceData.friendly_name}, 值: "${balanceData.value}", 条件: "${balanceData.warning_threshold}", 预警: ${isWarning}`);
                   } else {
                     // 只有在没有明细预警时才检查全局预警
                     if (this.config.global_warning && this.config.global_warning.trim() !== '') {
                       isWarning = this._evaluateWarningCondition(balanceData.value, this.config.global_warning);
-                      console.log(`全局预警 - 实体: ${balanceData.friendly_name}, 值: "${balanceData.value}", 条件: "${this.config.global_warning}", 预警: ${isWarning}`);
                     }
                   }
                   

xiaoshi-device-consumables-card.js

@@ -74,7 +74,6 @@ class XiaoshiConsumablesCardEditor extends LitElement {
         align-items: center;
         justify-content: space-between;
         padding: 8px 12px;
-        cursor: pointer;
         border-bottom: 1px solid #eee;
       }
 
@@ -247,7 +246,8 @@ class XiaoshiConsumablesCardEditor extends LitElement {
           />
           <div class="help-text">
             全局预警条件：当任一实体满足此条件时，该实体显示为红色预警状态<br>
-            优先级：明细预警 > 全局预警 > 无预警
+            优先级：明细预警 > 全局预警 > 无预警<br>
+            预警基于换算后的结果进行判断（如果配置了换算）
           </div>
         </div>
         
@@ -400,10 +400,33 @@ class XiaoshiConsumablesCardEditor extends LitElement {
                           class="override-input"
                           @change=${(e) => this._updateEntityOverrideValue(index, 'warning', e.target.value)}
                           .value=${entityConfig.overrides?.warning || ''}
-                          placeholder="如: >10, <=5, ==on, ==off, =='hello world'"
+                          placeholder='>10, <=5, ==on,=="hello world"'
                           ?disabled=${entityConfig.overrides?.warning === undefined}
                         />
                       </div>
+
+                      <div class="override-config">
+                        <input 
+                          type="checkbox" 
+                          class="override-checkbox"
+                          @change=${(e) => this._updateEntityOverride(index, 'conversion', e.target.checked)}
+                          .checked=${entityConfig.overrides?.conversion !== undefined}
+                        />
+                        <span class="override-label">换算:</span>
+                        <input 
+                          type="text" 
+                          class="override-input"
+                          @change=${(e) => this._updateEntityOverrideValue(index, 'conversion', e.target.value)}
+                          .value=${entityConfig.overrides?.conversion || ''}
+                          placeholder="+10, -10, *1.5, /2"
+                          ?disabled=${entityConfig.overrides?.conversion === undefined}
+                        />
+                      </div>
+
+                      <div class="help-text">
+                        <strong>预警：</strong>针对单个实体的预警条件，优先级高于全局预警<br>
+                        <strong>换算：</strong>对原始数值进行数学运算，支持 +10, -10, *1.5, /2 等格式<br>
+                      </div>
                     </div>
                   </div>
                 `;
@@ -412,11 +435,13 @@ class XiaoshiConsumablesCardEditor extends LitElement {
           </div>
           <div class="help-text">
             搜索并选择要显示的设备耗材实体，支持多选。每个实体可以配置：<br>
+            • <strong>特殊实体显示：</strong>binary_sensor(off→正常,on→缺少), event(unknown→正常,其他→低电量)<br>
             • 属性名：留空使用实体状态，或输入属性名<br>
             • 名称重定义：勾选后可自定义显示名称<br>
             • 图标重定义：勾选后可自定义图标（如 mdi:phone）<br>
             • 单位重定义：勾选后可自定义单位（如 元、$、kWh 等）<br>
             • 预警条件：勾选后设置预警条件，支持 >10, >=10, <10, <=10, ==10, ==on, ==off, =="hello world" 等<br>
+            • 换算：对数值进行数学运算，支持 +10, -10, *1.5, /2 等<br>
             • 未勾选重定义时，将使用实体的原始属性值
           </div>
         </div>
@@ -426,6 +451,8 @@ class XiaoshiConsumablesCardEditor extends LitElement {
   }
 
   _entityChanged(e) {
+
+    
     const { name, value } = e.target;
     if (!value && name !== 'theme' && name !== 'width' ) return;
     
@@ -476,7 +503,6 @@ class XiaoshiConsumablesCardEditor extends LitElement {
     } else {
       newEntities = [...currentEntities, { 
         entity_id: entityId, 
-        attribute: null,
         overrides: undefined
       }];
     }
@@ -518,11 +544,19 @@ class XiaoshiConsumablesCardEditor extends LitElement {
     const newEntities = [...currentEntities];
     
     if (newEntities[index]) {
+      const trimmedValue = attributeValue.trim();
+      if (trimmedValue === '') {
+        // 如果属性为空，则从配置中移除 attribute 字段
+        const { attribute, ...entityWithoutAttribute } = newEntities[index];
+        newEntities[index] = entityWithoutAttribute;
+      } else {
+        // 如果属性不为空，则设置属性值
         newEntities[index] = {
           ...newEntities[index],
-        attribute: attributeValue.trim() || null
+          attribute: trimmedValue
         };
       }
+    }
     
     this.config = {
       ...this.config,
@@ -705,7 +739,6 @@ class XiaoshiConsumablesCard extends LitElement {
       .device-count.non-zero {
         background: rgba(255, 0, 0, 0.7);
         color: #fff;
-        animation: pulse 2s infinite;
       }
       
       .device-count.zero {
@@ -771,11 +804,12 @@ class XiaoshiConsumablesCard extends LitElement {
         align-items: center;
         justify-content: space-between;
         margin: 0px 16px;
-        padding: 6px 0;
+        padding: 0;
         border-bottom: 1px solid rgb(150,150,150,0.5);
         cursor: pointer;
         transition: background-color 0.2s;
-        min-height: 32px;
+        min-height: 30px;
+        max-height: 30px;
       }
 
       .device-item:first-child {
@@ -798,8 +832,8 @@ class XiaoshiConsumablesCard extends LitElement {
       .devices-grid {
         display: grid;
         grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
-        gap: 1px;
+        gap: 0 15px;
-        padding: 0 16px;
+        padding: 0px 16px;
         width: 100%;
         box-sizing: border-box;
         overflow: hidden;
@@ -815,15 +849,16 @@ class XiaoshiConsumablesCard extends LitElement {
 
       /*2列布局中的设备项*/
       .devices-grid .device-item {
-        margin: 0;
+        margin: 0.5px 0;
-        padding: 4px 12px;
+        padding: 0;
         background: var(--bg-color, #fff);
         display: flex;
         align-items: center;
         justify-content: space-between;
         cursor: pointer;
         transition: background-color 0.2s;
-        min-height: 24px;
+        min-height: 30px;
+        max-height: 30px;
         border-bottom: none;
         border-right: none;
         border-left: none;
@@ -831,6 +866,7 @@ class XiaoshiConsumablesCard extends LitElement {
         max-width: 100%;
         box-sizing: border-box;
         overflow: hidden;
+        border-bottom: 1px solid rgb(150,150,150,0.5);
       }
 
       .devices-grid .device-item:hover {
@@ -895,9 +931,9 @@ class XiaoshiConsumablesCard extends LitElement {
       }
 
       .device-unit {
-        font-size: 8px;
+        font-size: 9px;
         color: var(--fg-color, #000);
-        margin-left: 2px;
+        margin-left: 0.5px;
         font-weight: bold;
         white-space: nowrap;
         flex-shrink: 0;
@@ -995,6 +1031,26 @@ class XiaoshiConsumablesCard extends LitElement {
           value = attributes[attributeName];
         }
 
+        // 特殊实体类型的数值显示逻辑
+        if (!attributeName) {
+          // binary_sensor 实体：off显示正常，on显示缺少
+          if (entityId.startsWith('binary_sensor.')) {
+            if (value === 'off') {
+              value = '正常';
+            } else if (value === 'on') {
+              value = '缺少';
+            }
+          }
+          // event 实体：unknown显示正常，非unknown或不可用时显示低电量
+          else if (entityId.startsWith('event.')) {
+            if (value === 'unknown') {
+              value = '正常';
+            } else if (value !== 'unknown' && value !== 'unavailable') {
+              value = '低电量';
+            }
+          }
+        }
+
         // 尝试从属性中获取单位
         if (attributes.unit_of_measurement) {
           unit = attributes.unit_of_measurement;
@@ -1007,6 +1063,7 @@ class XiaoshiConsumablesCard extends LitElement {
         let friendlyName = attributes.friendly_name || entityId;
         let icon = attributes.icon || 'mdi:help-circle';
         let warningThreshold = undefined;
+        let conversion = undefined;
         
         // 应用用户自定义的重定义
         if (entityConfig.overrides) {
@@ -1022,15 +1079,27 @@ class XiaoshiConsumablesCard extends LitElement {
           if (entityConfig.overrides.warning !== undefined && entityConfig.overrides.warning !== '') {
             warningThreshold = entityConfig.overrides.warning; // 保持原始字符串
           }
+          if (entityConfig.overrides.conversion !== undefined && entityConfig.overrides.conversion !== '') {
+            conversion = entityConfig.overrides.conversion; // 换算表达式
+          }
+        }
+
+        // 应用换算（只对数值进行换算，不对文本状态进行换算）
+        let originalValue = value;
+        if (conversion && !isNaN(parseFloat(value))) {
+          value = this._applyConversion(value, conversion);
+        } else if (conversion && isNaN(parseFloat(value))) {
         }
 
         consumablesData.push({
           entity_id: entityId,
           friendly_name: friendlyName,
           value: value,
+          original_value: originalValue,
           unit: unit,
           icon: icon,
-          warning_threshold: warningThreshold
+          warning_threshold: warningThreshold,
+          conversion: conversion
         });
       }
 
@@ -1061,13 +1130,21 @@ class XiaoshiConsumablesCard extends LitElement {
   _renderDeviceItem(consumablesData) {
     let isWarning = false;
     
+    // 特殊实体类型的默认预警逻辑
+    if (consumablesData.entity_id.startsWith('binary_sensor.') && !consumablesData.warning_threshold) {
+      // binary_sensor: "缺少"状态时预警
+      isWarning = consumablesData.value === '缺少';
+    } else if (consumablesData.entity_id.startsWith('event.') && !consumablesData.warning_threshold) {
+      // event: "低电量"状态时预警
+      isWarning = consumablesData.value === '低电量';
+    } else {
+      // 使用配置的预警条件
       if (consumablesData.warning_threshold && consumablesData.warning_threshold.trim() !== '') {
         isWarning = this._evaluateWarningCondition(consumablesData.value, consumablesData.warning_threshold);
-      console.log(`明细预警 - 实体: ${consumablesData.friendly_name}, 值: "${consumablesData.value}", 条件: "${consumablesData.warning_threshold}", 预警: ${isWarning}`);
       } else {
         if (this.config.global_warning && this.config.global_warning.trim() !== '') {
           isWarning = this._evaluateWarningCondition(consumablesData.value, this.config.global_warning);
-        console.log(`全局预警 - 实体: ${consumablesData.friendly_name}, 值: "${consumablesData.value}", 条件: "${this.config.global_warning}", 预警: ${isWarning}`);
+        }
       }
     }
     
@@ -1085,6 +1162,54 @@ class XiaoshiConsumablesCard extends LitElement {
     `;
   }
 
+  _applyConversion(value, conversion) {
+    if (!conversion || !value) return value;
+    
+    try {
+      // 提取数值部分
+      const numericValue = parseFloat(value);
+      if (isNaN(numericValue)) {
+        console.warn(`无法将值 "${value}" 转换为数字进行换算`);
+        return value;
+      }
+      
+      // 解析换算表达式
+      const match = conversion.match(/^([+\-*/])(\d+(?:\.\d+)?)$/);
+      if (!match) {
+        console.warn(`无效的换算表达式: "${conversion}"，支持的格式: +10, -10, *1.5, /2`);
+        return value;
+      }
+      
+      const operator = match[1];
+      const operand = parseFloat(match[2]);
+      
+      let result;
+      switch (operator) {
+        case '+':
+          result = numericValue + operand;
+          break;
+        case '-':
+          result = numericValue - operand;
+          break;
+        case '*':
+          result = numericValue * operand;
+          break;
+        case '/':
+          result = numericValue / operand;
+          break;
+        default:
+          return value;
+      }
+      
+      // 返回结果，保留适当的小数位数
+      return Number.isInteger(result) ? result.toString() : result.toFixed(2).toString();
+      
+    } catch (error) {
+      console.error(`换算时出错: ${error.message}`);
+      return value;
+    }
+  }
+
   _evaluateWarningCondition(value, condition) {
     if (!condition) return false;
     
@@ -1141,6 +1266,15 @@ class XiaoshiConsumablesCard extends LitElement {
     const warningCount = this._oilPriceData.filter(consumablesData => {
       let isWarning = false;
       
+      // 对于 binary_sensor 和 event，使用默认预警逻辑
+      if (consumablesData.entity_id.startsWith('binary_sensor.') && !consumablesData.warning_threshold) {
+        // binary_sensor: "缺少"状态时预警
+        isWarning = consumablesData.value === '缺少';
+      } else if (consumablesData.entity_id.startsWith('event.') && !consumablesData.warning_threshold) {
+        // event: "低电量"状态时预警
+        isWarning = consumablesData.value === '低电量';
+      } else {
+        // 使用配置的预警条件
         if (consumablesData.warning_threshold && consumablesData.warning_threshold.trim() !== '') {
           isWarning = this._evaluateWarningCondition(consumablesData.value, consumablesData.warning_threshold);
         } else {
@@ -1148,6 +1282,7 @@ class XiaoshiConsumablesCard extends LitElement {
             isWarning = this._evaluateWarningCondition(consumablesData.value, this.config.global_warning);
           }
         }
+      }
       
       return isWarning;
     }).length;
@@ -1156,7 +1291,7 @@ class XiaoshiConsumablesCard extends LitElement {
       <ha-card style="--fg-color: ${fgColor}; --bg-color: ${bgColor};">
         <div class="card-header">
           <div class="card-title">
-            <span class="offline-indicator" style="background: rgb(0,222,220); animation: pulse 2s infinite"></span>
+            <span class="offline-indicator" style="background: ${warningCount === 0 ? 'rgb(0,255,0)' : 'rgb(255,0,0)'}; animation: pulse 2s infinite"></span>
             ${this.config.name || '耗材信息统计'}
           </div>
           <div class="device-count ${warningCount > 0 ? 'non-zero' : 'zero'}">

xiaoshi-device-update-card.js

@@ -68,6 +68,19 @@ class XiaoshiUpdateCardEditor extends LitElement {
           </select>
         </div>
         
+        <div class="form-group">
+          <label>
+            <input 
+              type="checkbox" 
+              @change=${this._entityChanged}
+              .checked=${this.config.skip_updates !== false}
+              name="skip_updates"
+            />
+            包含已跳过的更新
+          </label>
+          <div class="help-text">如果勾选，将包含标记为跳过的版本更新</div>
+        </div>
+        
 
       </div>
 
@@ -75,10 +88,17 @@ class XiaoshiUpdateCardEditor extends LitElement {
   }
 
   _entityChanged(e) {
-    const { name, value } = e.target;
+    const { name, value, type, checked } = e.target;
-    if (!value && name !== 'theme' && name !== 'width') return;
     
-    let finalValue = value;
+    let finalValue;
+    
+    // 处理复选框
+    if (type === 'checkbox') {
+      finalValue = checked;
+    } else {
+      if (!value && name !== 'theme' && name !== 'width') return;
+      finalValue = value;
+    }
     
     // 处理不同字段的默认值
     if (name === 'width') {
@@ -459,19 +479,10 @@ export class XiaoshiUpdateCard extends LitElement {
       const haUpdates = [];
       const otherUpdates = [];
 
-      
-
-      
-
-      
-
-      
-
-      
-
       // 获取update.开头的实体更新信息
       try {
         const entities = Object.values(this.hass.states);
+        const skipUpdates = this.config.skip_updates !== false; // 默认为true
         
         entities.forEach(entity => {
           // 筛选以update.开头的实体
@@ -484,6 +495,15 @@ export class XiaoshiUpdateCard extends LitElement {
                 attributes.installed_version &&
                 attributes.latest_version !== attributes.installed_version) {
               
+              // 如果不跳过更新，检查skipped_version属性
+              if (!skipUpdates) {
+                const skippedVersion = attributes.skipped_version;
+                // 如果skipped_version不为null且等于latest_version，则跳过此更新
+                if (skippedVersion !== null && skippedVersion === attributes.latest_version) {
+                  return; // 跳过此更新
+                }
+              }
+              
               const updateData = {
                 name: attributes.friendly_name || entity.entity_id.replace('update.', ''),
                 current_version: attributes.installed_version,
@@ -493,7 +513,8 @@ export class XiaoshiUpdateCard extends LitElement {
                 entity_id: entity.entity_id,
                 title: attributes.title || '',
                 release_url: attributes.release_url || '',
-                entity_picture: attributes.entity_picture || ''
+                entity_picture: attributes.entity_picture || '',
+                skipped_version: attributes.skipped_version || null
               };
               
               // 检查是否为home_assistant开头的实体
@@ -765,9 +786,6 @@ export class XiaoshiUpdateCard extends LitElement {
     return html`${backupElements}`;
   }
 
-
-
-
   render() {
     if (!this.hass) {
       return html`<div class="loading">等待Home Assistant连接...</div>`;
@@ -837,6 +855,7 @@ export class XiaoshiUpdateCard extends LitElement {
                         <div class="device-name">${update.name}</div>
                         <div class="device-details">
                           当前版本: ${update.current_version} → 最新版本: ${update.latest_version}
+                          ${update.skipped_version ? html`<br><span style="color: #ff9800;">已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen" @click=${(e) => this._handleConfirmUpdate(update, e)}>
@@ -861,6 +880,7 @@ export class XiaoshiUpdateCard extends LitElement {
                         <div class="device-name">${update.name}</div>
                         <div class="device-details">
                           当前版本: ${update.current_version} → 最新版本: ${update.latest_version}
+                          ${update.skipped_version ? html`<br><span style="color: #ff9800;">已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen" @click=${(e) => this._handleConfirmUpdate(update, e)}>

xiaoshi-pad-card.js

@@ -1,12 +1,14 @@
-console.info("%c 消逝卡-平板端 \n%c      v 0.0.9 ", "color: red; font-weight: bold; background: black", "color: white; font-weight: bold; background: black");
+console.info("%c 消逝卡-平板端 \n%c      v 0.1.3 ", "color: red; font-weight: bold; background: black", "color: white; font-weight: bold; background: black");
 
 const loadCards = async () => {
     await import('./xiaoshi-pad-grid-card.js');
-    await import('./xiaoshi-device-update-card.js');
-    await import('./xiaoshi-device-offline-card.js');
     await import('./xiaoshi-device-balance-card.js');
     await import('./xiaoshi-device-todo-card.js');
     await import('./xiaoshi-device-consumables-card.js');
+    await import('./xiaoshi-device-consumables-button.js');
+    await import('./xiaoshi-device-ha-info-card.js'); 
+    await import('./xiaoshi-device-update-card.js');
+    await import('./xiaoshi-device-offline-card.js');
     
     window.customCards = window.customCards || [];
     window.customCards.push(...cardConfigs);
@@ -19,15 +21,9 @@ const cardConfigs = [
     description: '温度分布、湿度分布'
   },
   {
-    type: 'xiaoshi-update-card',
+    type: 'xiaoshi-ha-info-card',
-    name: '消逝卡HA更新监控卡片',
+    name: '消逝卡HA信息卡片',
-    description: '显示需要更新的组件和版本',
+    description: '消逝卡HA信息卡片',
-    preview: true
-  },
-  {
-    type: 'xiaoshi-offline-card',
-    name: '消逝卡HA离线设备卡片',
-    description: '显示所有离线的设备和实体',
     preview: true
   },
   {