diff --git a/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml b/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml index a336f85..1758c35 100644 --- a/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml +++ b/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml @@ -1,7 +1,9 @@ - + + + diff --git a/android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml b/android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml deleted file mode 100644 index 7d9085c..0000000 --- a/android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/libraries/okio_1_11_0.xml b/android/OldPeopleInterServer/.idea/libraries/okio_1_11_0.xml deleted file mode 100644 index 5682b21..0000000 --- a/android/OldPeopleInterServer/.idea/libraries/okio_1_11_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/workspace.xml b/android/OldPeopleInterServer/.idea/workspace.xml index a221ec8..957a8a9 100644 --- a/android/OldPeopleInterServer/.idea/workspace.xml +++ b/android/OldPeopleInterServer/.idea/workspace.xml @@ -15,14 +15,12 @@ - - + + - - - - + + @@ -31,8 +29,8 @@ - - + + @@ -40,8 +38,8 @@ - - + + @@ -70,8 +68,8 @@ - - + + @@ -96,11 +94,11 @@ @@ -126,7 +124,6 @@ - @@ -144,12 +141,13 @@ + - + @@ -238,14 +236,16 @@ 1567753931598 + - + @@ -256,8 +256,8 @@ - + @@ -268,8 +268,8 @@ - + @@ -292,21 +292,50 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + @@ -314,6 +343,18 @@ + + + + + + + + + + + + @@ -331,30 +372,38 @@ - + - - + + - + - - + + + + + + + + + + + + - - + + - - - - + + diff --git a/android/OldPeopleInterServer/src/Main.java b/android/OldPeopleInterServer/src/Main.java index 7f39981..038be9c 100644 --- a/android/OldPeopleInterServer/src/Main.java +++ b/android/OldPeopleInterServer/src/Main.java @@ -1,4 +1,6 @@ import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonParser; import okhttp3.Call; import okhttp3.Callback; import okhttp3.Response; @@ -15,6 +17,21 @@ public class Main { webUtils = WebUtils.getInstance(); System.out.println("开始转发任务"); getAndUpData(); +// fengshan(); + } + + private static void fengshan() { + webUtils.fengshan(8, new Callback() { + @Override + public void onFailure(Call call, IOException e) { + System.out.println(e.getMessage()); + } + + @Override + public void onResponse(Call call, Response response) throws IOException { + + } + }); } private static void getAndUpData() { @@ -31,10 +48,11 @@ public class Main { @Override public void onResponse(Call call, Response response) throws IOException { - String body = response.body().string(); + JsonArray jsonElements = getJsonArray(response); Gson gson = new Gson(); - Node[] nodes = gson.fromJson(body, Node[].class); + Node[] nodes = gson.fromJson(jsonElements, Node[].class); for (Node node : nodes) { + System.out.println("接收到数据:" + node.toString()); funcList[] funcLists = node.getFuncList(); for (funcList funcList : funcLists) { if (funcList.getType().equals("安防")) { @@ -47,6 +65,7 @@ public class Main { } } RoomData roomData = new RoomData(isin, temporature, humidity, TimeUtils.getTime(), "1"); + System.out.println("解析出房间信息:" + roomData); webUtils.upRoomState(roomData.getMap(), new Callback() { @Override public void onFailure(Call call, IOException e) { @@ -55,7 +74,7 @@ public class Main { @Override public void onResponse(Call call, Response response) throws IOException { - System.out.println("上传成功:" + roomData.toString()); + System.out.println("房间信息上传成功"); getAndUpData(); } }); @@ -67,4 +86,12 @@ public class Main { } }).start(); } + + private static JsonArray getJsonArray(Response response) throws IOException { + String result = response.body().string(); + JsonParser jsonParser = new JsonParser(); + JsonArray jsonObject = (JsonArray) jsonParser.parse(result); + return jsonObject; + } + } diff --git a/android/OldPeopleInterServer/src/Node.java b/android/OldPeopleInterServer/src/Node.java index bb64abf..66d0a96 100644 --- a/android/OldPeopleInterServer/src/Node.java +++ b/android/OldPeopleInterServer/src/Node.java @@ -22,10 +22,18 @@ public class Node { "nwkAddr='" + nwkAddr + '\'' + ", parAddr='" + parAddr + '\'' + ", macAddr='" + macAddr + '\'' + - ", funcList=" + funcList + + ", funcList=" + funcListString() + '}'; } + private String funcListString() { + String temp = ""; + for (int i = 0; i < funcList.length; i++) { + temp += funcList[i].toString(); + } + return temp; + } + public String getNwkAddr() { return nwkAddr; } diff --git a/android/OldPeopleInterServer/src/WebUtils.java b/android/OldPeopleInterServer/src/WebUtils.java index 2afa965..3d06545 100644 --- a/android/OldPeopleInterServer/src/WebUtils.java +++ b/android/OldPeopleInterServer/src/WebUtils.java @@ -57,5 +57,10 @@ public class WebUtils { call.enqueue(callback); } - + public void fengshan(int code, Callback callback) { + Request request = new Request.Builder() + .url("http://192.168.0.1/cgi-bin/send_node.cgi" + "?type=11&id=3&data=" + code).build(); + Call call = mClient.newCall(request); + call.enqueue(callback); + } }