dolphin-weex-bc 0.0.12 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-bc",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "",
   "main": "index.js",
   "directories": {

package/packages/dof-consumables/assets/css/index_diablo.css

@@ -41,6 +41,56 @@
   color: #8E969B;
 }
 
+.title-txt2-user1{
+  font-size: 22px;
+  color: #797C7E;
+}
+
+.title-txt2-user1-1{
+  font-size: 22px;
+  color: #303538;
+}
+
+.title-txt2-user2{
+  font-size: 22px;
+  color: #8E969B;
+}
+
+.title-txt2-user3{
+  font-size: 24px;
+  color: #797C7E;
+}
+
+.title-txt2-user3-3{
+  font-size: 24px;
+  color: #303538;
+}
+
+.title-txt2-user4{
+  font-size: 24px;
+  color: #8E969B;
+}
+
+.title-txt2-user-n1{
+  font-size: 22px;
+  color: #D35926;
+}
+
+.title-txt2-user-n2{
+  font-size: 22px;
+  color: #F56428;
+}
+
+.title-txt2-user-n3{
+  font-size: 24px;
+  color: #D35926;
+}
+
+.title-txt2-user-n4{
+  font-size: 24px;
+  color: #F56428;
+}
+
 
 .title-icon-isScale{
   width: 81px;
@@ -57,8 +107,6 @@
 
 .title-txt2-user-isScale{
   font-size: 22px;
-  max-width: 340px;
-  background-color: #f00;
 }
 
 .title-txt2-user-isDiablo{

package/packages/dof-consumables/index.vue

@@ -3,7 +3,11 @@
     <template v-for="(item, index) in deviceMaterialList">
       <div
         class="material-list"
-        :style="{ width: width + 'px', 'background-color': isDiablo ? '#101315' : needBackground ? '#fff' : '#F6F7F9' }"
+        :style="{
+          width: width + 'px',
+          'background-color': isDiablo ? '#101315' : needBackground ? '#fff' : '#F6F7F9',
+          'margin-bottom': isScale ? '15px' : '34px'
+        }"
         :key="index"
       >
         <template v-if="item.consumables && item.consumables.length > 0">
@@ -17,14 +21,29 @@
                 item.deviceInfo.deviceName
               }}</text>
               <div class="title-txt3-box">
+                <!-- 因为动态class会产生不预期的bug，先暂时用ifelse处理 -->
                 <text v-if="isScale && isDiablo" class="title-txt2-o1">{{ item.deviceInfo.roomName }}</text>
                 <text v-else-if="isScale" class="title-txt2-o2">{{ item.deviceInfo.roomName }}</text>
                 <text v-else-if="isDiablo" class="title-txt2-o3">{{ item.deviceInfo.roomName }}</text>
                 <text v-else-if="!isScale && !isDiablo" class="title-txt2-o4">{{ item.deviceInfo.roomName }}</text>
-                <text class="title-txt2-user"> | </text>
-                <text :class="['title-txt2-user', item.deviceInfo.isOnline != 1 && 'title-txt3']">{{
-                  item.deviceInfo.isOnline == 1 ? '在线' : '离线'
-                }}</text>
+
+                <text v-if="isScale && isDiablo" class="title-txt2-user1-1"> | </text>
+                <text v-else-if="isScale" class="title-txt2-user2"> | </text>
+                <text v-else-if="isDiablo" class="title-txt2-user3-3"> | </text>
+                <text v-else-if="!isScale && !isDiablo" class="title-txt2-user4"> | </text>
+
+                <template v-if="item.deviceInfo.isOnline == 1">
+                  <text v-if="isScale && isDiablo" class="title-txt2-user1">在线</text>
+                  <text v-else-if="isScale" class="title-txt2-user2">在线</text>
+                  <text v-else-if="isDiablo" class="title-txt2-user3">在线</text>
+                  <text v-else-if="!isScale && !isDiablo" class="title-txt2-user4">在线</text>
+                </template>
+                <template v-else>
+                  <text v-if="isScale && isDiablo" class="title-txt2-user-n1">离线</text>
+                  <text v-else-if="isScale" class="title-txt2-user-n2">离线</text>
+                  <text v-else-if="isDiablo" class="title-txt2-user-n3">离线</text>
+                  <text v-else-if="!isScale && !isDiablo" class="title-txt2-user-n4">离线</text>
+                </template>
               </div>
             </div>
           </div>
