首页搜索 + 下拉加载 + 返回键 + 历史记录功能 + 报警格式加载

src/app/app.module.ts

@@ -17,6 +17,7 @@ import {AppRoutingModule} from './app-routing.module';
 import {SubTitleComponent} from './components/sub-title/sub-title.component';
 import {SwitchComponent} from './components/switch/switch.component';
 import {AlarmBarComponent} from './components/alarm-bar/alarm-bar.component';
+import {SearchHistoryComponent} from './components/search-history/search-history.component';
 
 import {AppMinimize} from '@ionic-native/app-minimize/ngx';
 
@@ -27,6 +28,7 @@ import {AlarmPage} from './alarm/alarm.page';
 import {RowPage} from './row/row.page';
 import {IndexPage} from './index/index.page';
 import {OtherPage} from './other/other.page';
+import {SearchPage} from './search/search.page';
 
 import {Api} from './service/api';
 import {Auth} from './service/auth';
@@ -42,13 +44,15 @@ import {Load} from './service/load';
         SubTitleComponent,
         SwitchComponent,
         AlarmBarComponent,
+        SearchHistoryComponent,
         HomePage,
         EastPage,
         LoginPage,
         AlarmPage,
         RowPage,
         IndexPage,
-        OtherPage
+        OtherPage,
+        SearchPage
     ],
     entryComponents: [],
     imports: [

src/app/components/search-history/search-history.component.html

+<div class="historyList">
+  <div class="title">
+    历史搜索记录
+  </div>
+  <div class="one" *ngFor="let one of history" (click)="click(one)">{{one}}</div>
+</div>

src/app/components/search-history/search-history.component.scss

+.one {
+  display: inline-block;
+  padding: 5px 10px 5px 5px;
+}
+
+.title {
+  font-size: 15px;
+  line-height: 40px;
+  border-bottom: 1px solid #cccccc;
+  text-indent: 5px;
+  margin-top: -10px;
+  margin-bottom: 10px;
+}
+
+.historyList {
+  padding: 10px 10px 0 10px;
+}

src/app/components/search-history/search-history.component.ts

+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+
+@Component({
+  selector: 'v-search-history',
+  templateUrl: './search-history.component.html',
+  styleUrls: ['./search-history.component.scss'],
+})
+export class SearchHistoryComponent implements OnInit {
+
+  @Input() history = [];
+  @Output() oneClick = new EventEmitter<String>();
+  constructor() { }
+
+  ngOnInit() {}
+
+  click(one) {
+    this.oneClick.emit(one);
+  }
+}

src/app/east/east.page.html

@@ -5,6 +5,12 @@
     >
         {{fieldRegionName}}控制
     </Navbar>
+    <PullToRefresh [direction]="state.direction"
+                   [(ngModel)]="state.refreshState"
+                   [endReachedRefresh]="state.endReachedRefresh"
+                   (onRefresh)="pullToRefresh($event)"
+                   style="height: calc(100% - 45px)"
+    >
     <div class="topPart">
         <ListItem multipleLine *ngIf="this.yewei">
             当前液位:
@@ -40,6 +46,7 @@
             <v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>
         </ListItem>
     </div>
+    </PullToRefresh>
 </div>
 <ng-template #icon>
     <span class="vo v-back"></span>

src/app/east/east.page.ts

@@ -26,6 +26,17 @@ export class EastPage implements OnInit {
     fieldRegionNo = '';
     fieldRegionName = '';
 
+    state = {
+        refreshState: {
+            currentState: 'deactivate',
+            drag: false
+        },
+        direction: '',
+        endReachedRefresh: false,
+        data: [],
+        directionName: 'up'
+    };
+
     constructor(private tf: Transfer, private api: Api, private load: Load, private ac: ActivatedRoute) {
     }
 
@@ -37,7 +48,7 @@ export class EastPage implements OnInit {
     }
 
     // ionic的生命周期函数
-    ionViewWillEnter () {
+    ionViewWillEnter() {
         this.nanClicked = false;
         this.beiClicked = false;
         this.nanLoading = false;
@@ -117,7 +128,9 @@ export class EastPage implements OnInit {
     }
 
     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;
@@ -125,11 +138,6 @@ export class EastPage implements OnInit {
                 this.api.presentMsgToast(data.message || '获取数据失败');
             }
             this.load.offLoad();
-            this._inv = setTimeout(() => {
-                if (!this.load.isLoad) {
-                    this.getData(0);
-                }
-            }, 30000);
         }]);
 
         this.api.app.getLiquidLevelData([{fieldRegionNo: this.fieldRegionNo}, (data) => {
@@ -153,4 +161,10 @@ export class EastPage implements OnInit {
             }
         }]);
     }
