dolphin-weex-bc 0.0.14 → 0.0.16

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 
 # 升级日志
 
+## 0.0.16
+
+- [ ! ] 小美卡片组件设备id获取优化
+- [ ! ] date: 2025/11/04
+
+## 0.0.15
+
+- [ ! ] 耗材业务组件水波纹数据单独封装
+- [ ! ] date: 2025/10/29
+
 ## 0.0.14
 
 - [ ! ] 耗材业务组件修复bug

package/dist/index.native.js

@@ -3176,15 +3176,13 @@ var MaterialEvent = {
     var _this11 = this;
 
     return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
-      var tmpcodeList, circleColorList, codeList, skuinfolist, groupNum, index, shopList;
+      var tmpcodeList, codeList, skuinfolist, groupNum, index, shopList;
       return regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
               tmpcodeList = [];
-              circleColorList = _this11.isDiablo ? ['#D35936', '#BE8214', '#0490D3'] : ['#F56428', '#FFAA10', '#00A4F2'];
 
-              console.log('颜色集合：' + JSON.stringify(circleColorList));
               _this11.deviceMaterialList.forEach(function (item) {
                 var device = deviceList.findIndex(function (it) {
                   return item.applianceCode == it.deviceId;
@@ -3206,18 +3204,7 @@ var MaterialEvent = {
                   if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable && it.serviceSupport.washingService.productCode) {
                     tmpcodeList.push(it.serviceSupport.washingService.productCode);
                   }
-                  var percent = it.percent;
-                  chartData.incompletedColor = _this11.isDiablo ? '#2b2f32' : _this11.needBackground ? '#F6F7F9' : '#ffffff';
-                  it.chartData = _extends({}, chartData, {
-                    progressCounter: percent < 1 && percent != 0 ? 1 : percent,
-                    completedColor: circleColorList[it.remainingStatus],
-                    textColor: circleColorList[it.remainingStatus]
-                  }, {
-                    text: percent + '%',
-                    textSize: _this11.isScale ? 11 : 12,
-                    cornerRadius: isIos ? 44 : 88,
-                    thickness: isIos ? 3 : 6
-                  });
+                  it.chartData = _this11.setChartData(it);
                 });
               });
 
@@ -3227,7 +3214,7 @@ var MaterialEvent = {
               console.log('codeList9999===1' + JSON.stringify(codeList));
 
               if (codeList.length) {
-                _context8.next = 9;
+                _context8.next = 7;
                 break;
               }
 
@@ -3235,98 +3222,98 @@ var MaterialEvent = {
               _this11.handleMaterialSeviceType();
               return _context8.abrupt('return');
 
-            case 9:
+            case 7:
               skuinfolist = [];
 
               if (!(codeList && codeList.length > 20)) {
-                _context8.next = 29;
+                _context8.next = 27;
                 break;
               }
 
               groupNum = Math.ceil(codeList.length / 20);
               index = 0;
 
-            case 13:
+            case 11:
               if (!(index < groupNum)) {
-                _context8.next = 27;
+                _context8.next = 25;
                 break;
               }
 
-              _context8.prev = 14;
-              _context8.next = 17;
+              _context8.prev = 12;
+              _context8.next = 15;
               return _this11.getUpkeepShopInfo(codeList.slice(index * 20, (index + 1) * 20));
 
-            case 17:
+            case 15:
               shopList = _context8.sent;
 
               skuinfolist = skuinfolist.concat(shopList);
-              _context8.next = 24;
+              _context8.next = 22;
               break;
 
-            case 21:
-              _context8.prev = 21;
-              _context8.t0 = _context8['catch'](14);
-              return _context8.abrupt('continue', 24);
+            case 19:
+              _context8.prev = 19;
+              _context8.t0 = _context8['catch'](12);
+              return _context8.abrupt('continue', 22);
 
-            case 24:
+            case 22:
               index++;
-              _context8.next = 13;
+              _context8.next = 11;
               break;
 
-            case 27:
-              _context8.next = 37;
+            case 25:
+              _context8.next = 35;
               break;
 
-            case 29:
-              _context8.prev = 29;
-              _context8.next = 32;
+            case 27:
+              _context8.prev = 27;
+              _context8.next = 30;
               return _this11.getUpkeepShopInfo(codeList);
 
-            case 32:
+            case 30:
               skuinfolist = _context8.sent;
-              _context8.next = 37;
+              _context8.next = 35;
               break;
 
-            case 35:
-              _context8.prev = 35;
-              _context8.t1 = _context8['catch'](29);
+            case 33:
+              _context8.prev = 33;
+              _context8.t1 = _context8['catch'](27);
 
-            case 37:
+            case 35:
 
               console.log('获取到的商品信息：' + JSON.stringify(skuinfolist));
 
               if (!(skuinfolist.length > 0)) {
-                _context8.next = 49;
+                _context8.next = 47;
                 break;
               }
 
-              _context8.prev = 39;
-              _context8.next = 42;
+              _context8.prev = 37;
+              _context8.next = 40;
               return _this11.handleGoodsInfoNewSkuId(skuinfolist);
 
-            case 42:
-              _context8.next = 46;
+            case 40:
+              _context8.next = 44;
               break;
 
-            case 44:
-              _context8.prev = 44;
-              _context8.t2 = _context8['catch'](39);
+            case 42:
+              _context8.prev = 42;
+              _context8.t2 = _context8['catch'](37);
 
-            case 46:
+            case 44:
               _this11.setMaterialGoodInfo(skuinfolist);
-              _context8.next = 50;
+              _context8.next = 48;
               break;
 
-            case 49:
+            case 47:
               //此时如果有活动链接就取活动链接
               _this11.handleMaterialSeviceType();
 
-            case 50:
+            case 48:
             case 'end':
               return _context8.stop();
           }
         }
-      }, _callee8, _this11, [[14, 21], [29, 35], [39, 44]]);
+      }, _callee8, _this11, [[12, 19], [27, 33], [37, 42]]);
     }))();
   },
 
