Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev

0917214c · yaxiLiuu · 7b2c4ebd · b0614921 · 0917214c · 0917214c
Commit 0917214c authored Jul 19, 2018 by yaxiLiuu
7 changed files
--- a/client/actions/getStore.js
+++ b/client/actions/getStore.js
@@ -16,7 +16,7 @@ let json = {
            "address": "华贸商业街（新光天地与利兹卡尔顿酒店之间广场）"
        }
    }
-}
+};
 const saveStoreInfo = (data)=>{
    return{
@@ -25,7 +25,7 @@ const saveStoreInfo = (data)=>{
    }
 };
-const getStoreInfo = ()=>{
+const getStoreInfo = (storeId)=>{
    return(dispatch)=>{
        // fetch(domain + '/web/pad_warehouse/getMachineData.action',{
        //     credentials : 'include',

--- a/client/config/index.js
+++ b/client/config/index.js
 import swiperContainers from './swiperContainer'
 import showPage from './showPage'
+import socketType from './socketType'
-module.exports = {swiperContainers,...showPage}
+module.exports = {swiperContainers,...showPage,socketType}
\ No newline at end of file
--- a/client/config/socketType.js
+++ b/client/config/socketType.js
+const socketType = {
+    GETSTOREINFO:'GETSTOREINFO',
+    GETSOCKETMSG:'GETSOCKETMSG'
+}
+module.exports = socketType;
\ No newline at end of file
--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -18,7 +18,9 @@ import HomeContainer from '../HomeContainer/HomeContainer'
 import FinishAskContainer from '../FinishAskContainer/FinishAskContainer'
 import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer'
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent';
-import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
+import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent';
+import {on,remove} from '../../util/event';
 require('./index.css');
@@ -38,7 +40,6 @@ const defaultPopupInfo = {
 class PageContainer extends React.Component {
    constructor(props) {
        super(props);
-        // UTILPATH.socket.getIp();
        this.state = {
            showPage : showPage[2],
            lastPage : '',
@@ -46,7 +47,8 @@ class PageContainer extends React.Component {
            popupInfo : defaultPopupInfo,
            pageStyle : {},
            lastPageStyle:{},
-            showClock : false //关门页面显示倒计时
+            showClock : false, //关门页面显示倒计时
+            headerInfo : {}
        };
        this.getPages = this.getPages.bind(this);
        this.showPopup = this.showPopup.bind(this);
@@ -63,6 +65,8 @@ class PageContainer extends React.Component {
        this.overTimeSolve = this.overTimeSolve.bind(this);
        this.failCloseDoor = this.failCloseDoor.bind(this);
        this.judgeDoorStatus = this.judgeDoorStatus.bind(this);
+        this.getSocketMsg = this.getSocketMsg.bind(this);
+        this.changePages = this.changePages.bind(this);
        this.maxCountBackTime = 300;
        this.count = 1000;
@@ -70,15 +74,48 @@ class PageContainer extends React.Component {
        this.countBackTime = -1;
    }
-    componentWillMount() {
-        let {dispatch} = this.props;
-        dispatch(getStoreInfo());
-        let pages = this.getPages();
+    connectOk(){
-        this.setState({
+        console.log("connectOk")
-            page : pages
+    }
+    componentWillMount() {
+        let that = this;
+        on(CONFIG.socketType.GETSTOREINFO,this,function (data) {
+            console.log("==GETSTOREINFO===")
+            console.log(data)
+            dispatch(getStoreInfo(data.storeId));
+        })
+        on(CONFIG.socketType.GETSOCKETMSG,this,function (data) {
+            console.log("==GETSTOREINFO===")
+            console.log(data)
+            console.log(this);
+            that.getSocketMsg(data)
        })
+    }
+    getSocketMsg(data){
+        switch (data.type){
+            case 'SUCCESS_OPENDOOR':
+                //执行开门
+                this.setState({
+                    showPage : showPage[1]
+                },()=>{
+                    this.beginCountBack();
+                });
+                break;
+            case 'SUCCESS_CLOSEDOOR':
+                //关门成功
+                this.setState({
+                    showPage : showPage[7],
+                    showClock : false,
+                    popupInfo : defaultPopupInfo
+                });
+                break;
+        }
    }
    componentDidMount(){
        // this.beginCountBack()
    }
@@ -89,7 +126,12 @@ class PageContainer extends React.Component {
    componentWillUnmount(){
    }
+    changePages(page){
+        this.setState({
+            showPage : page,
+            popupInfo : defaultPopupInfo
+        })
+    }
    //开始倒计时,看有没有操作，只是在整个开门过程中才监听

--- a/client/index.js
+++ b/client/index.js
@@ -29,5 +29,6 @@ function renderPage(store) {
 let store = activateVendor();
+UTILPATH.socket.getIp();
 renderPage(store);
\ No newline at end of file
--- a/client/util/event.js
+++ b/client/util/event.js
+let events = {};
+const on = (name,self,callback)=>{
+    let tuple = [self,callback];
+    let cb = events[name];
+    if(Array.isArray(cb)){
+        cb.push(tuple);
+    }else {
+        events[name] = [tuple];
+    }
+};
+const emit = (name,data)=>{
+    let callbacks = events[name];
+    if(Array.isArray(callbacks)){
+        callbacks.map((tuple)=>{
+            let self = tuple[0];
+            let callback = tuple[1];
+            callback.call(self,data);
+        })
+    }
+};
+const remove = (name,self)=>{
+    let callbacks = events[name];
+    if(Array.isArray(callbacks)){
+        events[name] = callbacks.filter(turple=>turple[0] !== self)
+    }
+};
+module.exports = {on,emit,remove};
\ No newline at end of file
--- a/client/util/socket.js
+++ b/client/util/socket.js
-import fetch from 'isomorphic-fetch'
+import fetch from 'isomorphic-fetch';
+import {emit} from './event'
-let domainIp = '192.168.10.';
+let domainIp = '192.168.199.';
 let initIndex = 1;
 let totalIndex = 255 / 5;
@@ -28,10 +30,11 @@ const parseJson = (response)=>{
    return response.json();
 };
-const getIp = (cb)=>{
+const getIp = ()=>{
    console.log("getIp : ",initIndex)
    for(let i = initIndex; i < (totalIndex + initIndex) ; i++){
        let url = 'http://' + domainIp + i + ':9999/getmyid';
+        console.log(url)
        fetch( url ,{
            // credentials : 'include',
            method : 'GET',
@@ -44,7 +47,7 @@ const getIp = (cb)=>{
                if(data.storeId){
                    let wsUrl = 'ws://' + domainIp + i + ':7788/notify?from=plant&storeId='+data.storeId;
                    currentIpIndex = i;
-                    init(wsUrl,cb);
+                    init(i,data.storeId);
                }
            })
@@ -87,9 +90,10 @@ const testIp = (ip) => {
            if(data.storeId){
                window.storeId = data.storeId;
                window.localIp = domainIp + i;
                let wsUrl = 'ws://' + domainIp + i + ':7788/notify?from=plant&storeId='+data.storeId;
                currentIpIndex = i;
-                init(wsUrl,cb);
+                init(i,data.storeId);
            }
        })
        .catch((err) =>{
@@ -104,10 +108,12 @@ const testIp = (ip) => {
 }
-const init = (url,cb)=>{
+const init = (ip,storeid)=>{
-    console.log("init :" ,url);
-    if("WebSocket" in window && !ws && url){
+    let wsUrl = 'ws://' + domainIp + ip + ':7788/notify?from=plant&storeId=' + storeid;
-        ws = new WebSocket(url);
+    console.log("init :" ,wsUrl);
+    if("WebSocket" in window && !ws && ip && storeid){
+        ws = new WebSocket(wsUrl);
        ws.onopen = function()
        {
@@ -119,16 +125,17 @@ const init = (url,cb)=>{
            inteval = null;
            initIndex = 1;
            failTotal = 1;
-            cb();
            console.log("open");
            isFalse = false;
+            emit(CONFIG.socketType.GETSTOREINFO,{ip:domainIp+ip,storeId:storeid})
        };
        ws.onmessage = function (evt)
        {
-            var received_msg = evt.data;
+            var received_msg = JSON.parse(evt.data); //String
            console.log("数据已接收...");
+            emit(CONFIG.socketType.GETSOCKETMSG,received_msg);
        };
        ws.onclose = function(err)