Update README.md

README.md

@@ -28,7 +28,7 @@ mode: 湿度                   # 【温度】或者【湿度】
 **引用示例**
 ~~~
 type: custom:xiaoshi-update-card
-width: 100p%  
+width: 100%
 theme: on
 ~~~
 
@@ -36,9 +36,71 @@ theme: on
 **引用示例**
 ~~~
 type: custom:xiaoshi-offline-card
-width: 320px
+width: 100%
+theme: on
 exclude_devices:
   - *设备*
 exclude_entities:
   - *shiti*
 ~~~
+
+## 功能4：电话信息余额卡(手机平板端通用)
+**引用示例**
+~~~
+type: custom:xiaoshi-balance-card
+name: 电话余额信息
+width: 100%
+theme: on
+entities:
+  - entity_id: sensor.999
+    attribute: null
+    overrides:
+      icon: ""
+      name: ""
+      unit_of_measurement: ""
+      warning: ""
+  - entity_id: input_boolean.777
+    attribute: friendly_name
+    overrides:
+      name: ""
+      icon: ""
+      unit_of_measurement: ""
+      warning: "99"
+~~~
+
+## 功能5：待办事项卡(手机平板端通用)
+**引用示例**
+~~~
+type: custom:xiaoshi-todo-card
+width: 100%
+theme: on
+entities:
+  - todo.kuai_di
+  - todo.ji_shi_ben
+~~~
+
+## 功能6：耗材信息卡片(手机平板端通用)
+**引用示例**
+~~~
+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

