diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml index eec02b5..d79e813 100644 --- a/android/OldPeopleHome/.idea/workspace.xml +++ b/android/OldPeopleHome/.idea/workspace.xml @@ -126,23 +126,65 @@ - + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + @@ -151,92 +193,45 @@ - + - - + + - - + + - - - - - - - - - + + - - + + - - + + - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + @@ -257,13 +252,6 @@ - 断开 - 断开li - 断开lian - 断开lian'jie - step - send - 4389 断开连接 -4389 gong'l @@ -287,6 +275,13 @@ parent "parent latitu + d + dialog + vdialog + vodialog + voiddialog + void dialog + log @color/choosed @@ -2122,7 +2117,6 @@ @@ -2171,6 +2166,7 @@ + @@ -2225,84 +2221,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2474,7 +2369,7 @@ - + @@ -2599,7 +2494,7 @@ - + + + + + + + + + + - - + - - - - - + + - - - @@ -2918,8 +2794,6 @@ - - @@ -2932,13 +2806,6 @@ - - - - - - - @@ -3068,14 +2935,6 @@ - - - - - - - - @@ -3090,16 +2949,6 @@ - - - - - - - - - - @@ -3114,21 +2963,6 @@ - - - - - - - - - - - - - - - @@ -3205,13 +3039,6 @@ - - - - - - - @@ -3230,16 +3057,6 @@ - - - - - - - - - - @@ -3277,7 +3094,6 @@ - @@ -3288,22 +3104,6 @@ - - - - - - - - - - - - - - - - @@ -3318,43 +3118,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3379,7 +3152,7 @@ - + @@ -3387,23 +3160,108 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - - - - - - + + diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java index 0c0bab0..2ee4dce 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java @@ -1,18 +1,22 @@ package com.scorpiomiku.oldpeoplehome.modules.children.fragment; import android.annotation.SuppressLint; +import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.EditText; import android.widget.TextView; import com.github.mikephil.charting.charts.LineChart; import com.github.mikephil.charting.data.Entry; import com.google.gson.Gson; import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; import com.scorpiomiku.oldpeoplehome.bean.OldPeople; @@ -25,6 +29,7 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; import butterknife.Unbinder; import okhttp3.Call; import okhttp3.Callback; @@ -48,6 +53,7 @@ public class EnvironmentFragment extends BaseFragment { TextView nowTimeText; private RoomState roomState; + private OldPeople oldPeople; @SuppressLint("HandlerLeak") @Override @@ -126,6 +132,7 @@ public class EnvironmentFragment extends BaseFragment { @Override public void refreshUi(OldPeople oldPeople) { super.refreshUi(oldPeople); + this.oldPeople = oldPeople; getWebUtils().getRoomData(oldPeople.getParentId(), new Callback() { @Override public void onFailure(Call call, IOException e) { @@ -146,4 +153,45 @@ public class EnvironmentFragment extends BaseFragment { } }); } + + @OnClick(R.id.temperature_text) + public void onViewClicked() { + dialog(); + } + + /** + * 弹出dialog进行老人绑定 + */ + private void dialog() { + final EditText editText = new EditText(getContext()); + AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + builder.setTitle("设置房间温度").setIcon(R.drawable.ic_bind).setView(editText) + .setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + dialogInterface.dismiss(); + } + }); + builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + String temp = editText.getText().toString(); + data.clear(); + data.put("temp", temp); + + getWebUtils().changeTem(oldPeople.getParentRoomId(), data, new Callback() { + @Override + public void onFailure(Call call, IOException e) { + LogUtils.loge(e.getMessage()); + } + + @Override + public void onResponse(Call call, Response response) throws IOException { + LogUtils.loge("temp"); + } + }); + } + }); + builder.show(); + } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java index 6fe731c..9da6217 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java @@ -23,6 +23,8 @@ import com.google.gson.JsonArray; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; import com.scorpiomiku.oldpeoplehome.bean.Location; +import com.scorpiomiku.oldpeoplehome.bean.OldPeople; +import com.scorpiomiku.oldpeoplehome.modules.children.activity.ChildMainActivity; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity; import com.scorpiomiku.oldpeoplehome.utils.LogUtils; @@ -48,6 +50,7 @@ public class MapFragment extends BaseFragment { MapView map; Unbinder unbinder; LatLng GEO_ZHONGBEI = new LatLng(38.019467, 112.455778); + private OldPeople oldPeople; private ArrayList locations = new ArrayList<>(); @@ -60,7 +63,8 @@ public class MapFragment extends BaseFragment { super.handleMessage(msg); switch (msg.what) { case 1: - drawLine(); +// drawLine(); + refreshUi(oldPeople); break; } } @@ -74,26 +78,7 @@ public class MapFragment extends BaseFragment { @Override protected void refreshData() { - getWebUtils().getLocation(((OldPeopleMainActivity) getActivity()).getOldPeopleUser().getParentId(), new Callback() { - @Override - public void onFailure(Call call, IOException e) { - LogUtils.loge(e.getMessage()); - } - @Override - public void onResponse(Call call, Response response) throws IOException { - try { - JsonArray jsonElements = getWebUtils().getJsonArray(response); - Gson gson = new Gson(); - Location[] locas = gson.fromJson(jsonElements, Location[].class); - locations.clear(); - locations.addAll(Arrays.asList(locas)); - handler.sendEmptyMessage(1); - } catch (Exception e) { - LogUtils.loge(e.getMessage()); - } - } - }); } @Override @@ -105,6 +90,7 @@ public class MapFragment extends BaseFragment { MapStatus.Builder builder = new MapStatus.Builder(); builder.zoom(16.5f); map.getMap().setMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build())); + refreshData(); } @Override @@ -164,4 +150,43 @@ public class MapFragment extends BaseFragment { //mPloyline 折线对象 Overlay mPolyline = map.getMap().addOverlay(mOverlayOptions); } + + @Override + public void refreshUi(OldPeople oldPeople) { + super.refreshUi(oldPeople); + this.oldPeople = oldPeople; + new Thread(new Runnable() { + @Override + public void run() { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + getWebUtils().getLocation(oldPeople.getParentId(), new Callback() { + @Override + public void onFailure(Call call, IOException e) { + LogUtils.loge(e.getMessage()); + } + + @Override + public void onResponse(Call call, Response response) throws IOException { + try { + JsonArray jsonElements = getWebUtils().getJsonArray(response); + Gson gson = new Gson(); + Location[] locas = gson.fromJson(jsonElements, Location[].class); + for (int i = 0; i < locas.length; i++) { +// LogUtils.loge(locas[i].toString()); + } + locations.clear(); + locations.addAll(Arrays.asList(locas)); + handler.sendEmptyMessage(1); + } catch (Exception e) { + LogUtils.loge(e.getMessage()); + } + } + }); + } + }).start(); + } } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java index cb02a1b..10e422e 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java @@ -139,9 +139,6 @@ public class SleepFragment extends BaseFragment { Gson gson = new Gson(); SleepData[] sleeps = gson.fromJson(jsonElements, SleepData[].class); Arrays.sort(sleeps); - for (int i = 0; i < sleeps.length; i++) { - LogUtils.loge(sleeps[i].toString()); - } yesterday = sleeps[sleeps.length - 1]; sleepDatas.clear(); sleepDatas.addAll(Arrays.asList(sleeps)); diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java index 6278a02..d994b5f 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java @@ -275,4 +275,19 @@ public class WebUtils { Call call = mClient.newCall(request); call.enqueue(callback); } + + /** + * 修改温度阈值 + * + * @param roomId + * @param hashMap + * @param callback + */ + public void changeTem(String roomId, HashMap hashMap, Callback callback) { + Request request = new Request.Builder().post(getRequestBody(hashMap)) + .url(webHost + "/room/update/" + roomId).build(); + LogUtils.loge(webHost + "/room/update/" + roomId); + Call call = mClient.newCall(request); + call.enqueue(callback); + } } diff --git a/android/OldPeopleInterServer/.idea/workspace.xml b/android/OldPeopleInterServer/.idea/workspace.xml index 957a8a9..3005eda 100644 --- a/android/OldPeopleInterServer/.idea/workspace.xml +++ b/android/OldPeopleInterServer/.idea/workspace.xml @@ -15,8 +15,8 @@ - - + + @@ -112,11 +112,9 @@ - - - - + + diff --git a/android/WIFITrick/.idea/workspace.xml b/android/WIFITrick/.idea/workspace.xml index 1c373e6..9cd5414 100644 --- a/android/WIFITrick/.idea/workspace.xml +++ b/android/WIFITrick/.idea/workspace.xml @@ -36,7 +36,7 @@ - + @@ -76,24 +76,21 @@ - + - - - - - - + + + - + - - + + @@ -1922,7 +1919,7 @@ - @@ -2124,7 +2047,7 @@ - + - @@ -2406,6 +2328,7 @@ + @@ -2474,7 +2397,6 @@ - @@ -2493,10 +2415,7 @@ - - - - + @@ -2565,7 +2484,6 @@ - @@ -2584,10 +2502,7 @@ - - - - + @@ -2655,7 +2570,6 @@ - @@ -2674,10 +2588,7 @@ - - - - + @@ -2753,7 +2664,6 @@ - @@ -2827,7 +2737,7 @@ - + @@ -2841,26 +2751,23 @@ - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周-森林防火系统文档.zip b/文档/物联网工程实验周参考文档/参考/物联网工程实验周-森林防火系统文档.zip new file mode 100644 index 0000000..248372c Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周-森林防火系统文档.zip differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/1.项目任务书.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/1.项目任务书.doc new file mode 100644 index 0000000..95148ff Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/1.项目任务书.doc differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/2.需求规格说明书.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/2.需求规格说明书.doc new file mode 100644 index 0000000..4f05ff3 Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/2.需求规格说明书.doc differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/3.系统设计说明书.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/3.系统设计说明书.doc new file mode 100644 index 0000000..fa2fe61 Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/3.系统设计说明书.doc differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/4.测试报告.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/4.测试报告.doc new file mode 100644 index 0000000..34fce9b Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/4.测试报告.doc differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/5.总结.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/5.总结.doc new file mode 100644 index 0000000..64f2aa8 Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/5.总结.doc differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/封面.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/封面.doc new file mode 100644 index 0000000..8597b1f Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/封面.doc differ diff --git a/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/装订.doc b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/装订.doc new file mode 100644 index 0000000..2ff6a7a Binary files /dev/null and b/文档/物联网工程实验周参考文档/参考/物联网工程实验周参考文档/装订.doc differ diff --git a/文档/物联网工程实验周参考文档/智能养老院/1.项目任务书.doc b/文档/物联网工程实验周参考文档/智能养老院/1.项目任务书.doc new file mode 100644 index 0000000..42a25bc Binary files /dev/null and b/文档/物联网工程实验周参考文档/智能养老院/1.项目任务书.doc differ diff --git a/文档/物联网工程实验周参考文档/智能养老院/2.需求规格说明书.doc b/文档/物联网工程实验周参考文档/智能养老院/2.需求规格说明书.doc new file mode 100644 index 0000000..7299409 Binary files /dev/null and b/文档/物联网工程实验周参考文档/智能养老院/2.需求规格说明书.doc differ diff --git a/文档/物联网工程实验周参考文档/智能养老院/~WRL1656.tmp b/文档/物联网工程实验周参考文档/智能养老院/~WRL1656.tmp new file mode 100644 index 0000000..d6a78af Binary files /dev/null and b/文档/物联网工程实验周参考文档/智能养老院/~WRL1656.tmp differ diff --git a/文档/物联网工程实验周参考文档/模版/1.项目任务书.doc b/文档/物联网工程实验周参考文档/模版/1.项目任务书.doc new file mode 100644 index 0000000..84533dc Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/1.项目任务书.doc differ diff --git a/文档/物联网工程实验周参考文档/模版/2.需求规格说明书.doc b/文档/物联网工程实验周参考文档/模版/2.需求规格说明书.doc new file mode 100644 index 0000000..40be217 Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/2.需求规格说明书.doc differ diff --git a/文档/物联网工程实验周参考文档/模版/3.系统设计说明书.doc b/文档/物联网工程实验周参考文档/模版/3.系统设计说明书.doc new file mode 100644 index 0000000..426260a Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/3.系统设计说明书.doc differ diff --git a/文档/物联网工程实验周参考文档/模版/4.测试报告.doc b/文档/物联网工程实验周参考文档/模版/4.测试报告.doc new file mode 100644 index 0000000..760d42b Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/4.测试报告.doc differ diff --git a/文档/物联网工程实验周参考文档/模版/5.总结.doc b/文档/物联网工程实验周参考文档/模版/5.总结.doc new file mode 100644 index 0000000..d889538 Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/5.总结.doc differ diff --git a/文档/物联网工程实验周参考文档/模版/封面.doc b/文档/物联网工程实验周参考文档/模版/封面.doc new file mode 100644 index 0000000..08a6dd5 Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/封面.doc differ diff --git a/文档/物联网工程实验周参考文档/模版/装订.doc b/文档/物联网工程实验周参考文档/模版/装订.doc new file mode 100644 index 0000000..2ef4319 Binary files /dev/null and b/文档/物联网工程实验周参考文档/模版/装订.doc differ