Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk

common/api/com_api.c

@@ -97,13 +97,23 @@ static void watcher_cb (struct ev_loop *loop ,struct ev_io *w, int revents)
     }
     
     //for test ipc connect or not
-    if (loop_ctrl->isconnect == 0 ){
+    /*if (loop_ctrl->isconnect == 0 ){
         loop_ctrl->isconnect =1;
         if (strncmp(validDat,MAGIC, strlen(MAGIC)) == 0){
-            kk_ipc_send(loop_ctrl->type, validDat, bytes);
+            kk_ipc_send_ex(loop_ctrl->type, validDat, bytes, chlMark);
             nn_freemsg(dat);
             return;
         }
+    }*/
+    if (strncmp(validDat,MAGIC, strlen(MAGIC)) == 0){
+        if (loop_ctrl->isconnect == 0){
+            kk_ipc_send_ex(loop_ctrl->type, validDat, bytes, chlMark);
+            loop_ctrl->isconnect =1;
+        }
+        nn_freemsg(dat);
+        return;
+    }else if (IPC_MID2PLAT == loop_ctrl->type){//
+        loop_ctrl->isconnect =0;
     }
     
 	if (loop_ctrl->cb != NULL){
@@ -400,9 +410,9 @@ int kk_ipc_send_ex(ipc_type type, void* data, int len, char* chalMark)
 		
 		memcpy(buf + filterlen, data, len);
         if (type == IPC_MID2PLAT){
-            nn_send(Mloop_ctrl.ab.n, &buf, NN_MSG, NN_DONTWAIT);
+            nn_send(Mloop_ctrl.ab.n, &buf, NN_MSG, 0);//NN_DONTWAIT
         }else{
-            nn_send(Bloop_ctrl.ba.n, &buf, NN_MSG, NN_DONTWAIT);
+            nn_send(Bloop_ctrl.ba.n, &buf, NN_MSG, 0);
         }
 		
 	}

common/api/com_api.h

@@ -36,6 +36,7 @@ typedef enum {
 #define MSG_INFO_STR              "info"
 #define MSG_INDENTIFIER_STR       "identifier"
 #define MSG_PARAMS_STR            "params"
+#define MSG_IOTClOUDSTATE_STR     "IOTCloudState"
 
 typedef void ipc_cb(void* data, int len, char* chalMark);
 int kk_ipc_init(ipc_type type, ipc_cb cb, char* chalMark, char* ip);