shen/OldPeopleHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server

Browse Source
This commit is contained in:
ScorpioMiku
2019-09-07 10:43:01 +08:00
parent 8a2fbe426f
commit ed323d4cc1
7 changed files with 134 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml generated
View File

@@ -1,7 +1,9 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="gson-2.2.2"> <library name="gson-2.2.2">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../okhttpTest/gson-2.2.2.jar!/" /> <root url="jar://E:/javaprogrames/okhttpTest/gson-2.2.2.jar!/" />
<root url="jar://E:/javaprogrames/okhttpTest/okhttp-3.5.0.jar!/" />
<root url="jar://E:/javaprogrames/okhttpTest/okio-1.11.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

9
android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml generated
View File

@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="okhttp-3.5.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../okhttpTest/okhttp-3.5.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
android/OldPeopleInterServer/.idea/libraries/okio_1_11_0.xml generated
View File

@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="okio-1.11.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../okhttpTest/okio-1.11.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

123
android/OldPeopleInterServer/.idea/workspace.xml generated
View File

@@ -15,14 +15,12 @@
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true"> <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Main.java"> <entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="224">
<caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" /> <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#788#789#0" expanded="true" /> <element signature="e#688#689#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" /> <element signature="e#754#755#0" expanded="true" />
<element signature="e#2341#2342#0" expanded="true" />
<element signature="e#2447#2448#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -31,8 +29,8 @@
<file leaf-file-name="Node.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Node.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Node.java"> <entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="480">
<caret line="21" column="46" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" /> <caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -40,8 +38,8 @@
<file leaf-file-name="funcList.java" pinned="false" current-in-tab="false"> <file leaf-file-name="funcList.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/funcList.java"> <entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="120">
<caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" /> <caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -70,8 +68,8 @@
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false"> <file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/WebUtils.java"> <entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556"> <state relative-caret-position="323">
<caret line="51" column="44" selection-start-line="51" selection-start-column="44" selection-end-line="51" selection-end-column="44" /> <caret line="61" column="94" selection-start-line="61" selection-start-column="94" selection-end-line="61" selection-end-column="94" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@@ -96,11 +94,11 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/WebUtils.java" />
<option value="$PROJECT_DIR$/src/RoomData.java" /> <option value="$PROJECT_DIR$/src/RoomData.java" />
<option value="$PROJECT_DIR$/src/TimeUtils.java" /> <option value="$PROJECT_DIR$/src/TimeUtils.java" />
<option value="$PROJECT_DIR$/src/funcList.java" /> <option value="$PROJECT_DIR$/src/funcList.java" />
<option value="$PROJECT_DIR$/src/Node.java" /> <option value="$PROJECT_DIR$/src/Node.java" />
<option value="$PROJECT_DIR$/src/WebUtils.java" />
<option value="$PROJECT_DIR$/src/Main.java" /> <option value="$PROJECT_DIR$/src/Main.java" />
</list> </list>
</option> </option>
@@ -126,7 +124,6 @@
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@@ -144,12 +141,13 @@
</subPane> </subPane>
</pane> </pane>
<pane id="AndroidView" /> <pane id="AndroidView" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../okhttpTest/gson-2.2.2.jar!/" /> <property name="last_opened_file_path" value="E:/javaprogrames/okhttpTest/okio-1.11.0.jar!/" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Libraries" /> <property name="project.structure.last.edited" value="Libraries" />
@@ -238,14 +236,16 @@
<updated>1567753931598</updated> <updated>1567753931598</updated>
<workItem from="1567753939083" duration="1386000" /> <workItem from="1567753939083" duration="1386000" />
<workItem from="1567775235491" duration="855000" /> <workItem from="1567775235491" duration="855000" />
<workItem from="1567819403830" duration="1525000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2241000" /> <option name="totallyTimeSpent" value="3766000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
@@ -256,8 +256,8 @@
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Maven Projects" order="3" /> <window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" weight="0.2657952" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.44008714" />
<window_info anchor="right" id="Mongo Explorer" order="3" /> <window_info anchor="right" id="Mongo Explorer" order="3" />
<window_info anchor="bottom" id="Terminal" order="7" /> <window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" /> <window_info id="Capture Tool" order="2" />
@@ -268,8 +268,8 @@
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="2" /> <window_info id="UI Designer" order="2" />
<window_info anchor="right" id="Theme Preview" order="3" /> <window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -292,21 +292,50 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/Main.java"> <entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72"> <state relative-caret-position="144">
<caret line="3" selection-start-line="3" selection-end-line="3" /> <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#688#689#0" expanded="true" />
<element signature="e#754#755#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="21" column="46" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#788#789#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" />
<element signature="e#2341#2342#0" expanded="true" />
<element signature="e#2447#2448#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/WebUtils.java"> <entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556"> <state relative-caret-position="912">
<caret line="51" column="44" selection-start-line="51" selection-start-column="44" selection-end-line="51" selection-end-column="44" /> <caret line="51" column="44" selection-start-line="51" selection-start-column="44" selection-end-line="51" selection-end-column="44" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
@@ -314,6 +343,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="3" selection-start-line="3" selection-end-line="3" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#688#689#0" expanded="true" />
<element signature="e#754#755#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/RoomData.java"> <entry file="file://$PROJECT_DIR$/src/RoomData.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="408">
@@ -331,30 +372,38 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Node.java"> <entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="120">
<caret line="21" column="46" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" /> <caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/funcList.java"> <entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="480">
<caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" /> <caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="61" column="94" selection-start-line="61" selection-start-column="94" selection-end-line="61" selection-end-column="94" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Main.java"> <entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="224">
<caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" /> <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#788#789#0" expanded="true" /> <element signature="e#688#689#0" expanded="true" />
<element signature="e#878#879#0" expanded="true" /> <element signature="e#754#755#0" expanded="true" />
<element signature="e#2341#2342#0" expanded="true" />
<element signature="e#2447#2448#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

