daily-12-14-服务器和手机正常收发脚本更新信息

git常用命令.txt

@@ -10,26 +10,26 @@ git status -s
 git branch
 
 创建分支
-git checkout master -b daily-12-13-成功给3台手机发送socket消息
+git checkout master -b daily-12-14-服务器和手机正常收发脚本更新信息
 
 提交到暂存区
 git add .
 
 提交评论
-git commit -m 'daily-12-13-成功给3台手机发送socket消息'
+git commit -m 'daily-12-14-服务器和手机正常收发脚本更新信息'
 
 推送到分支
-git push origin daily-12-13-成功给3台手机发送socket消息
+git push origin daily-12-14-服务器和手机正常收发脚本更新信息
 
 
 切换主干||分支
 git checkout master     ||    git checkout  daily-10-1
 
 本地合并分支到主干
-git merge daily-12-13-成功给3台手机发送socket消息
+git merge daily-12-14-服务器和手机正常收发脚本更新信息
 
 远端合并分支到主干
-git merge origin/daily-12-13-成功给3台手机发送socket消息
+git merge origin/daily-12-14-服务器和手机正常收发脚本更新信息
 
 推送主干
 git push origin master

nodejs与autojs的socket通信/client.js

@@ -58,6 +58,17 @@ function 与服务器socket通信() {
           bw.write('iHadRunScript' + "\r\n"); //加上分行符，以便服务器按行读取
           bw.flush()
         }
+        if (a.indexOf("项目更新信息") != -1) {
+          log('服务器发给客户端脚本更新信息=->'+a)
+          var data=a.toString()
+          data=data.replace('项目更新信息','')
+          data=data.replace(/(^\s*)|(\s*$)/g, "");
+
+          log('脚本更新信息='+data)
+
+          bw.write('手机'+device.model+'收到更新脚本的信息'+data + "\r\n"); //加上分行符，以便服务器按行读取
+          bw.flush()
+        }
       }
       sleep(6000)
     };

nodejs与autojs的socket通信/clientInfo.json

@@ -1 +1 @@
-{"xiaomi/ugglite/ugglite:7.1.2/N2G47H/8.3.1:user/release-keys":{"屏幕宽度":720,"屏幕高度":1280,"buildId":"N2G47H","主板":"QC_Reference_Phone","制造商":"xiaomi","型号":"Redmi Note 5A","产品名称":"ugglite","硬件名称":"qcom","唯一标识码":"xiaomi/ugglite/ugglite:7.1.2/N2G47H/8.3.1:user/release-keys","AndroidId":"eff4c619a4f92b20","API":25,"ip":"::ffff:192.168.12.100","port":50053,"客户端登记时间":"2018-12-13 23:06:21"},"HUAWEI/EVA-AL10/HWEVA:7.0/HUAWEIEVA-AL10/C00B399SP17:user/release-keys":{"屏幕宽度":1080,"屏幕高度":1920,"buildId":"HUAWEIEVA-AL10","主板":"EVA-AL10","制造商":"HUAWEI","型号":"EVA-AL10","产品名称":"EVA-AL10","硬件名称":"hi3650","唯一标识码":"HUAWEI/EVA-AL10/HWEVA:7.0/HUAWEIEVA-AL10/C00B399SP17:user/release-keys","AndroidId":"5c58196b5ff4bb02","API":24,"ip":"::ffff:192.168.12.102","port":39866,"客户端登记时间":"2018-12-12 23:49:10"},"undefined":{"屏幕宽度:":1080,"屏幕高度:":1920,"buildId:":"NRD90M","主板:":"msm8953","制造商:":"xiaomi","型号:":"Redmi Note 4X","产品名称:":"mido","硬件名称:":"qcom","唯一标识码:":"xiaomi/mido/mido:7.0/NRD90M/V10.1.1.0.NCFCNFI:user/release-keys","AndroidId: ":"32d5e8e7c1040540","API: ":24,"ip":"::ffff:192.168.12.102","port":49698,"客户端登记时间":"2018-12-13 23:03:08"},"nubia/NX573J/NX573J:6.0/MRA58K/eng.nubia.20170928.154844:user/release-keys":{"屏幕宽度":720,"屏幕高度":1280,"buildId":"MRA58K","主板":"mt6750","制造商":"nubia","型号":"NX573J","产品名称":"NX573J","硬件名称":"mt6755","唯一标识码":"nubia/NX573J/NX573J:6.0/MRA58K/eng.nubia.20170928.154844:user/release-keys","AndroidId":"92066836d1689565","API":23,"ip":"::ffff:192.168.12.113","port":49300,"客户端登记时间":"2018-12-13 23:06:50"}}
+{"xiaomi/ugglite/ugglite:7.1.2/N2G47H/8.3.1:user/release-keys":{"屏幕宽度":720,"屏幕高度":1280,"buildId":"N2G47H","主板":"QC_Reference_Phone","制造商":"xiaomi","型号":"Redmi Note 5A","产品名称":"ugglite","硬件名称":"qcom","唯一标识码":"xiaomi/ugglite/ugglite:7.1.2/N2G47H/8.3.1:user/release-keys","AndroidId":"eff4c619a4f92b20","API":25,"ip":"::ffff:192.168.12.100","port":50270,"客户端登记时间":"2018-12-14 00:14:29"},"HUAWEI/EVA-AL10/HWEVA:7.0/HUAWEIEVA-AL10/C00B399SP17:user/release-keys":{"屏幕宽度":1080,"屏幕高度":1920,"buildId":"HUAWEIEVA-AL10","主板":"EVA-AL10","制造商":"HUAWEI","型号":"EVA-AL10","产品名称":"EVA-AL10","硬件名称":"hi3650","唯一标识码":"HUAWEI/EVA-AL10/HWEVA:7.0/HUAWEIEVA-AL10/C00B399SP17:user/release-keys","AndroidId":"5c58196b5ff4bb02","API":24,"ip":"::ffff:192.168.12.102","port":39866,"客户端登记时间":"2018-12-12 23:49:10"},"undefined":{"屏幕宽度:":1080,"屏幕高度:":1920,"buildId:":"NRD90M","主板:":"msm8953","制造商:":"xiaomi","型号:":"Redmi Note 4X","产品名称:":"mido","硬件名称:":"qcom","唯一标识码:":"xiaomi/mido/mido:7.0/NRD90M/V10.1.1.0.NCFCNFI:user/release-keys","AndroidId: ":"32d5e8e7c1040540","API: ":24,"ip":"::ffff:192.168.12.102","port":49795,"客户端登记时间":"2018-12-14 00:14:29"},"nubia/NX573J/NX573J:6.0/MRA58K/eng.nubia.20170928.154844:user/release-keys":{"屏幕宽度":720,"屏幕高度":1280,"buildId":"MRA58K","主板":"mt6750","制造商":"nubia","型号":"NX573J","产品名称":"NX573J","硬件名称":"mt6755","唯一标识码":"nubia/NX573J/NX573J:6.0/MRA58K/eng.nubia.20170928.154844:user/release-keys","AndroidId":"92066836d1689565","API":23,"ip":"::ffff:192.168.12.113","port":34801,"客户端登记时间":"2018-12-14 00:14:30"}}