+
+    pullToRefresh(event) {
+        if (event === 'down') {
+            this.getData(1);
+        }
+    }
 }

src/app/home/home.page.html

 <div class="mainCon">
+    <div class="topIcon" (click)="toIndex()">
+        <i class="vo v-back"></i>
+    </div>
     <div class="topSearch">
-        <SearchBar [placeholder]="'点击此处进行搜索'" [setFocus]="false"></SearchBar>
+        <SearchBar [placeholder]="'点击此处进行搜索'" [(ngModel)]="searchText"
+                   (onCancel)="searchText ='';toggleFocus(false);"
+                   [setFocus]="false" (onFocus)="toggleFocus(true)" (onBlur)="toggleFocus(false)"
+                   (onClear)="searchText ='';toggleFocus(false);"></SearchBar>
     </div>
+    <v-search *ngIf="ifFocus" [(value)]="searchText"></v-search>
+    <div>
         <ion-slides style="width: 100%;height: 200px;" mode="ios"
                     [options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">
             <ion-slide class="slideCon" *ngFor="let one of imgs">
@@ -18,7 +26,15 @@
                            [endReachedRefresh]="state.endReachedRefresh"
                            (onRefresh)="pullToRefresh($event)"
             >
-            <div style="background-color: #f4f4f4">
+                <div style="background-color: #efeff4">
+                    <div class="out" *ngIf="items.length === 0 && !isError">
+                        <i class="vo v-none"></i>
+                        <div class="in">暂无数据</div>
+                    </div>
+                    <div class="out" *ngIf="isError">
+                        <i class="vo v-no-signal"></i>
+                        <div class="in">网络连接失败</div>
+                    </div>
                     <div class="item" *ngFor="let item of items" (click)="toControl(item.url, item.name, item.no)">
                         <div>
                             <div class="top">{{item.name}}
@@ -43,4 +59,5 @@
                 </div>
             </PullToRefresh>
         </div>
+    </div>
 </div>

src/app/home/home.page.scss

@@ -74,6 +74,33 @@
   width : 100%;
 }
 
+.out {
+  text-align: center;
+  color: #888;
+  padding: 20px;
+  i {
+    font-size: 80px;
+  }
+  .in {
+    font-size: 18px;
+    letter-spacing: 2px;
+    line-height: 40px;
+  }
+}
+
+.topIcon {
+  display: inline-block;
+  background-color: #efeff4;
+  height: 44px;
+  line-height: 44px;
+  width: 25px;
+  text-align: center;
+  padding-left: 5px;
+  color: #28c9bd;
+}
+
 .topSearch {
-  padding-right: 40px;
+  display: inline-block;
+  width: calc(100% - 30px);
+  vertical-align: top;
 }

src/app/home/home.page.ts

