From a17c8a7c673d6826b3083df1a0eba380a50a7b1a Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 18:49:10 +0800 Subject: [PATCH 01/10] Update ReadMe --- .../.idea/{ => .idea}/modules.xml | 2 +- .../.idea/.idea/workspace.xml | 165 ++++++++ .../OldPeopleInterServer/.idea/workspace.xml | 359 +++++++++++++++--- android/OldPeopleInterServer/src/Main.java | 4 +- 4 files changed, 467 insertions(+), 63 deletions(-) rename android/OldPeopleInterServer/.idea/{ => .idea}/modules.xml (56%) create mode 100644 android/OldPeopleInterServer/.idea/.idea/workspace.xml diff --git a/android/OldPeopleInterServer/.idea/modules.xml b/android/OldPeopleInterServer/.idea/.idea/modules.xml similarity index 56% rename from android/OldPeopleInterServer/.idea/modules.xml rename to android/OldPeopleInterServer/.idea/.idea/modules.xml index 6c70889..08f54a6 100644 --- a/android/OldPeopleInterServer/.idea/modules.xml +++ b/android/OldPeopleInterServer/.idea/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/.idea/workspace.xml b/android/OldPeopleInterServer/.idea/.idea/workspace.xml new file mode 100644 index 0000000..7be8305 --- /dev/null +++ b/android/OldPeopleInterServer/.idea/.idea/workspace.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -244,38 +242,37 @@ - - + - - - - + + - - - - + - - + - - + + + + + + + + @@ -292,16 +289,263 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -347,24 +591,22 @@ - - - - - - + - - + + + + + - + @@ -372,38 +614,33 @@ + + + + + + + - + - + - - - - - - - - - - - - + + - - diff --git a/android/OldPeopleInterServer/src/Main.java b/android/OldPeopleInterServer/src/Main.java index 038be9c..b2e9fde 100644 --- a/android/OldPeopleInterServer/src/Main.java +++ b/android/OldPeopleInterServer/src/Main.java @@ -13,11 +13,12 @@ public class Main { private static String humidity; private static WebUtils webUtils; + private static float slice; + public static void main(String[] args) { webUtils = WebUtils.getInstance(); System.out.println("开始转发任务"); getAndUpData(); -// fengshan(); } private static void fengshan() { @@ -59,6 +60,7 @@ public class Main { isin = String.valueOf((int) funcList.getData()); } else if (funcList.getType().equals("温度")) { temporature = String.valueOf(funcList.getData()); + } else if (funcList.getType().equals("湿度")) { humidity = String.valueOf(funcList.getData()); } From b5c19757132957cb28e5dab2c1f20df479f5ad33 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 18:58:24 +0800 Subject: [PATCH 02/10] Update Readme --- zigbee/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/zigbee/README.md b/zigbee/README.md index 0b54efa..e06da97 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -1,3 +1,4 @@ +## 硬件部分 ## z-stack协议栈 #### 协议栈的文件包层次结构： From ce655fafbc367569e73384533f44ad48dac275b8 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 18:59:46 +0800 Subject: [PATCH 03/10] 11 --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index e06da97..bcfa4cc 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -1,5 +1,5 @@ ## 硬件部分 -## z-stack协议栈 +## z-stack协议栈简介 #### 协议栈的文件包层次结构： From 5f9cc61dfaee92fba8bb5e6607a13e958b720e60 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:00:54 +0800 Subject: [PATCH 04/10] 1111 --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index bcfa4cc..fa09e48 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -1,7 +1,7 @@ ## 硬件部分 ## z-stack协议栈简介 -#### 协议栈的文件包层次结构： +#### 协议栈的文件包层次结构功能： - App：应用层目录，这是用户创建各种不同工程的区域，在这个目录中包含了应用层的内容和这个项目的主要内容，在协议中一般是以操作系统的任务实现的。 From 5a848dbcbf34cfa6a713443726774e5f0b7e3b79 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:04:35 +0800 Subject: [PATCH 05/10] ReadME was completed --- zigbee/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/zigbee/README.md b/zigbee/README.md index fa09e48..b1ed1e7 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -65,6 +65,7 @@ 获取zigbee节点数据：[http://192.168.0.1/cgi-bin/node.cgi](http://192.168.0.1/cgi-bin/node.cgi) 发送继电器控制命令：[http://192.168.0.1/cgi-bin/send_node.cgi?type=11&id=3&data=8](http://192.168.0.1/cgi-bin/send_node.cgi?type=11&id=3&data=8) +- 格式用例：http://192.168.0.1/cgi-bin/send_node.cgi?type=11&id=3&data=8(1\2\4) zigbee拓扑访问接口：[http://192.168.0.1/topo.html](http://192.168.0.1/topo.html) From 6eeb00cbd81858844c92049e8378605a11227efc Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:05:56 +0800 Subject: [PATCH 06/10] Function Down! --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index b1ed1e7..81762a4 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -84,5 +84,5 @@ zigbee拓扑访问接口：[http://192.168.0.1/topo.html](http://192.168.0.1/top * 由于硬件的数据访问是通过WiFi AP创建的局域网，所以数无法部署到云服务器，所以我们自己编写了一个脚本用来连接外网，把数据post到云服务器 * -* 若要访问以上网络接口，需要将设备连接到WiFi Ap创建的局域网内。 +* 若要访问以上网络接口，需要将设备连接到WiFi AP创建的局域网内。 From c8a43b01f7eeec48d4ea75374eff6fc2fc493ab0 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:07:23 +0800 Subject: [PATCH 07/10] Note something --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index 81762a4..94fd7e8 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -82,7 +82,7 @@ zigbee拓扑访问接口：[http://192.168.0.1/topo.html](http://192.168.0.1/top **备注**： -* 由于硬件的数据访问是通过WiFi AP创建的局域网，所以数无法部署到云服务器，所以我们自己编写了一个脚本用来连接外网，把数据post到云服务器 +* 由于硬件的数据访问是通过WiFi AP创建的局域网，所以数无法部署到云服务器，所以我们自己编写了一个脚本用来连接外网，把数据post到云服务器。 * * 若要访问以上网络接口，需要将设备连接到WiFi AP创建的局域网内。 From 4f3afd144272067ec620a9ada3235047034b8a52 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:08:22 +0800 Subject: [PATCH 08/10] down --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index 94fd7e8..07f6259 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -82,7 +82,7 @@ zigbee拓扑访问接口：[http://192.168.0.1/topo.html](http://192.168.0.1/top **备注**： -* 由于硬件的数据访问是通过WiFi AP创建的局域网，所以数无法部署到云服务器，所以我们自己编写了一个脚本用来连接外网，把数据post到云服务器。 +* 由于硬件的数据访问是通过WiFi AP创建的局域网，所以数无法部署到云服务器，所以我们自己编写了一个脚本（WifiTrick）用来连接外网，把数据post到云服务器。 * * 若要访问以上网络接口，需要将设备连接到WiFi AP创建的局域网内。 From 637a4581762e8bd7e9f10e854da5db00ed2980eb Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:10:11 +0800 Subject: [PATCH 09/10] wanjiesahua --- zigbee/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zigbee/README.md b/zigbee/README.md index 07f6259..4f11b24 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -86,3 +86,6 @@ zigbee拓扑访问接口：[http://192.168.0.1/topo.html](http://192.168.0.1/top * * 若要访问以上网络接口，需要将设备连接到WiFi AP创建的局域网内。 + +**完结撒花** + From 47cce7ad4171094fff0c0b6571d810d55a997639 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Wed, 11 Sep 2019 19:10:56 +0800 Subject: [PATCH 10/10] hhhhhh --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index 4f11b24..d997983 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -87,5 +87,5 @@ zigbee拓扑访问接口：[http://192.168.0.1/topo.html](http://192.168.0.1/top * 若要访问以上网络接口，需要将设备连接到WiFi AP创建的局域网内。 -**完结撒花** +**完结撒花，谢谢队友**