@@ -250,27 +269,7 @@ export default {
   data() {
     return {
       deviceMaterialList: this.data,
-      isIos: weex.config.env.platform == 'iOS' ? true : false,
-      chartData: {
-        completedColor: '#00a4f2', //环形进度条未完成后的颜色默认#267AFF
-        incompletedColor: '#f9f9f9', //环形进度条未完成后的颜色，默认透明
-        thickness: 3, //环形进度条宽度，默认4
-        cornerRadius: 44, //环形的半径，默认是width/2
-        totalCounter: 100, //环形进度条的最大值，默认是360
-        progressCounter: 80, //设置进度值，默认是从0-360, 默认为0
-        autoProgress: false, //设置是否需要自动执行环形进度，默认false, 如果设置为true，则每秒进度值+1操作
-        clockwise: false, //环形自动执行进度的方向，默认是true，即顺时针方向，false为逆时针方向
-        startingSlice: 360, //环形进度开始的起始位置，当totalCounter为360的时候，0: 0点钟位置起点，90:3点钟位置起点 180:6点钟位置起点
-        pointShow: false, //环形进度中的进度球是否需要显示，默认不显示
-        pointRadius: 8, //默认是环形进度宽度的一半
-        pointColor: '#FFFFFF', //环形进度中的进度球颜色
-        duration: 1000
-      },
-      arrowIcon: Icon.icon_arrow,
-      from: '',
-      homegroupId: '',
-      applianceCode: '',
-      deviceInfo: {}
+      arrowIcon: Icon.icon_arrow
     }
   },
   computed: {
@@ -315,7 +314,9 @@ export default {
   methods: {
     async getAllMaterialList() {
       try {
-        this.deviceMaterialList = await MaterialEvent.getAllMaterialList(this.materialParams)
+        this.deviceMaterialList = await MaterialEvent.getAllMaterialList(this.materialParams, {
+          isDiablo: this.isDiablo
+        })
         console.log('新的耗材数据' + JSON.stringify(this.deviceMaterialList))
         this.getInnerHeight()
       } catch (error) {
@@ -327,7 +328,10 @@ export default {
 
     async getMaterialList() {
       try {
-        this.deviceMaterialList = await MaterialEvent.getMaterialList(this.materialParams, this.isCurrentHome)
+        this.deviceMaterialList = await MaterialEvent.getMaterialList(this.materialParams, {
+          isDiablo: this.isDiablo,
+          isCurrentHome: this.isCurrentHome
+        })
         console.log('新的耗材数据' + JSON.stringify(this.deviceMaterialList))
         this.getInnerHeight()
       } catch (error) {
@@ -338,7 +342,7 @@ export default {
     },
 
     setWavePercent(item) {
-      MaterialEvent.setWavePercent(item)
+      return MaterialEvent.setWavePercent(item)
     },
 
     // 跳转前节流

package/packages/material-event/index.js

@@ -529,8 +529,13 @@ const MaterialEvent = {
 
   deviceMaterialList: [],
 
+  isDiablo: false,
+
+  isCurrentHome: false,
+
   //批量查询耗材的情况
-  async getAllMaterialList(params) {
+  async getAllMaterialList(params, options) {
+    if (options.isDiablo) this.isDiablo = options.isDiablo
     return new Promise(async (resolve, reject) => {
       try {
         console.log('进来这里啦' + JSON.stringify(params))
@@ -551,12 +556,14 @@ const MaterialEvent = {
     })
   },
 
-  async getMaterialList(params, isCurrentHome) {
+  async getMaterialList(params, options) {
+    if (options.isDiablo) this.isDiablo = options.isDiablo
+    if (options.isCurrentHome) this.isCurrentHome = options.isCurrentHome
     return new Promise(async (resolve, reject) => {
       try {
         console.log('进来这里啦11' + JSON.stringify(params))
         let deviceList = []
-        if (isCurrentHome) {
+        if (options.isCurrentHome) {
           const res = await this.getCurrentHomeInfo()
           deviceList = res.deviceList
         } else {
@@ -646,7 +653,8 @@ const MaterialEvent = {
   //处理接口返回数据
   async handleMaterialRes(deviceList) {
     let tmpcodeList = []
-    let circleColorList = ['#F56428', '#FFAA10', '#00A4F2']
+    let circleColorList = this.isDiablo ? ['#D35936', '#BE8214', '#0490D3'] : ['#F56428', '#FFAA10', '#00A4F2']
+    console.log('颜色集合：' + JSON.stringify(circleColorList))
     this.deviceMaterialList.forEach(item => {
       let device = deviceList.findIndex(it => item.applianceCode == it.deviceId)
 
@@ -674,6 +682,8 @@ const MaterialEvent = {
         const percent = it.percent
           ? it.percent
           : Math.ceil(this.floatMul(this.floatDiv(it.remainingValue, it.total), 100))
+
+        chartData.incompletedColor = this.isDiablo ? '#2b2f32' : '#ffffff'
         it.chartData = {
           ...chartData,
           ...{
@@ -880,15 +890,14 @@ const MaterialEvent = {
     let type = item.remainingStatus
     let percent = type == 2 ? 0.4 : 0.05
     let percentTxt = type == 2 ? '充足' : '不足'
-    let textColorList = ['#F56428', '#F56428', '#00A4F2']
-    let frontColorList = ['#F56428', '#F56428', '#9fdaf5']
-    let backColorList = ['#fc9791', '#fc9791', '#c7e8f7']
-
+    let textColorList = this.isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2']
+    let frontColorList = this.isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5']
+    let backColorList = this.isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7']
     return {
       frontWaveColor: frontColorList[type], //已完成后的颜色默认#FFFFFF
       backWaveColor: backColorList[type],
       animate: true,
-      backgroundColor: '#FFFFFF', //背景色 默认为#000000
+      backgroundColor: this.isDiablo ? '#1E2326' : '#FFFFFF', //背景色 默认为#000000
       progress: percent, // 进度 [0 ... 1]
       textFont: 11, //字体大小，默认为14
       text: percentTxt, //文本 默认为空