@@ -91,6 +91,7 @@ class XiaoshiBalanceCardEditor extends LitElement {
         align-items: center;
         gap: 8px;
         flex: 1;
+        justify-content: space-between;
       }
 
       .entity-details {
@@ -146,10 +147,14 @@ class XiaoshiBalanceCardEditor extends LitElement {
         margin-bottom: 8px;
         font-size: 12px;
         color: #000;
+        justify-content: space-between;
       }
 
       .attribute-config {
         margin-top: 4px;
+        display: flex;
+        flex-direction: column;
+        gap: 4px;
       }
 
       .attribute-input {
@@ -161,6 +166,32 @@ class XiaoshiBalanceCardEditor extends LitElement {
         box-sizing: border-box;
       }
 
+      .override-config {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        margin-top: 2px;
+      }
+
+      .override-checkbox {
+        margin-right: 4px;
+      }
+
+      .override-input {
+        flex: 1;
+        padding: 2px 6px;
+        border: 1px solid #ddd;
+        border-radius: 3px;
+        font-size: 11px;
+        box-sizing: border-box;
+      }
+
+      .override-label {
+        font-size: 11px;
+        color: #666;
+        white-space: nowrap;
+      }
+
       .remove-btn {
         background: none;
         border: none;
@@ -206,16 +237,18 @@ class XiaoshiBalanceCardEditor extends LitElement {
         </div>
 
         <div class="form-group">
-          <label>预警值：低于此值的金额将显示为红色</label>
+          <label>全局预警条件：当任一实体满足此条件时触发预警</label>
           <input 
-            type="number" 
+            type="text" 
             @change=${this._entityChanged}
-            .value=${this.config.warning !== undefined ? this.config.warning : 20}
+            .value=${this.config.global_warning || ''}
-            name="warning"
+            name="global_warning"
-            placeholder="默认20"
+            placeholder="如: >10, <=5, ==on, ==off, =='hello world'"
-            min="0"
-            step="0.01"
           />
+          <div class="help-text">
+            全局预警条件：当任一实体满足此条件时，该实体显示为红色预警状态<br>
+            优先级：明细预警 > 全局预警 > 无预警
+          </div>
         </div>
         
         <div class="form-group">
@@ -249,11 +282,11 @@ class XiaoshiBalanceCardEditor extends LitElement {
                     @click=${() => this._toggleEntity(entity.entity_id)}
                   >
                     <div class="entity-info">
-                      <ha-icon icon="${entity.attributes.icon || 'mdi:help-circle'}"></ha-icon>
                       <div class="entity-details">
                         <div class="entity-name">${entity.attributes.friendly_name || entity.entity_id}</div>
                         <div class="entity-id">${entity.entity_id}</div>
                       </div>
+                      <ha-icon icon="${entity.attributes.icon || 'mdi:help-circle'}"></ha-icon>
                     </div>
                     ${this.config.entities && this.config.entities.some(e => e.entity_id === entity.entity_id) ? 
                       html`<ha-icon icon="mdi:check" class="check-icon"></ha-icon>` : ''}
@@ -273,8 +306,8 @@ class XiaoshiBalanceCardEditor extends LitElement {
                 return html`
                   <div class="selected-entity-config">
                     <div class="selected-entity">
-                      <ha-icon icon="${entity?.attributes.icon || 'mdi:help-circle'}"></ha-icon>
                       <span>${entity?.attributes.friendly_name || entityConfig.entity_id}</span>
+                      <ha-icon icon="${entity?.attributes.icon || 'mdi:help-circle'}"></ha-icon>
                       <button class="remove-btn" @click=${() => this._removeEntity(index)}>
                         <ha-icon icon="mdi:close"></ha-icon>
                       </button>
@@ -287,6 +320,78 @@ class XiaoshiBalanceCardEditor extends LitElement {
                         placeholder="留空使用实体状态，或输入属性名"
                         class="attribute-input"
                       />
+                      
+                      <div class="override-config">
+                        <input 
+                          type="checkbox" 
+                          class="override-checkbox"
+                          @change=${(e) => this._updateEntityOverride(index, 'icon', e.target.checked)}
+                          .checked=${entityConfig.overrides?.icon !== undefined}
+                        />
+                        <span class="override-label">图标:</span>
+                        <input 
+                          type="text" 
+                          class="override-input"
+                          @change=${(e) => this._updateEntityOverrideValue(index, 'icon', e.target.value)}
+                          .value=${entityConfig.overrides?.icon || ''}
+                          placeholder="mdi:icon-name"
+                          ?disabled=${entityConfig.overrides?.icon === undefined}
+                        />
+                      </div>
+
+                      <div class="override-config">
+                        <input 
+                          type="checkbox" 
+                          class="override-checkbox"
+                          @change=${(e) => this._updateEntityOverride(index, 'name', e.target.checked)}
+                          .checked=${entityConfig.overrides?.name !== undefined}
+                        />
+                        <span class="override-label">名称:</span>
+                        <input 
+                          type="text" 
+                          class="override-input"
+                          @change=${(e) => this._updateEntityOverrideValue(index, 'name', e.target.value)}
+                          .value=${entityConfig.overrides?.name || ''}
+                          placeholder="自定义名称"
+                          ?disabled=${entityConfig.overrides?.name === undefined}
+                        />
+                      </div>
+
+                      <div class="override-config">
+                        <input 
+                          type="checkbox" 
+                          class="override-checkbox"
+                          @change=${(e) => this._updateEntityOverride(index, 'unit_of_measurement', e.target.checked)}
+                          .checked=${entityConfig.overrides?.unit_of_measurement !== undefined}
+                        />
+                        <span class="override-label">单位:</span>
+                        <input 
+                          type="text" 
+                          class="override-input"
+                          @change=${(e) => this._updateEntityOverrideValue(index, 'unit_of_measurement', e.target.value)}
+                          .value=${entityConfig.overrides?.unit_of_measurement || ''}
+                          placeholder="自定义单位"
+                          ?disabled=${entityConfig.overrides?.unit_of_measurement === undefined}
+                        />
+                      </div>
+                      
+                      <div class="override-config">
+                        <input 
+                          type="checkbox" 
+                          class="override-checkbox"
+                          @change=${(e) => this._updateEntityOverride(index, 'warning', e.target.checked)}
+                          .checked=${entityConfig.overrides?.warning !== undefined}
+                        />
+                        <span class="override-label">预警:</span>
+                        <input 
+                          type="text" 
+                          class="override-input"
+                          @change=${(e) => this._updateEntityOverrideValue(index, 'warning', e.target.value)}
+                          .value=${entityConfig.overrides?.warning || ''}
+                          placeholder="如: >10, <=5, ==on, ==off, =='hello world'"
+                          ?disabled=${entityConfig.overrides?.warning === undefined}
+                        />
+                      </div>
                     </div>
                   </div>
                 `;
@@ -294,10 +399,13 @@ class XiaoshiBalanceCardEditor extends LitElement {
             ` : ''}
           </div>
           <div class="help-text">
-            搜索并选择要显示的设备余额实体，支持多选。每个实体可以配置要显示的属性：<br>
+            搜索并选择要显示的设备余额实体，支持多选。每个实体可以配置：<br>
-            • 留空：显示实体的状态值<br>
+            • 属性名：留空使用实体状态，或输入属性名<br>
-            • 输入属性名：显示指定属性的值<br>
+            • 名称重定义：勾选后可自定义显示名称<br>
-            • 单位会自动从实体的 unit_of_measurement 属性获取，默认为"元"
+            • 图标重定义：勾选后可自定义图标（如 mdi:phone）<br>
+            • 单位重定义：勾选后可自定义单位（如 元、$、kWh 等）<br>
+            • 预警条件：勾选后设置预警条件，支持 >10, >=10, <10, <=10, ==10, ==on, ==off, =="hello world" 等<br>
+            • 未勾选重定义时，将使用实体的原始属性值
           </div>
         </div>
       </div>
@@ -358,7 +466,11 @@ class XiaoshiBalanceCardEditor extends LitElement {
       newEntities = currentEntities.filter(e => e.entity_id !== entityId);
     } else {
       // 添加实体
-      newEntities = [...currentEntities, { entity_id: entityId, attribute: null }];
+      newEntities = [...currentEntities, { 
+        entity_id: entityId, 
+        attribute: null,
+        overrides: undefined
+      }];
     }
     
     this.config = {
@@ -418,6 +530,69 @@ class XiaoshiBalanceCardEditor extends LitElement {
     this.requestUpdate();
   }
 
+  _updateEntityOverride(index, overrideType, enabled) {
+    const currentEntities = this.config.entities || [];
+    const newEntities = [...currentEntities];
+    
+    if (newEntities[index]) {
+      const overrides = { ...newEntities[index].overrides };
+      
+      if (enabled) {
+        // 启用覆盖，设置默认值
+        overrides[overrideType] = '';
+      } else {
+        // 禁用覆盖，删除该属性
+        delete overrides[overrideType];
+      }
+      
+      newEntities[index] = {
+        ...newEntities[index],
+        overrides: Object.keys(overrides).length > 0 ? overrides : undefined
+      };
+    }
+    
+    this.config = {
+      ...this.config,
+      entities: newEntities
+    };
+    
+    this.dispatchEvent(new CustomEvent('config-changed', {
+      detail: { config: this.config },
+      bubbles: true,
+      composed: true
+    }));
+    
+    this.requestUpdate();
+  }
+
+  _updateEntityOverrideValue(index, overrideType, value) {
+    const currentEntities = this.config.entities || [];
+    const newEntities = [...currentEntities];
+    
+    if (newEntities[index] && newEntities[index].overrides && newEntities[index].overrides[overrideType] !== undefined) {
+      const overrides = { ...newEntities[index].overrides };
+      overrides[overrideType] = value.trim();
+      
+      newEntities[index] = {
+        ...newEntities[index],
+        overrides: overrides
+      };
+    }
+    
+    this.config = {
+      ...this.config,
+      entities: newEntities
+    };
+    
+    this.dispatchEvent(new CustomEvent('config-changed', {
+      detail: { config: this.config },
+      bubbles: true,
+      composed: true
+    }));
+    
+    this.requestUpdate();
+  }
+
   // 点击外部关闭下拉列表
   firstUpdated() {
     document.addEventListener('click', (e) => {
@@ -746,14 +921,39 @@ class XiaoshiBalanceCard extends LitElement {
         // 尝试从属性中获取单位
         if (attributes.unit_of_measurement) {
           unit = attributes.unit_of_measurement;
+        } else {
+          // 如果实体没有单位，则不显示单位
+          unit = '';
+        }
+
+        // 应用属性重定义
+        let friendlyName = attributes.friendly_name || entityId;
+        let icon = attributes.icon || 'mdi:help-circle';
+        let warningThreshold = undefined;
+        
+        // 应用用户自定义的重定义
+        if (entityConfig.overrides) {
+          if (entityConfig.overrides.name !== undefined && entityConfig.overrides.name !== '') {
+            friendlyName = entityConfig.overrides.name;
+          }
+          if (entityConfig.overrides.icon !== undefined && entityConfig.overrides.icon !== '') {
+            icon = entityConfig.overrides.icon;
+          }
+          if (entityConfig.overrides.unit_of_measurement !== undefined && entityConfig.overrides.unit_of_measurement !== '') {
+            unit = entityConfig.overrides.unit_of_measurement;
+          }
+          if (entityConfig.overrides.warning !== undefined && entityConfig.overrides.warning !== '') {
+            warningThreshold = entityConfig.overrides.warning; // 保持原始字符串
+          }
         }
 
         balanceData.push({
           entity_id: entityId,
-          friendly_name: attributes.friendly_name || entityId,
+          friendly_name: friendlyName,
           value: value,
           unit: unit,
-          icon: attributes.icon || 'mdi:help-circle'
+          icon: icon,
+          warning_threshold: warningThreshold
         });
       }
 
@@ -781,6 +981,54 @@ class XiaoshiBalanceCard extends LitElement {
     }
   }
 
+  _evaluateWarningCondition(value, condition) {
+    if (!condition) return false;
+    
+    // 解析条件字符串，支持操作符后可能有空格
+    const match = condition.match(/^(>=|<=|>|<|==|!=)\s*(.+)$/);
+    if (!match) return false;
+    
+    const operator = match[1];
+    let compareValue = match[2].trim();
+    
+    // 移除比较值两端的引号（如果有的话）
+    if ((compareValue.startsWith('"') && compareValue.endsWith('"')) || 
+        (compareValue.startsWith("'") && compareValue.endsWith("'"))) {
+      compareValue = compareValue.slice(1, -1);
+    }
+    
+    // 尝试将值转换为数字
+    const numericValue = parseFloat(value);
+    const numericCompare = parseFloat(compareValue);
+    
+    // 如果两个值都是数字，进行数值比较
+    if (!isNaN(numericValue) && !isNaN(numericCompare)) {
+      switch (operator) {
+        case '>': return numericValue > numericCompare;
+        case '>=': return numericValue >= numericCompare;
+        case '<': return numericValue < numericCompare;
+        case '<=': return numericValue <= numericCompare;
+        case '==': return numericValue === numericCompare;
+        case '!=': return numericValue !== numericCompare;
+      }
+    }
+    
+    // 字符串比较（用于 ==on, ==off, ==66 66 等）
+    const stringValue = String(value);
+    const stringCompare = compareValue;
+    
+    switch (operator) {
+      case '==': return stringValue === stringCompare;
+      case '!=': return stringValue !== stringCompare;
+      case '>': return stringValue > stringCompare;
+      case '>=': return stringValue >= stringCompare;
+      case '<': return stringValue < stringCompare;
+      case '<=': return stringValue <= stringCompare;
+    }
+    
+    return false;
+  }
+
 
   render() {
     if (!this.hass) {
@@ -808,9 +1056,18 @@ class XiaoshiBalanceCard extends LitElement {
               html`<div class="no-devices">请配置余额实体</div>` :
               html`
                 ${this._oilPriceData.map(balanceData => {
-                  const warningThreshold = this.config.warning || 20;
+                  // 明细预警优先级最高
-                  const numericValue = parseFloat(balanceData.value);
+                  let isWarning = false;
-                  const isWarning = !isNaN(numericValue) && numericValue < warningThreshold;
+                  
+                  // 首先检查明细预警，如果存在且满足条件，直接设为预警状态
+                  if (balanceData.warning_threshold && balanceData.warning_threshold.trim() !== '') {
+                    isWarning = this._evaluateWarningCondition(balanceData.value, balanceData.warning_threshold); 
+                  } else {
+                    // 只有在没有明细预警时才检查全局预警
+                    if (this.config.global_warning && this.config.global_warning.trim() !== '') {
+                      isWarning = this._evaluateWarningCondition(balanceData.value, this.config.global_warning);
+                    }
+                  }
                   
                   return html`
                     <div class="device-item" @click=${() => this._handleEntityClick(balanceData)}>

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,10 +1,12 @@
-console.info("%c 消逝卡-平板端 \n%c      v 0.0.5 ", "color: red; font-weight: bold; background: black", "color: white; font-weight: bold; background: black");
+console.info("%c 消逝卡-平板端 \n%c      v 0.1.1 ", "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');
     
     window.customCards = window.customCards || [];
     window.customCards.push(...cardConfigs);
@@ -33,6 +35,18 @@ const cardConfigs = [
     name: '消逝电话余额卡',
     description: '消逝电话余额卡',
     preview: true
+  },
+  {
+    type: 'xiaoshi-todo-card',
+    name: '消逝待办事项',
+    description: '消逝待办事项',
+    preview: true
+  },
+  {
+    type: 'xiaoshi-consumables-card',
+    name: '消逝耗材统计',
+    description: '消逝耗材统计',
+    preview: true
   }
 ];