@@ -20,6 +20,9 @@ export class HomePage implements OnInit, OnDestroy {
 
     imgs = ['1.jpg', '2.jpg', '3.jpg'];
     time = 0;
+    ifFocus = false;
+    searchText = '';
+    isError = false;
 
     lunbo = {
         speed: 1000,
@@ -33,8 +36,6 @@ export class HomePage implements OnInit, OnDestroy {
         zoom: false
     };
 
-    data = [];
-
     items = [];
 
     state = {
@@ -74,26 +75,24 @@ export class HomePage implements OnInit, OnDestroy {
         }
         this.api.app.getAll(['', (data) => {
             if (data && data.constructor === Array) {
-                this.data = data;
                 this.items = [];
+                this.isError = false;
                 data.map((value, index) => {
-                    const info = value.fieldRegionDataVos;
-                    info.map((value2, index2) => {
                     const itemInfo = {
-                            name: value2.fieldRegionName,
-                            no: value2.fieldRegionNo,
-                            yewei: value2.liquidLevel,
-                            temp: value2.temp,
-                            img: this.getImgName(value2.fieldRegionName),
-                            url: value2.fieldRegionGroup === '中转池自动控制组' ? 'east' : 'other',
+                        name: value.fieldRegionName,
+                        no: value.fieldRegionNo,
+                        yewei: value.liquidLevel,
+                        temp: value.temp,
+                        img: this.getImgName(value.fieldRegionName),
+                        url: value.fieldRegionGroup === '中转池自动控制组' ? 'east' : 'other',
                         time: new Date().getTime(),
-                            state: value2.state
+                        state: value.state
                     };
                     this.items.push(itemInfo);
                 });
-                });
             } else {
                 this.api.presentMsgToast('获取数据失败');
+                this.isError = true;
             }
             this.load.offLoad();
         }]);
@@ -112,11 +111,13 @@ export class HomePage implements OnInit, OnDestroy {
         });
     }
 
+    toIndex() {
+        this.tf.transfer({url: '/index'});
+    }
+
     pullToRefresh(event) {
-        if (event === 'endReachedRefresh') {
-            // console.log(11111111111111);
-        } else {
-            // console.log(22222222222222);
+        if (event === 'down') {
+            this.getData(1);
         }
     }
 
@@ -151,4 +152,8 @@ export class HomePage implements OnInit, OnDestroy {
 
         return ret;
     }
+
+    toggleFocus(e) {
+        this.ifFocus = e;
+    }
 }

src/app/other/other.page.html

@@ -5,6 +5,11 @@
     >
         {{fieldRegionName}}控制
     </Navbar>
+    <PullToRefresh [direction]="state.direction"
+                   [(ngModel)]="state.refreshState"
+                   [endReachedRefresh]="state.endReachedRefresh"
+                   (onRefresh)="pullToRefresh($event)"
+    >
     <div class="topPart">
         <ListItem multipleLine *ngIf="this.yewei">
             当前液位:
@@ -33,6 +38,7 @@
             <v-switch [value]="a.value" (click)="toggle(a)" [loading]="a.loading"></v-switch>
         </ListItem>
     </div>
+    </PullToRefresh>
 </div>
 <ng-template #icon>
     <span class="vo v-back"></span>

src/app/other/other.page.ts

@@ -27,6 +27,17 @@ export class OtherPage implements OnInit {
     types = [];
     allBtns = [];
 
+    state = {
+        refreshState: {
+            currentState: 'deactivate',
+            drag: false
+        },
+        direction: '',
+        endReachedRefresh: false,
+        data: [],
+        directionName: 'up'
+    };
+
     constructor(private tf: Transfer, private api: Api, private load: Load, private ac: ActivatedRoute) {
     }
 
@@ -137,11 +148,6 @@ export class OtherPage implements OnInit {
                 this.api.presentMsgToast(data.message || '获取数据失败');
             }
             this.load.offLoad();
-                this._inv = setTimeout(() => {
-                    if (!this.load.isLoad) {
-                        this.getData(0);
-                    }
-                }, 30000);
         }]);
 
         this.api.app.getLiquidLevelData([{fieldRegionNo: this.fieldRegionNo}, (data) => {
@@ -156,4 +162,10 @@ export class OtherPage implements OnInit {
             }
         }]);
     }
+
+    pullToRefresh(event) {
+        if (event === 'down') {
+            this.getData(1);
+        }
+    }
 }

src/app/search/search.page.html

+<div class="mainCon upCon">
+  <div style="background-color: #efeff4">
+    <v-search-history *ngIf="items.length === 0" [history]="historys" (oneClick)="choose($event)"></v-search-history>
+    <div class="item" *ngFor="let item of items" (click)="toControl(item.url, item.name, item.no)">
+      <div>
+        <div class="top">{{item.name}}
+          <div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
+        </div>
+        <div class="content">
+          <div class="left">
+            <img [src]="'../../assets/icon/' + item.img">
+          </div>
+          <div class="rightCon">
+            <div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>
+            <div class="block2">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>
+            <div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '离线'}} </div>
+          </div>
+        </div>
+        <div class="bottom">
+          <div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp;
+          <span style="font-size: 13px">{{item.state ? '在线' : '离线'}}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/search/search.page.scss

+.upCon {
+  z-index: 10;
+  background-color: #efeff4;
+  float: left;
+  position: fixed;
+}

src/app/search/search.page.ts