@@ -3564,22 +3551,55 @@ var MaterialEvent = {
       });
     });
   },
+  setChartData: function setChartData(it) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+    var isDiablo = this.isDiablo;
+    var needBackground = this.needBackground;
+    var isScale = this.isDisScaleiablo;
+    console.log('chartdata数据变化:' + JSON.stringify(options));
+
+    if (options.hasOwnProperty('isDiablo')) {
+      isDiablo = options.isDiablo;
+    }
+    if (options.hasOwnProperty('needBackground')) {
+      needBackground = options.needBackground;
+    }
+    if (options.hasOwnProperty('isScale')) {
+      isScale = options.isScale;
+    }
+    var newChartData = {};
+    var circleColorList = isDiablo ? ['#D35936', '#BE8214', '#0490D3'] : ['#F56428', '#FFAA10', '#00A4F2'];
+    var percent = it.percent;
+    newChartData = _extends({}, chartData, {
+      progressCounter: percent < 1 && percent != 0 ? 1 : percent,
+      completedColor: circleColorList[it.remainingStatus],
+      incompletedColor: isDiablo ? '#2b2f32' : needBackground ? '#F6F7F9' : '#ffffff',
+      textColor: circleColorList[it.remainingStatus]
+    }, {
+      text: percent + '%',
+      textSize: isScale ? 11 : 12,
+      cornerRadius: isIos ? 44 : 88,
+      thickness: isIos ? 3 : 6
+    });
+    return newChartData;
+  },
 
 
   // 设置波浪百分比
