Update xiaoshi-pad-card.js

README.md

@@ -24,19 +24,12 @@ max: 80                      # 当前地区最大值
 mode: 湿度                   # 【温度】或者【湿度】
 ~~~
 
-## 功能2：HA版本更新卡(手机平板端通用)
+## 功能2：HA信息卡(手机平板端通用)
 **引用示例**
 ~~~
 type: custom:xiaoshi-update-card
 width: 100%
-theme: on
-~~~
-
-## 功能3：HA离线设备卡(手机平板端通用)
-**引用示例**
-~~~
-type: custom:xiaoshi-offline-card
-width: 100%
+skip_updates: false    #是否包含已跳过的更新
 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
@@ -79,7 +72,7 @@ entities:
   - todo.ji_shi_ben
 ~~~
 
-## 功能6：耗材信息卡片(手机平板端通用)
+## 功能5：耗材信息卡片(手机平板端通用)
 **引用示例**
 ~~~
 type: custom:xiaoshi-consumables-card

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;
       }
 
@@ -452,6 +451,8 @@ class XiaoshiConsumablesCardEditor extends LitElement {
   }
 
   _entityChanged(e) {
+
+    
     const { name, value } = e.target;
     if (!value && name !== 'theme' && name !== 'width' ) return;
     
@@ -1265,11 +1266,21 @@ class XiaoshiConsumablesCard extends LitElement {
     const warningCount = this._oilPriceData.filter(consumablesData => {
       let isWarning = false;
       
-      if (consumablesData.warning_threshold && consumablesData.warning_threshold.trim() !== '') {
-        isWarning = this._evaluateWarningCondition(consumablesData.value, consumablesData.warning_threshold);
+      // 对于 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 (this.config.global_warning && this.config.global_warning.trim() !== '') {
-          isWarning = this._evaluateWarningCondition(consumablesData.value, this.config.global_warning);
+        // 使用配置的预警条件
+        if (consumablesData.warning_threshold && consumablesData.warning_threshold.trim() !== '') {
+          isWarning = this._evaluateWarningCondition(consumablesData.value, consumablesData.warning_threshold);
+        } else {
+          if (this.config.global_warning && this.config.global_warning.trim() !== '') {
+            isWarning = this._evaluateWarningCondition(consumablesData.value, this.config.global_warning);
+          }
         }
       }
       

xiaoshi-device-todo-card.js

@@ -1082,7 +1082,25 @@ class XiaoshiTodoCard extends LitElement {
                       ${todoData.items.length === 0 ? 
                         html`<div class="no-devices">暂无待办事项</div>` :
                         html`
-                          ${todoData.items.map(item => {
+                          ${(() => {
+                            // 将待办事项分为有时间和无时间两组
+                            const itemsWithoutTime = todoData.items.filter(item => !item.due);
+                            const itemsWithTime = todoData.items.filter(item => item.due);
+                            
+                            // 没有时间的按名称排序
+                            itemsWithoutTime.sort((a, b) => (a.summary || '').localeCompare(b.summary || ''));
+                            
+                            // 有时间的按时间排序
+                            itemsWithTime.sort((a, b) => {
+                              const dateA = new Date(a.due);
+                              const dateB = new Date(b.due);
+                              return dateA - dateB;
+                            });
+                            
+                            // 合并结果：无时间的在前，有时间的在后
+                            const sortedItems = [...itemsWithoutTime, ...itemsWithTime];
+                            
+                            return sortedItems.map(item => {
                             const dueText = this._calculateDueDate(item.due);
                             const isEditing = this._editingItem && this._editingItem.entityId === todoData.entity_id && this._editingItem.uid === item.uid;
                             
@@ -1185,7 +1203,8 @@ class XiaoshiTodoCard extends LitElement {
                                 </button>
                               </div>
                             `;
-                          })}
+                          });
+                          })()}
                         `
                       }
                       <div>

xiaoshi-device-update-card.js

@@ -159,7 +159,6 @@ export class XiaoshiUpdateCard extends LitElement {
         align-items: center;
         padding: 16px;
         background: var(--bg-color, #fff);
-        
         border-radius: 12px;
       }
 
@@ -189,7 +188,6 @@ export class XiaoshiUpdateCard extends LitElement {
         display: flex;
         align-items: center;
         justify-content: center;
-
       }
 
       /*标题统计数字*/
@@ -271,7 +269,8 @@ export class XiaoshiUpdateCard extends LitElement {
         align-items: center;
         padding: 0px;
         border-bottom: 1px solid rgb(150,150,150,0.2);
-        margin: 0 24px 8px 32px;
+        margin: 0 32px 4px 32px;
+        padding: 4px 0 0 0;
       }
 
       /*设备、实体明细背景*/
@@ -279,7 +278,7 @@ export class XiaoshiUpdateCard extends LitElement {
         flex: 1;
         overflow-y: auto;
         min-height: 0;
-        padding: 0 0 8px  0;
+        padding: 4px 0;
       }
 
       .device-icon {
@@ -294,7 +293,7 @@ export class XiaoshiUpdateCard extends LitElement {
       .device-name {
         font-weight: 500;
         color: var(--fg-color, #000);
-        margin-bottom: 4px;
+        margin: 2px 0;
       }
 
       .device-entity {
@@ -306,7 +305,6 @@ export class XiaoshiUpdateCard extends LitElement {
       .device-details {
         font-size: 10px;
         color: var(--fg-color, #000);
-        margin-top: 4px;
       }
 
       .device-last-seen { 
@@ -327,13 +325,13 @@ export class XiaoshiUpdateCard extends LitElement {
 
       .no-devices {
         text-align: center;
-        padding: 8px 0 0 0;
+        padding: 8px 0;
         color: var(--fg-color, #000);
       }
 
       .loading {
         text-align: center;
-        padding: 0px;
+        padding: 10px 0px;
         color: var(--fg-color, #000);
       }
 
@@ -409,12 +407,12 @@ export class XiaoshiUpdateCard extends LitElement {
       /* 备份信息独立容器 */
       .backup-info {
         padding: 4px 0 4px 16px;
-        margin: 0 16px 0 30px;
-        border-bottom: 1px solid rgb(150,150,150,0.2);
+        margin: 0 32px 8px 32px;
         display: grid;
         grid-template-columns: auto auto auto;
         gap: 4px;
         align-items: center;
+        border-bottom: 1px solid rgb(150,150,150,0.2);
       }
     `;
   }
