牛棚页面 + 首页少部分修改 + 一键控制 + 调试loading

src/app/east/east.page.ts

@@ -126,7 +126,9 @@ export class EastPage implements OnInit {
             }
             this.load.offLoad();
             this._inv = setTimeout(() => {
+                if (!this.load.isLoad) {
                     this.getData(0);
+                }
             }, 30000);
         }]);
 

src/app/home/home.page.html

 <div class="mainCon">
+    <div class="topSearch">
+        <SearchBar [placeholder]="'点击此处进行搜索'"></SearchBar>
+    </div>
     <ion-slides style="width: 100%;height: 200px;" mode="ios"
                 [options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">
         <ion-slide class="slideCon" *ngFor="let one of imgs">

src/app/home/home.page.scss

@@ -73,3 +73,21 @@
 .frank-item{
   width : 100%;
 }
+
+.topSearch {
+  padding-right: 40px;
+}
+
+.topSearch::after {
+  content: '搜索';
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: inline-block;
+  height: 44px;
+  line-height: 44px;
+  text-align: center;
+  width: 50px;
+  color: #1890ff;
+  background-color: #efeff4;
+}

src/app/other/other.page.html

@@ -21,6 +21,12 @@
             </div>
         </ListItem>
     </div>
+    <div class="bottomPart">
+        <ListItem multipleLine *ngFor="let a of allBtns">
+            一键控制{{a.l}}
+            <v-switch [value]="a.v" (click)="allCheck(a)" [loading]="a.d"></v-switch>
+        </ListItem>
+    </div>
     <div class="bottomPart">
         <ListItem multipleLine *ngFor="let a of devices;let i = index">
             {{a.fieldDeviceName}}

src/app/other/other.page.ts

-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {Transfer} from '../service/transfer';
 import {Api} from '../service/api';
 import {Load} from '../service/load';
@@ -24,6 +24,8 @@ export class OtherPage implements OnInit {
     devices = [];
     fieldRegionNo = '';
     fieldRegionName = '';
+    types = [];
+    allBtns = [];
 
     constructor(private tf: Transfer, private api: Api, private load: Load, private ac: ActivatedRoute) {
     }
@@ -36,7 +38,7 @@ export class OtherPage implements OnInit {
     }
 
     // ionic的生命周期函数
-  ionViewWillEnter () {
+    ionViewWillEnter() {
         this.nanClicked = false;
         this.beiClicked = false;
         this.nanLoading = false;
@@ -61,9 +63,9 @@ export class OtherPage implements OnInit {
                 this.getData(1);
                 this.api.presentMsgToast(data.message);
             } else {
-        a.loading = false;
                 this.api.presentMsgToast(data.message);
             }
+            a.loading = false;
             this.load.offLoad();
         }]);
     }
@@ -79,17 +81,66 @@ export class OtherPage implements OnInit {
         this.tf.transfer({url: '/home'});
     }
 