33
android/OldPeopleInterServer/src/Main.java
View File

@@ -1,4 +1,6 @@
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
import okhttp3.Response; import okhttp3.Response;
@@ -15,6 +17,21 @@ public class Main {
webUtils = WebUtils.getInstance(); webUtils = WebUtils.getInstance();
System.out.println("开始转发任务"); System.out.println("开始转发任务");
getAndUpData(); 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() { private static void getAndUpData() {
@@ -31,10 +48,11 @@ public class Main {
@Override @Override
public void onResponse(Call call, Response response) throws IOException { public void onResponse(Call call, Response response) throws IOException {
String body = response.body().string(); JsonArray jsonElements = getJsonArray(response);
Gson gson = new Gson(); Gson gson = new Gson();
Node[] nodes = gson.fromJson(body, Node[].class); Node[] nodes = gson.fromJson(jsonElements, Node[].class);
for (Node node : nodes) { for (Node node : nodes) {
System.out.println("接收到数据:" + node.toString());
funcList[] funcLists = node.getFuncList(); funcList[] funcLists = node.getFuncList();
for (funcList funcList : funcLists) { for (funcList funcList : funcLists) {
if (funcList.getType().equals("安防")) { if (funcList.getType().equals("安防")) {
@@ -47,6 +65,7 @@ public class Main {
} }
} }
RoomData roomData = new RoomData(isin, temporature, humidity, TimeUtils.getTime(), "1"); RoomData roomData = new RoomData(isin, temporature, humidity, TimeUtils.getTime(), "1");
System.out.println("解析出房间信息:" + roomData);
webUtils.upRoomState(roomData.getMap(), new Callback() { webUtils.upRoomState(roomData.getMap(), new Callback() {
@Override @Override
public void onFailure(Call call, IOException e) { public void onFailure(Call call, IOException e) {
@@ -55,7 +74,7 @@ public class Main {
@Override @Override
public void onResponse(Call call, Response response) throws IOException { public void onResponse(Call call, Response response) throws IOException {
System.out.println("上传成功:" + roomData.toString()); System.out.println("房间信息上传成功");
getAndUpData(); getAndUpData();
} }
}); });
@@ -67,4 +86,12 @@ public class Main {
} }
}).start(); }).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;
}
} }

10
android/OldPeopleInterServer/src/Node.java
View File

@@ -22,10 +22,18 @@ public class Node {
"nwkAddr='" + nwkAddr + '\'' + "nwkAddr='" + nwkAddr + '\'' +
", parAddr='" + parAddr + '\'' + ", parAddr='" + parAddr + '\'' +
", macAddr='" + macAddr + '\'' + ", 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() { public String getNwkAddr() {
return nwkAddr; return nwkAddr;
} }

7
android/OldPeopleInterServer/src/WebUtils.java
View File

@@ -57,5 +57,10 @@ public class WebUtils {
call.enqueue(callback); 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);
}
} }