+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import {Load} from '../service/load';
+import {Api} from '../service/api';
+import {Transfer} from '../service/transfer';
+
+@Component({
+  selector: 'v-search',
+  templateUrl: './search.page.html',
+  styleUrls: ['../home/home.page.scss', './search.page.scss'],
+})
+export class SearchPage implements OnInit {
+
+  data = [];
+  items = [];
+  noData = false;
+  historys = JSON.parse(window.localStorage.getItem('history.home.search')) || [];
+  text = '';
+  v: any;
+
+  @Input()
+  get value(): any {
+    return this.v;
+  }
+  set value(v: any) {
+    this.search(v);
+  }
+  @Output() valueChange = new EventEmitter();
+
+  constructor(private load: Load, private api: Api, private tf: Transfer) { }
+
+  ngOnInit() {
+    this.getData();
+  }
+
+  search(v) {
+    this.text = v;
+    this.items = this.data.filter(o => o.name.indexOf(v) > -1);
+    this.checkItem();
+  }
+
+  checkItem() {
+    if (this.items.length === 0) {
+      this.noData = true;
+    } else {
+      this.noData = false;
+    }
+  }
+
+  getData() {
+    this.api.app.getAll(['', (data) => {
+      if (data && data.constructor === Array) {
+        const obj = [];
+        data.map((value, index) => {
+          const itemInfo = {
+            name: value.fieldRegionName,
+            no: value.fieldRegionNo,
+            yewei: value.liquidLevel,
+            temp: value.temp,
+            img: this.getImgName(value.fieldRegionName),
+            url: value.fieldRegionGroup === '中转池自动控制组' ? 'east' : 'other',
+            time: new Date().getTime(),
+            state: value.state
+          };
+          obj.push(itemInfo);
+        });
+        this.data = obj;
+      } else {
+        this.api.presentMsgToast('获取数据失败');
+      }
+      this.checkItem();
+    }]);
+  }
+
+  getImgName(name) {
+    let ret = 'fajiao.jpg';
+
+    switch (name) {
+      case '东中转池':
+        ret = 'e.jpg';
+        break;
+      case '西中转池' :
+        ret = 'w.jpg';
+        break;
+      case '发酵池' :
+        ret = 'fajiao.jpg';
+        break;
+      case '分离池' :
+        ret = 'fenli.jpg';
+        break;
+      case '匀浆池' :
+        ret = 'yunjiang.jpg';
+        break;
+      case '出料池' :
+        ret = 'chuliao.jpg';
+        break;
+      case '沉沙池' :
+        ret = 'chensha.jpg';
+        break;
+      default:
+        break;
+    }
+
+    return ret;
+  }
+
+  toControl(url, name, no) {
+    if (this.text) {
+      if (this.historys.length >= 10) {
+        this.historys.pop();
+      }
+      if (this.historys.filter(item => item === this.text).length === 0) {
+        this.historys.push(this.text);
+        window.localStorage.setItem('history.home.search', JSON.stringify(this.historys));
+      }
+    }
+    const query = '?name=' + name + '&no=' + no;
+    this.tf.transfer({
+      url: '/' + url,
+      query: query,
+      hash: ''
+    });
+  }
+
+  choose(e) {
+    this.valueChange.emit(e);
+  }
+}

src/app/service/api.ts

@@ -124,4 +124,25 @@ export class Api {
         });
         toast.present();
     }
+
+    formatTime(fmt, time) {
+        const o = {
+            'M+': time.getMonth() + 1, // 月份
+            'd+': time.getDate(), // 日
+            'h+': time.getHours(), // 小时
+            'm+': time.getMinutes(), // 分
+            's+': time.getSeconds(), // 秒
+            'q+': Math.floor((time.getMonth() + 3) / 3), // 季度
+            'S': time.getMilliseconds() // 毫秒
+        };
+        if (/(y+)/.test(fmt)) {
+            fmt = fmt.replace(RegExp.$1, (time.getFullYear() + '').substr(4 - RegExp.$1.length));
+        }
+        for (const k in o) {
+            if (new RegExp('(' + k + ')').test(fmt)) {
+                fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+            }
+        }
+        return fmt;
+    }
 }

src/app/service/mqtt.ts