-  setWavePercent: function setWavePercent(item) {
+  setWavePercent: function setWavePercent(item, isDiablo) {
     // remainingStatus 0-已耗尽，1-余量不足，2-余量充足
     var type = item.remainingStatus;
     var percent = type == 2 ? 0.4 : 0.05;
     var percentTxt = type == 2 ? '充足' : '不足';
-    var textColorList = this.isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2'];
-    var frontColorList = this.isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5'];
-    var backColorList = this.isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7'];
+    var textColorList = isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2'];
+    var frontColorList = isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5'];
+    var backColorList = isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7'];
     return {
       frontWaveColor: frontColorList[type], //已完成后的颜色默认#FFFFFF
       backWaveColor: backColorList[type],
       animate: true,
-      backgroundColor: this.isDiablo ? '#1E2326' : '#FFFFFF', //背景色 默认为#000000
+      backgroundColor: isDiablo ? '#1E2326' : '#FFFFFF', //背景色 默认为#000000
       progress: percent, // 进度 [0 ... 1]
       textFont: 11, //字体大小，默认为14
       text: percentTxt, //文本 默认为空
@@ -62680,7 +62700,7 @@ exports.default = {
   },
   data: function data() {
     return {
-      deviceMaterialList: this.data,
+      deviceMaterialList: [],
       arrowIcon: _icon2.default.icon_arrow
     };
   },
@@ -62691,13 +62711,20 @@ exports.default = {
     }
   },
   watch: {
+    isDiablo: {
+      handler: function handler(val) {
+        if (this.deviceMaterialList.length > 0) {
+          this.handleChartData(this.deviceMaterialList);
+        }
+      }
+    },
     data: {
       handler: function handler(val) {
         var _this = this;
 
         console.log('传入的耗材' + JSON.stringify(val));
         if (val.length > 0) {
-          this.deviceMaterialList = val;
+          this.handleChartData(val);
           setTimeout(function () {
             _this.handleRenderEnd();
           }, 200);
@@ -62838,8 +62865,23 @@ exports.default = {
         }, _callee3, _this4, [[0, 7, 10, 13]]);
       }))();
     },
+    handleChartData: function handleChartData(val) {
+      var _this5 = this;
+
+      var tempVal = JSON.parse(JSON.stringify(val));
+      tempVal.forEach(function (item) {
+        item.consumables.forEach(function (it) {
+          it.chartData = _index2.default.setChartData(it, {
+            isDiablo: _this5.isDiablo,
+            isScale: _this5.isScale,
+            needBackground: _this5.needBackground
+          });
+        });
+      });
+      this.deviceMaterialList = tempVal;
+    },
     setWavePercent: function setWavePercent(item) {
-      return _index2.default.setWavePercent(item);
+      return _index2.default.setWavePercent(item, this.isDiablo);
     },
 
 
@@ -62983,12 +63025,12 @@ exports.default = {
       }
     },
     handleRenderEnd: function handleRenderEnd() {
-      var _this5 = this;
+      var _this6 = this;
 
       setTimeout(function () {
-        _this5.$emit('consumablesInfo', { deviceMaterialList: deviceMaterialList });
-        dom.getComponentRect(_this5.$refs.materialBox, function (data) {
-          _this5.$emit('renderEnd', data.size.height);
+        _this6.$emit('consumablesInfo', { deviceMaterialList: deviceMaterialList });
+        dom.getComponentRect(_this6.$refs.materialBox, function (data) {
+          _this6.$emit('renderEnd', data.size.height);
         });
       }, 200);
     }
@@ -63166,7 +63208,7 @@ exports.default = {
   created: function created() {
     var _this = this;
 
-    this.$bridge.getDeviceInfo().then(function (res) {
+    _dolphinNativeBridge.Bridge.getDeviceInfo().then(function (res) {
       _this.deviceInfo = res.result || {};
     });
   },
@@ -67778,12 +67820,12 @@ module.exports = {
     "width": "88",
     "height": "88",
     "marginRight": "28",
+    "borderRadius": 50,
     "backgroundColor": "#FFFFFF",
     "textAlign": "center",
     "display": "flex",
     "justifyContent": "center",
     "alignItems": "center",
-    "borderRadius": "12",
     "overflow": "hidden"
   },
   "noData-txt": {
@@ -68115,7 +68157,7 @@ module.exports = {
 
 module.exports = {
   "material-title-isDiablo": {
-    "backgroundImage": "linear-gradient(to bottom, #64747E, #171C1F)",
+    "backgroundImage": "linear-gradient(to bottom, #3C474D, #171C1F)",
     "borderBottom": "1px solid #23282b"
   },
   "material-title-isScale": {