nodejs与autojs的socket通信/main.js

@@ -14,13 +14,16 @@ function childSendMsg(){
 
 }
 function 发送项目更新信息(){
+  console.log("发送项目更新信息");
+
   var projectName='项目名称'
   var scriptVersionNumber='项目脚本版本号'
   var 项目更新信息={
     "projectName":projectName,
     "scriptVersionNumber":scriptVersionNumber
   }
-  child.send('项目更新信息',项目更新信息)
+  项目更新信息=JSON.stringify(项目更新信息)
+  child.send('项目更新信息'+项目更新信息)
 }
 
 setTimeout(childSendMsg,20000)

nodejs与autojs的socket通信/server.js

@@ -106,7 +106,7 @@ function t1() {
         recordClientInfo(mobileInfo)
         var scriptContent='alert(\''+ JSON.stringify(mobileInfo) +'\')'
           if(mobileInfo){
-            socket.write("runScript"+scriptContent+"\r\n");
+            // socket.write("runScript"+scriptContent+"\r\n");
             // once=true
 
           }
@@ -186,19 +186,26 @@ t1();
 
 process.on('message', (msg) => {
   console.log('大头儿子收到小头爸爸发来的的消息->'+msg)
+  if(msg.indexOf("项目更新信息") != -1){
+
+    命令所有手机更新指定项目的脚本(msg )
+  }
+
+
+
   process.send(`\n小头爸爸,我收到你的消息了,剩下的事情交给我了\n`);
   // process.send(`\nhello parent\n`);
   // process.send('[worker] worker received!');
-  命令所有手机更新指定项目的脚本()
 });
 
-function 命令所有手机更新指定项目的脚本(){
+function 命令所有手机更新指定项目的脚本(项目更新信息){
   console.log("执行命令,所有手机更新指定项目的脚本");
   console.log("手机数量="+所有的手机.length);
 
   for(let i=0;i<所有的手机.length;i++){
     var socket=所有的手机[i]
     socket.write("都起床,小头爸爸说,得更新脚本啦"+"\r\n");
+    socket.write("项目更新信息"+项目更新信息+"\r\n");
 
     console.log("本次通知手机对象%j:%j", socket.remoteAddress, socket.remotePort);