@@ -469,6 +467,17 @@ export class XiaoshiUpdateCard extends LitElement {
     }
   }
 
+  _handleEntityClick(entity) {
+    navigator.vibrate(50);
+    // 点击实体时打开实体详情页
+    if (entity.entity_id) {
+      // 使用您建议的第一种方式
+      const evt = new Event('hass-more-info', { composed: true });
+      evt.detail = { entityId: entity.entity_id };
+      this.dispatchEvent(evt);
+    }
+  }
+
   async _loadUpdateData() {
     if (!this.hass) return;
     
@@ -542,14 +551,10 @@ export class XiaoshiUpdateCard extends LitElement {
     this._loading = false;
   }
 
-
-
   _handleRefresh() {
     this._loadUpdateData();
     navigator.vibrate(50);
   }
-
-
   
   _handleUpdateClick(update) {
     navigator.vibrate(50);
@@ -581,6 +586,10 @@ export class XiaoshiUpdateCard extends LitElement {
     
     if (confirmed) {
       this._executeUpdate(update);
+      // 延迟3秒后刷新数据，给更新操作足够时间完成
+      setTimeout(() => {
+        this._loadUpdateData();
+      }, 1000);
     }
   }
 
@@ -822,19 +831,9 @@ export class XiaoshiUpdateCard extends LitElement {
           ${this._renderHAVersionInfo()}
         </div>
         
-        <!-- 备份信息 -->
-        <div class="section-divider">
-          <div class="section-title">
-            <span> • 备份信息</span>
-          </div>
-        </div>
-        <div class="backup-info">
-          ${this._renderBackupInfo()}
-        </div>
-        
         <div class="devices-list">
           ${this._loading ? 
-            html`<div class="loading">加载中...</div>` :
+            html`<div class="loading">HA版本信息加载中...</div>` :
             
             (this._haUpdates.length === 0 && this._otherUpdates.length === 0) ? 
               html`<div class="no-devices">✅ 所有组件都是最新版本</div>` :
@@ -847,7 +846,7 @@ export class XiaoshiUpdateCard extends LitElement {
                     </div>
                   </div>
                   ${this._haUpdates.map(update => html`
-                    <div class="device-item">
+                    <div class="device-item" @click=${() => this._handleEntityClick(update)}>
                       <div class="device-icon">
                         <ha-icon icon="${update.icon}"></ha-icon>
                       </div>
@@ -855,7 +854,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>` : ''}
+                          ${update.skipped_version ? html`<span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen" @click=${(e) => this._handleConfirmUpdate(update, e)}>
@@ -867,12 +866,12 @@ export class XiaoshiUpdateCard extends LitElement {
                 ${this._otherUpdates.length > 0 ? html`
                   <div class="section-divider">
                     <div class="section-title">
-                      <span> • 加载项、卡片更新</span>
+                      <span> • HACS更新</span>
                       <span class="section-count ${this._otherUpdates.length > 0 ? 'non-zero' : 'zero'}">${this._otherUpdates.length}</span>
                     </div>
                   </div>
                   ${this._otherUpdates.map(update => html`
-                    <div class="device-item">
+                    <div class="device-item" @click=${() => this._handleEntityClick(update)}>
                       <div class="device-icon">
                         <ha-icon icon="${update.icon}"></ha-icon>
                       </div>
@@ -880,7 +879,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>` : ''}
+                          ${update.skipped_version ? html`<span style="color: #ff9800;"> 已跳过版本: ${update.skipped_version}</span>` : ''}
                         </div>
                       </div>
                       <div class="device-last-seen" @click=${(e) => this._handleConfirmUpdate(update, e)}>
@@ -890,8 +889,18 @@ export class XiaoshiUpdateCard extends LitElement {
                   `)}\n                ` : ''}
               `
           }
+
         </div>
-      </ha-card>
+        <!-- 备份信息 -->
+        <div class="section-divider">
+          <div class="section-title">
+            <span> • 备份信息</span>
+          </div>
+        </div>
+        <div class="backup-info">
+          ${this._renderBackupInfo()}
+        </div>
+        </ha-card>
     `;
   }
 

xiaoshi-pad-card.js

@@ -1,12 +1,14 @@
-console.info("%c 消逝卡-平板端 \n%c      v 0.1.2 ", "color: red; font-weight: bold; background: black", "color: white; font-weight: bold; background: black");
+console.info("%c 消逝卡-平板端 \n%c      v 0.1.4 ", "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',
-    name: '消逝卡HA更新监控卡片',
-    description: '显示需要更新的组件和版本',
-    preview: true
-  },
-  {
-    type: 'xiaoshi-offline-card',
-    name: '消逝卡HA离线设备卡片',
-    description: '显示所有离线的设备和实体',
+    type: 'xiaoshi-ha-info-card',
+    name: '消逝卡HA信息卡片',
+    description: '消逝卡HA信息卡片',
     preview: true
   },
   {