@@ -6,7 +6,9 @@ declare var mqtt: any;
 
 @Injectable()
 export class Mqtt {
-    constructor(private localNotifications: LocalNotifications, private api: Api) {}
+    constructor(private localNotifications: LocalNotifications, private api: Api) {
+    }
+
     client;
     topic;
     msg;
@@ -39,9 +41,10 @@ export class Mqtt {
             this.msg = 'mqtt连接成功';
             this.client.subscribe(this.topic);
             this.client.on('message', (a, b) => {
+                const obj = JSON.parse(b.toString());
                 this.localNotifications.schedule([{
                     title: '牧场报警',
-                    text: JSON.parse(b.toString())[0].description,
+                    text: this.api.formatTime('yyyy-MM-dd hh:mm:ss', new Date(obj.alarmTime)) + '  ' + obj.description,
                     sound: 'file://beep.caf',
                     icon: 'https://witcloud-oss.oss-cn-shanghai.aliyuncs.com/mysqldump/pasture.png',
                     foreground: true,
@@ -49,7 +52,9 @@ export class Mqtt {
                     vibrate: true,
                     led: '#ff0000'
                 }]);
-                this.api.presentMsgToast(JSON.parse(b.toString())[0].description, 'bottom');
+                this.api.presentMsgToast(
+                    this.api.formatTime('yyyy-MM-dd hh:mm:ss', new Date(obj.alarmTime)) + '  ' + obj.description, 'bottom'
+                );
             });
         });
     }

src/assets/icon/iconfont.css

 @font-face {font-family: "vo";
-  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- */
+  src: url('iconfont.eot?t=1560754612832'); /* IE9 */
+  src: url('iconfont.eot?t=1560754612832#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=1560754612832') format('woff'),
+  url('iconfont.ttf?t=1560754612832') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1560754612832#vo') format('svg'); /* iOS 4.1- */
 }
 
 .vo {
@@ -15,6 +15,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.v-none:before {
+  content: "\e62e";
+}
+
 .v-shang:before {
   content: "\e65e";
 }
@@ -27,6 +31,10 @@
   content: "\e603";
 }
 
+.v-no-signal:before {
+  content: "\e76b";
+}
+
 .v-back:before {
   content: "\e669";
 }
@@ -35,6 +43,10 @@
   content: "\e606";
 }
 
+.v-lianjie:before {
+  content: "\eb0d";
+}
+
 .v-shang1:before {
   content: "\e6af";
 }

src/assets/icon/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="none" unicode="&#58926;" d="M958.660364 607.357044l0.024559 0L511.996418 830.695668 66.119395 607.76432l-0.830925 0L65.28847 160.649096l446.707948-223.344764 446.714088 223.344764L958.710506 607.357044 958.660364 607.357044 958.660364 607.357044 958.660364 607.357044zM511.996418 776.58733l335.906399-168.380942-127.914298-64.48671L382.46939 711.5971529999999 511.996418 776.58733 511.996418 776.58733 511.996418 776.58733zM323.935252 679.91457l341.852832-164.712389-153.816225-74.501808L176.095135 607.357044 323.935252 679.91457 323.935252 679.91457 323.935252 679.91457zM121.126196 550.8603089999999l17.753339 0-17.753339 0.652869 0 27.915793L484.086765 397.94357l0-390.871245L121.126196 188.553633 121.126196 550.8603089999999 121.126196 550.8603089999999 121.126196 550.8603089999999zM902.86664 523.585105l0-335.031473L539.905048 7.072324999999978 539.905048 397.94357 902.86664 579.428971 902.86664 523.585105 902.86664 523.585105 902.86664 523.585105z"  horiz-adv-x="1024" />
+
+    
     <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" />
 
     