+    initAllBtn() {
+        if (this.types.length === this.devices.length && this.devices.length === 2) {
+            let v = 0;
+            if (this.devices.filter(a => a.value).length === this.devices.length) {
+                v = 1;
+            }
+            this.allBtns = [{l: '全部', v: v, d: false, t: 0}];
+        } else {
+            const obj = [];
+            this.types.map((a) => {
+                const c = {l: a, v: 0, d: false, t: a === '泵' ? 1 : 2};
+                if (this.devices.filter(b => b.fieldDeviceType === a && b.value).length ===
+                    this.devices.filter(b => b.fieldDeviceType === a).length) {
+                    c.v = 1;
+                }
+                obj.push(c);
+            });
+            this.allBtns = obj;
+        }
+    }
+
+    allCheck(a) {
+        a.d = true;
+        const req = {
+            fieldRegionNo: this.fieldRegionNo,
+            op: a.v ? 0 : 1,
+            type: a.t
+        };
+        this.load.toLoad('指令已发送, 等待处理结果', true);
+        this.api.control.controlBatchSwitch([req, (data) => {
+            if (data.code === 1) {
+                this.getData(1);
+                this.api.presentMsgToast(data.message);
+            } else {
+                this.api.presentMsgToast(data.message);
+            }
+            a.d = false;
+            this.load.offLoad();
+        }]);
+    }
+
     getData(time) {
-    if (time) {this.load.toLoad('加载中...', false); }
+        if (time) {
+            this.load.toLoad('加载中...', false);
+        }
         this.api.app.getDeviceData([{fieldRegionNo: this.fieldRegionNo}, (data) => {
                 if (data.constructor === Array) {
                     this.devices = data;
+                    this.types = Array.from(new Set(data.map(a => a.fieldDeviceType)));
+                    if (time) {
+                        this.initAllBtn();
+                    }
                 } else {
                     this.api.presentMsgToast(data.message || '获取数据失败');
                 }
                 this.load.offLoad();
                 this._inv = setTimeout(() => {
+                    if (!this.load.isLoad) {
                         this.getData(0);
+                    }
                 }, 30000);
             }]);
 

src/app/row/row.page.html

-<p>
-  row works!
-</p>
+<div class="full-page">
+    <i class="vo v-kaifa"></i>
+    <div class="row-text">
+        该页面开发中...
+    </div>
+</div>

src/app/row/row.page.scss

+.full-page {
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  padding: 30% 0;
+}
+i.vo.v-kaifa {
+  font-size: 200px;
+  color: #4cd2c8;
+}
+.row-text {
+  color: #4cd2c8;
+  font-size: 20px;
+  line-height: 40px;
+}

src/app/service/load.ts

@@ -12,6 +12,9 @@ export class Load {
 
     toLoad(msg, type) {
         if (!this.isLoad) {
+            // 进行异步操作,避免angular在检查时刚初始化就重新赋值check会报错
+            // 虽然无实质影响,但那个红色报错看得我不舒服,就此调成类异步
+            setTimeout(() => {
                 this.isLoad = true;
                 this.msg = msg;
                 if (type) {
@@ -19,6 +22,7 @@ export class Load {
                     this.time = 0;
                     this.addNum();
                 }
+            });
         }
     }
 

src/assets/icon/iconfont.css

 @font-face {font-family: "vo";
-  src: url('iconfont.eot?t=1560241691370'); /* IE9 */
-  src: url('iconfont.eot?t=1560241691370#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAWYAAsAAAAACvAAAAVLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDRgqJIIdOATYCJAMcCxAABCAFhCUHXRtDCREVpLGR/TzI3FTaK6GYLB7qy+XsW8r4sXi/g+f7td+5T3b3m9LcK5Hpps2sqlVo2mhmoRMy0WQ6cX96z3qTSRfByuqCdbLEAXBOan0Qv1Tfd2q9tQAXQFmwj7f8Fnfcb0deikdnAPzPsdRrauC7f9UOkf+yNYMqV0TTgVWk6N5AJuxTGU5Cb1JmDqx3OR8CBMklCtRSXKkCKwy8mQAy3aNbK1jVAhgPR/DcjmVfA7IPFk/NIG4BsJf+vvxBglgBCquBt23tKuqAvDfEmx54vHk8DMYEMO0vBowOAg1UAxiQWWtiHHBeqAYTXNSSNAN4ZiUFn6I34jc9zGZNI8zXEvOI6n/wwKCwOAgaxAF2hDW1t+jAJxFKYeAT22k7SfiwMMModYrhQ+DsASfPnOzuEwUKAZkBkBdgejWozM+EFFaosK0740Ii5kd5xE4Wu9u4OXQzmaqNRl6vVxkMrWez5bMWLwcSMmHnKF5FBRYHcr1emD12zhet3Nv7qNZnnS71iMZ7tboXWnvYqePWBefO64dckOm+25Jl6OGXURSEOkMixB5it6srdXXbDfW5/f4Npig0YenMxUCUmoOPp73INWeS7Y/4INHas43LtwfZbd3pIbJHdmjVLpqG9SWzliFki8X0rB3u/fd5myXqkt4PNhiKWLzRWMvMPOuBVp0LpbecgSGrCMFeNQUi3vLTFIP97sOlSM/Wwcwlfev400HU1k1SbDtDLE0r4yyK2Vn4Hhil4quNepVaz3VsHx/O7ZgV2c1gUppMqlv68g6+20GT+JypSMVVb9D/rxwaOBDxiIuRG1YNGEhwBI9qtfbj3ezJyBzvWvbDFT1sx8aMtXWHrIKHnV3NrX4tvHyTJzezRz0aRKxYQwyFjo4/iGiAmb08+Zl+jwmSunbhyLM7trZ3nqmfqGd5Asb+c699ClIFuspbpP7sBNHkfw2v5N5rdxMpN9FzSLnbxesac243x+eF/nHvI/eHpin3cFUj4TigYWA3yzZanMvlUScdT1J5kGpzcWa8C5vrObHzX4bZgd0cgu5Ifjwa5sDlWZ9yPGUtNWFJzmEYyl2y55cB56bxwgW5zEvwlEkuSKVeVTKrJVY+y1iBXaEW1MN9H84TDriUpYoDEgktMBIJKVvtS1vnuttkLgzYakfpeWF/ldRTIbkgky/5lztUOZZufQKrh8VKhZdcsl/YL5EwAl0ln/j5Z7QNzfj0sBEg41S9YkVtbXgcPvGCQ2VJUch0WtzcnJiQOGVKAuvy7cXs9DBVRYnz+VkvbEe6XR463Pbiw0dUeoxUT+/yrh037siRSROT/btgJADgf8fLMA2A/ldbAP8yKcJhKrcTGzGflnbjp7j5//83VO0+CG62zfrt0SQAPAdP84TPH79dcjzwJzaJTf/2PhLA/0OKxhYOumY+PjQKuS7bkNpEAUGCwD+9Akme7M+VEedAUDXTCBQuOajhygXRUPPBEqIQHBQ1EKSK2INDpKgDjBhrgEr6KBAMB6CIcgIawxnRUK/AkuUAOBieIEg33DxmiFLxp8SYAtVwoPlKrCWZYPn2fpJv2GNQ5STmEv8olSXR2A0n2SOhSHeoJzu1ZsgUibTb6GIIQWgt4qBbt7S2bvve2N6o0xI37yAuUA0Hmq/EWpKJd27vMFS+YY+BHKVlCNv/USrLGmnsBiLuHckzct9Ylzk7NRMzFGIhjOTaHS2GYApCq30tB926ZYvcuu31Qkbq6M7aFV9DBEzA32GJCIQRiUTIAlkiKyCHVJTHyFE9zkr7x8KBv+qCGWyPKgUeX9L626KS3WwAAA==') format('woff2'),
-  url('iconfont.woff?t=1560241691370') format('woff'),
-  url('iconfont.ttf?t=1560241691370') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1560241691370#vo') format('svg'); /* iOS 4.1- */
+  src: url('iconfont.eot?t=1560491786858'); /* IE9 */
+  src: url('iconfont.eot?t=1560491786858#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('iconfont.woff?t=1560491786858') format('woff'),
+  url('iconfont.ttf?t=1560491786858') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1560491786858#vo') format('svg'); /* iOS 4.1- */
 }
 
 .vo {
@@ -15,6 +15,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.v-shang:before {
+  content: "\e65e";
+}
+
 .v-user:before {
   content: "\e643";
 }
@@ -27,6 +31,14 @@
   content: "\e669";
 }
 
+.v-kaifa:before {
+  content: "\e606";
+}
+
+.v-shang1:before {
+  content: "\e6af";
+}
+
 .v-rili:before {
   content: "\e602";
 }

src/assets/icon/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="shang" unicode="&#58974;" d="M814.795 575.699c9.571 0 12.392-6.018 6.264-13.372l-297.761-357.392c-6.128-7.355-16.154-7.355-22.281 0l-297.761 357.392c-6.128 7.355-3.309 13.372 6.264 13.372l605.275 0z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="user" unicode="&#58947;" d="M510.82347975 372.20569088c112.28577906 0 203.32433749 91.07232313 203.3243375 203.32433749 0 112.3207077-91.03855843 203.32550258-203.3243375 203.32550258s-203.32433749-91.00479374-203.32433749-203.32550258C307.49914226 463.27685006 398.53886464 372.20569088 510.82347975 372.20569088zM889.43593131 162.99002083000005c-59.89715854 57.25188096-213.50959104 107.55291933-388.67196018 107.55291933-175.16120519 0-320.04375211-50.3010395-379.87571143-107.55291933-13.83415353-13.23803421-16.51552483-31.50465934-16.51552484-50.56649898l0-126.62640185 392.79007175 0 421.05217024 0 0 126.62640185C918.21613966 131.48652430000004 903.20255545 149.82067883000002 889.43593131 162.99002083000005z"  horiz-adv-x="1024" />
 
     
@@ -29,6 +32,12 @@ Created by iconfont
     <glyph glyph-name="back" unicode="&#58985;" d="M470.57477518 624.7841189000001V767.18332814c-12.94538297 59.54876075-62.13783666 23.30168889-62.13783665 23.30168889L66.67883406 497.91936739c-75.08321963-51.78153074-5.17815296-90.61767851-5.17815296-90.6176785l336.57995151-289.97657259c67.31598962-49.19245483 72.49414371 25.89076594 72.49414257 25.8907648v132.04290447C812.33287851 381.41092295 952.14301184-43.19763001000001 952.14301184-43.19763001000001c12.94538297-23.30168889 20.71261184 0 20.71261298 0 132.04290333 636.91283001-502.28084963 667.98174777-502.28084964 667.98174891z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="kaifa" unicode="&#58886;" d="M809.5 832.1H491.2c-38.2 0-69.2-31.9-69.2-71v-63.3h-35.8c-4.9 0-9-4-9-9v-50.6c-26-5.7-50.7-15.4-73.6-28.9l-37.3 37.3c-1.7 1.7-4 2.6-6.3 2.6s-4.7-0.9-6.3-2.6L184 576.9c-3.5-3.5-3.5-9.2 0-12.7l35.8-35.8c-14.4-22.4-25-46.7-31.6-72.5h-52.8c-4.9 0-9-4-9-9v-98.5c0-4.9 4-9 9-9H186c5.7-26 15.4-50.7 28.9-73.6l-37.3-37.3c-3.5-3.5-3.5-9.2 0-12.7l69.7-69.7c3.5-3.5 9.2-3.5 12.7 0l35.8 35.8c22.4-14.4 46.7-25 72.5-31.6v-52.8c0-4.9 4-9 9-9h44.8v-81.2c0-39.2 31-71 69.2-71h318.4c38.2 0 69.2 31.9 69.2 71V761.1c-0.2 39.2-31.2 71-69.4 71zM736 814.2c0-19.5-15.3-35.3-34.1-35.3H598.7c-18.8 0-34 15.8-34.1 35.3H736zM421.9 295.1c-50.1 4.5-89.6 46.8-89.6 98.1s39.4 93.6 89.6 98.1v-196.2z m-35.8-188.5v50.9c0 4.2-2.9 7.8-7 8.7-28.6 6.5-55.4 18.2-79.6 34.7-3.6 2.4-8.3 2-11.4-1.1l-34.6-34.6-57 57 36 36c3 3 3.5 7.6 1.2 11.1-15.6 24.8-26.3 52-31.7 80.8-0.8 4.2-4.5 7.3-8.8 7.3h-49V438h50.9c4.2 0 7.8 2.9 8.7 7 6.5 28.6 18.2 55.4 34.7 79.6 2.4 3.6 2 8.3-1.1 11.4l-34.6 34.6 57 57 36-36c3-3 7.6-3.5 11.1-1.2 24.8 15.6 52 26.3 80.8 31.7 4.2 0.8 7.3 4.5 7.3 8.8v49h26.9v-170.5c-60-4.6-107.5-54.9-107.5-116.1s47.4-111.5 107.5-116.1v-170.5h-35.8z m474.7-99.1c0-29.3-23-53.1-51.3-53.1H491.1c-28.3 0-51.3 23.8-51.3 53.1V761.1c0 29.3 23 53.1 51.3 53.1h55.6c0-29.3 23.4-53.2 52-53.2H702c28.6 0 51.9 23.9 52 53.2h55.6c28.3 0 51.3-23.8 51.3-53.1v-753.6zM713-23.299999999999955H587.6c-2.5 0-4.5-2-4.5-4.5s2-4.5 4.5-4.5H713c2.5 0 4.5 2 4.5 4.5s-2 4.5-4.5 4.5zM486.1 590.3h37.3c13.2 0 23.9 10.7 23.9 23.9v37.3c0 13.2-10.7 23.9-23.9 23.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9z m-14.9 61.2c0 8.2 6.7 14.9 14.9 14.9h37.3c8.2 0 14.9-6.7 14.9-14.9v-37.3c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9v37.3zM581.7 590.3H619c13.2 0 23.9 10.7 23.9 23.9v37.3c0 13.2-10.7 23.9-23.9 23.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9z m-15 61.2c0 8.2 6.7 14.9 14.9 14.9H619c8.2 0 14.9-6.7 14.9-14.9v-37.3c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9v37.3zM677.2 590.3h37.3c13.2 0 23.9 10.7 23.9 23.9v37.3c0 13.2-10.7 23.9-23.9 23.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9z m-14.9 61.2c0 8.2 6.7 14.9 14.9 14.9h37.3c8.2 0 14.9-6.7 14.9-14.9v-37.3c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9v37.3zM810.1 675.4h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9h37.3c13.2 0 23.9 10.7 23.9 23.9v37.3c-0.1 13.2-10.8 23.9-23.9 23.9z m14.9-61.2c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9v37.3c0 8.2 6.7 14.9 14.9 14.9h37.3c8.2 0 14.9-6.7 14.9-14.9v-37.3zM547.3 506.7V544c0 13.2-10.7 23.9-23.9 23.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9h37.3c13.2 0 23.9 10.7 23.9 23.9z m-76.1 0V544c0 8.2 6.7 14.9 14.9 14.9h37.3c8.2 0 14.9-6.7 14.9-14.9v-37.3c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9zM581.7 482.8H619c13.2 0 23.9 10.7 23.9 23.9V544c0 13.2-10.7 23.9-23.9 23.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9z m-15 61.2c0 8.2 6.7 14.9 14.9 14.9H619c8.2 0 14.9-6.7 14.9-14.9v-37.3c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9V544zM677.2 482.8h37.3c13.2 0 23.9 10.7 23.9 23.9V544c0 13.2-10.7 23.9-23.9 23.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9zM662.3 544c0 8.2 6.7 14.9 14.9 14.9h37.3c8.2 0 14.9-6.7 14.9-14.9v-37.3c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9V544zM810.1 567.9h-37.3c-13.2 0-23.9-10.7-23.9-23.9v-37.3c0-13.2 10.7-23.9 23.9-23.9h37.3c13.2 0 23.9 10.7 23.9 23.9V544c-0.1 13.2-10.8 23.9-23.9 23.9z m14.9-61.2c0-8.2-6.7-14.9-14.9-14.9h-37.3c-8.2 0-14.9 6.7-14.9 14.9V544c0 8.2 6.7 14.9 14.9 14.9h37.3c8.2 0 14.9-6.7 14.9-14.9v-37.3zM579.6 246.5l-33.1 19.1 33.1 19.1c4.3 2.5 5.8 8 3.3 12.2-2.5 4.3-8 5.8-12.2 3.3l-46.5-26.9c-2.8-1.6-4.5-4.6-4.5-7.8s1.7-6.2 4.5-7.8l46.5-26.9c1.4-0.8 2.9-1.2 4.5-1.2 3.1 0 6.1 1.6 7.8 4.5 2.3 4.4 0.8 9.9-3.4 12.4zM776.6 273.4l-46.5 26.9c-4.3 2.5-9.8 1-12.2-3.3-2.5-4.3-1-9.8 3.3-12.2l33.1-19.1-33.1-19.1c-4.3-2.5-5.8-8-3.3-12.2 1.7-2.9 4.7-4.5 7.8-4.5 1.5 0 3.1 0.4 4.5 1.2l46.5 26.9c2.8 1.6 4.5 4.6 4.5 7.8s-1.8 6-4.6 7.6zM671.6 316.5c-4.6 1.8-9.8-0.4-11.6-5l-35.8-89.6c-1.8-4.6 0.4-9.8 5-11.6 1.1-0.4 2.2-0.6 3.3-0.6 3.6 0 6.9 2.1 8.3 5.6l35.8 89.6c1.8 4.5-0.4 9.7-5 11.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shang1" unicode="&#59055;" d="M134.93839925 199.23808853000003l377.06160075 377.06160072 377.06160075-377.06160072z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="rili" unicode="&#58882;" d="M874.667 426.667h-85.334v-85.334h85.334v85.334z m-256-149.334h-85.334V192h85.334v85.333z m0-149.333h-85.334v-85.333h85.334V128z m128 149.333h-85.334V192h85.334v85.333z m-128 149.334h-85.334v-85.334h85.334v85.334z m256-149.334h-85.334V192h85.334v85.333z m-128 149.334h-85.334v-85.334h85.334v85.334z m-256 0h-85.334v-85.334h85.334v85.334z m-256-149.334h-85.334V192h85.334v85.333z m128-149.333h-85.334v-85.333h85.334V128z m-128 298.667h-85.334v-85.334h85.334v85.334z m0-298.667h-85.334v-85.333h85.334V128z m256 149.333h-85.334V192h85.334v85.333zM896 768h-85.333V832c0 12.8-8.534 21.333-21.334 21.333S768 844.8 768 832v-64H256V832c0 12.8-8.533 21.333-21.333 21.333S213.333 844.8 213.333 832v-64H128c-46.933 0-85.333-38.4-85.333-85.333V0c0-46.933 38.4-85.333 85.333-85.333h768c46.933 0 85.333 38.4 85.333 85.333V682.667C981.333 729.6 942.933 768 896 768z m42.667-768c0-23.467-19.2-42.667-42.667-42.667H128c-23.467 0-42.667 19.2-42.667 42.667V512h853.334v-512z m0 554.667H85.333v128c0 23.466 19.2 42.666 42.667 42.666h85.333v-64c0-12.8 8.534-21.333 21.334-21.333S256 648.533 256 661.333v64h512v-64c0-12.8 8.533-21.333 21.333-21.333s21.334 8.533 21.334 21.333v64H896c23.467 0 42.667-19.2 42.667-42.666v-128z m-576-277.334h-85.334V192h85.334v85.333z m128-149.333h-85.334v-85.333h85.334V128z m-128 298.667h-85.334v-85.334h85.334v85.334z"  horiz-adv-x="1024" />