@@ -29,12 +32,18 @@ Created by iconfont
     <glyph glyph-name="mima" unicode="&#58883;" d="M961.536 474.90844445l-101.26222222 102.62755555-96.14222223-97.50755555h-31.97155555l-97.62133333 96.93866666-96.14222222-95.45955556c-35.15733333 112.86755555-138.12622222 194.56-259.6408889 194.56-150.528 0-272.61155555-125.49688889-272.61155555-280.23466666S128.22755555 115.59822222000003 278.75555555 115.59822222000003c122.08355555 0 225.39377778 82.48888889 260.096 196.15288889h394.58133334c44.94222222 0 81.35111111 36.864 81.35111111 82.37511111V397.65333333c0 35.49866667-22.18666667 65.64977778-53.248 77.25511112zM278.75555555 283.98933333c-60.18844445 0-108.99911111 50.176-108.9991111 112.07111112s48.81066667 112.07111111 108.9991111 112.0711111 108.99911111-50.176 108.99911112-112.0711111-48.81066667-112.07111111-108.99911112-112.07111112z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="no-signal" unicode="&#59243;" d="M381.7 451.7l-25.4 43.9c-57.6-22-109.3-55.9-152.2-98.6l34.1-36.6c0.2 0.2 0.5 0.5 0.7 0.8 35.5 35.5 76.8 63.3 122.7 82.7 6.8 2.8 13.4 5.4 20.1 7.8zM248.4 682.6C177.4 651 113 607.1 58.1 553.5L92.2 517c26 25.4 54.3 48.6 84.3 68.8 30.6 20.7 63.2 38.5 97 53.2l-25.1 43.6zM466.1 305.5c-45.2-9.5-85.3-32.7-115.8-65.1l34.2-36.6c1.9 2.1 3.8 4.1 5.8 6.1 27.9 27.9 63.8 45.1 102.5 49.3l-26.7 46.3zM512 738.3c-39.8 0-78.7-3.6-116.5-10.4l26.7-46.2c29.5 4.4 59.5 6.6 89.8 6.6 81 0 159.6-15.9 233.5-47.1 35.5-15 69.8-33.6 101.9-55.3 30-20.3 58.4-43.4 84.3-68.8l34.1 36.6C848.7 667.8 688.6 738.3 512 738.3zM512 79.70000000000005m-40 0a40 40 0 1 1 80 0 40 40 0 1 1-80 0ZM542.6 473.1c41.3-3.2 81.5-13 119.7-29.1 46-19.4 87.2-47.3 122.7-82.7 0.2-0.2 0.5-0.5 0.7-0.8l34.1 36.6C741.2 475.4 632.8 524 513 524.3l29.6-51.2zM675.338 43.10799999999995l-430 744.76 43.3 25 430-744.76z"  horiz-adv-x="1024" />
+
+    
     <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="lianjie" unicode="&#60173;" d="M1004 107.20000000000005c-8.8 0-16 7.2-16 16C988 324.79999999999995 824 488 622.4 488c-8.8 0-16 7.2-16 16s7.2 16 16 16c219.2 0 397.6-178.4 397.6-397.6 0-8.8-7.2-15.2-16-15.2zM877.6 107.20000000000005c-8.8 0-16 7.2-16 16 0 132-107.2 239.2-239.2 239.2-8.8 0-16 7.2-16 16s7.2 16 16 16c149.6 0 271.2-121.6 271.2-271.2 0-9.6-7.2-16-16-16zM754.4 107.20000000000005c-8.8 0-16 7.2-16 16 0 64-52 116-116 116-8.8 0-16 7.2-16 16s7.2 16 16 16c81.6 0 148-66.4 148-148 0-9.6-7.2-16-16-16zM483.2-28.799999999999955H50.4c-25.6 0-46.4 20.8-46.4 46.4V750.4c0 25.6 20.8 46.4 46.4 46.4h432.8c25.6 0 46.4-20.8 46.4-46.4v-732.8c0-25.6-20.8-46.4-46.4-46.4zM50.4 764.8c-8 0-14.4-6.4-14.4-14.4v-732.8c0-8 6.4-14.4 14.4-14.4h432.8c8 0 14.4 6.4 14.4 14.4V750.4c0 8-6.4 14.4-14.4 14.4H50.4zM444 177.60000000000002H89.6c-4.8 0-8 3.2-8 8V701.6c0 4.8 3.2 8 8 8h353.6c4.8 0 8-3.2 8-8v-516c0.8-4.8-3.2-8-7.2-8z m-346.4 16h337.6V693.6H97.6v-500zM267.2 26.399999999999977c-29.6 0-52.8 24-52.8 52.8 0 29.6 24 52.8 52.8 52.8 29.6 0 52.8-24 52.8-52.8 0-28.8-24-52.8-52.8-52.8z m0 90.4c-20.8 0-36.8-16.8-36.8-36.8 0-20.8 16.8-36.8 36.8-36.8 20.8 0 36.8 16.8 36.8 36.8 0 20-16.8 36.8-36.8 36.8zM633.6 52c-39.2 0-70.4 32-70.4 70.4 0 39.2 32 70.4 70.4 70.4 39.2 0 70.4-32 70.4-70.4 0.8-38.4-31.2-70.4-70.4-70.4z m0 109.6c-21.6 0-38.4-17.6-38.4-38.4 0-21.6 17.6-38.4 38.4-38.4s38.4 17.6 38.4 38.4c0.8 20.8-16.8 38.4-38.4 38.4z"  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" />