From 5184cd4ee62145b52c081a018202db9143774ae1 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Fri, 6 Sep 2019 21:22:03 +0800 Subject: [PATCH] inter server --- android/OldPeopleHome/.idea/workspace.xml | 585 ++++++++----- .../oldpeoplehome/bean/Location.java | 58 ++ .../children/fragment/MapFragment.java | 60 +- .../activity/OldPeopleMainActivity.java | 29 + .../oldpeoplehome/utils/WebUtils.java | 28 +- .../.idea/libraries/gson_2_2_2.xml | 9 + .../.idea/libraries/okhttp_3_5_0.xml | 9 + .../.idea/libraries/okio_1_11_0.xml | 9 + android/OldPeopleInterServer/.idea/misc.xml | 6 + .../OldPeopleInterServer/.idea/modules.xml | 8 + .../OldPeopleInterServer/.idea/workspace.xml | 450 ++++++++++ android/OldPeopleInterServer/src/Main.java | 70 ++ android/OldPeopleInterServer/src/Node.java | 54 ++ .../OldPeopleInterServer/src/RoomData.java | 82 ++ .../OldPeopleInterServer/src/TimeUtils.java | 18 + .../OldPeopleInterServer/src/WebUtils.java | 61 ++ .../OldPeopleInterServer/src/funcList.java | 55 ++ .../android_arch_core_common_1_0_0_jar.xml | 11 - ...ndroid_arch_lifecycle_common_1_0_0_jar.xml | 11 - .../android_arch_lifecycle_runtime_1_0_0.xml | 12 - ...upport_animated_vector_drawable_26_1_0.xml | 12 - ...om_android_support_appcompat_v7_26_1_0.xml | 12 - ...support_support_annotations_26_1_0_jar.xml | 11 - ..._android_support_support_compat_26_1_0.xml | 12 - ...android_support_support_core_ui_26_1_0.xml | 12 - ...roid_support_support_core_utils_26_1_0.xml | 12 - ...ndroid_support_support_fragment_26_1_0.xml | 12 - ...id_support_support_media_compat_26_1_0.xml | 12 - .../com_android_support_support_v4_26_1_0.xml | 12 - ...support_support_vector_drawable_26_1_0.xml | 12 - android/WIFITrick/.idea/workspace.xml | 802 +++++++++++------- .../com/scorpiomiku/wifitrick/WebUtils.java | 11 - .../app/src/main/res/values/styles.xml | 2 +- .../.idea/workspace.xml | 336 +++++--- android/图标/绑定.svg | 1 + 35 files changed, 2091 insertions(+), 805 deletions(-) create mode 100644 android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Location.java create mode 100644 android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml create mode 100644 android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml create mode 100644 android/OldPeopleInterServer/.idea/libraries/okio_1_11_0.xml create mode 100644 android/OldPeopleInterServer/.idea/misc.xml create mode 100644 android/OldPeopleInterServer/.idea/modules.xml create mode 100644 android/OldPeopleInterServer/.idea/workspace.xml create mode 100644 android/OldPeopleInterServer/src/Main.java create mode 100644 android/OldPeopleInterServer/src/Node.java create mode 100644 android/OldPeopleInterServer/src/RoomData.java create mode 100644 android/OldPeopleInterServer/src/TimeUtils.java create mode 100644 android/OldPeopleInterServer/src/WebUtils.java create mode 100644 android/OldPeopleInterServer/src/funcList.java delete mode 100644 android/WIFITrick/.idea/libraries/android_arch_core_common_1_0_0_jar.xml delete mode 100644 android/WIFITrick/.idea/libraries/android_arch_lifecycle_common_1_0_0_jar.xml delete mode 100644 android/WIFITrick/.idea/libraries/android_arch_lifecycle_runtime_1_0_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_animated_vector_drawable_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_appcompat_v7_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_annotations_26_1_0_jar.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_compat_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_core_ui_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_core_utils_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_fragment_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_media_compat_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_v4_26_1_0.xml delete mode 100644 android/WIFITrick/.idea/libraries/com_android_support_support_vector_drawable_26_1_0.xml create mode 100644 android/图标/绑定.svg diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml index a343e67..eec02b5 100644 --- a/android/OldPeopleHome/.idea/workspace.xml +++ b/android/OldPeopleHome/.idea/workspace.xml @@ -161,33 +161,36 @@ - - - - - + + + - - + + - - - - - + + + - + - - - + + + + + + + + + + @@ -195,51 +198,48 @@ - + - - - - - - - - - - - - - - - - - - - + + - - + + - - - + + + + + + + + + + + + + + + + + + + + - - - @@ -257,7 +257,6 @@ - duan'ka 断开 断开li 断开lian @@ -287,6 +286,7 @@ " parent "parent + latitu @color/choosed @@ -2095,7 +2095,6 @@ @@ -2170,6 +2170,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2240,105 +2475,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2457,8 +2599,7 @@ - - - - - - - - - - @@ -3017,15 +3167,15 @@ - - - + + + @@ -3100,13 +3250,6 @@ - - - - - - - @@ -3156,30 +3299,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -3209,23 +3328,85 @@ - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Location.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Location.java new file mode 100644 index 0000000..777fbcc --- /dev/null +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/bean/Location.java @@ -0,0 +1,58 @@ +package com.scorpiomiku.oldpeoplehome.bean; + +import android.support.annotation.NonNull; + +/** + * Created by ScorpioMiku on 2019/9/6. + */ + +public class Location { + private String parent; + private String longitude; + private String latitude; + private String time; + + @Override + public String toString() { + return "Location{" + + "parent='" + parent + '\'' + + ", longitude='" + longitude + '\'' + + ", latitude='" + latitude + '\'' + + ", time='" + time + '\'' + + '}'; + } + + public String getParent() { + return parent; + } + + public void setParent(String parent) { + this.parent = parent; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + +} 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 1334211..6fe731c 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 @@ -1,7 +1,9 @@ package com.scorpiomiku.oldpeoplehome.modules.children.fragment; +import android.annotation.SuppressLint; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -16,15 +18,26 @@ import com.baidu.mapapi.map.Overlay; import com.baidu.mapapi.map.OverlayOptions; import com.baidu.mapapi.map.PolylineOptions; import com.baidu.mapapi.model.LatLng; +import com.google.gson.Gson; +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.modules.oldpeople.activity.OldPeopleMainActivity; +import com.scorpiomiku.oldpeoplehome.utils.LogUtils; +import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Response; /** * Created by ScorpioMiku on 2019/8/21. @@ -36,9 +49,22 @@ public class MapFragment extends BaseFragment { Unbinder unbinder; LatLng GEO_ZHONGBEI = new LatLng(38.019467, 112.455778); + private ArrayList locations = new ArrayList<>(); + + @SuppressLint("HandlerLeak") @Override protected Handler initHandle() { - return null; + return new Handler() { + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { + case 1: + drawLine(); + break; + } + } + }; } @Override @@ -48,7 +74,26 @@ 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 @@ -60,7 +105,6 @@ public class MapFragment extends BaseFragment { MapStatus.Builder builder = new MapStatus.Builder(); builder.zoom(16.5f); map.getMap().setMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build())); - drawLine(); } @Override @@ -104,13 +148,13 @@ public class MapFragment extends BaseFragment { * 轨迹 */ private void drawLine() { - LatLng p1 = new LatLng(38.019467, 112.455778); - LatLng p2 = new LatLng(38.019467, 112.465778); - LatLng p3 = new LatLng(38.019467, 112.455978); List points = new ArrayList(); - points.add(p1); - points.add(p2); - points.add(p3); + for (int i = 0; i < locations.size(); i++) { + points.add(new LatLng( + Double.valueOf(locations.get(i).getLatitude()), + Double.valueOf(locations.get(i).getLongitude()) + )); + } //设置折线的属性 OverlayOptions mOverlayOptions = new PolylineOptions() .width(10) diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java index 64b31c6..e5b7673 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java @@ -28,6 +28,7 @@ import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.base.BaseActivity; import com.scorpiomiku.oldpeoplehome.base.BaseFragment; import com.scorpiomiku.oldpeoplehome.bean.BleDeviceItem; +import com.scorpiomiku.oldpeoplehome.bean.Location; import com.scorpiomiku.oldpeoplehome.bean.OldPeople; import com.scorpiomiku.oldpeoplehome.bean.SportData; import com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt.EnvironmentFragment; @@ -43,16 +44,21 @@ import com.scorpiomiku.oldpeoplehome.utils.TimeUtils; import com.sxr.sdk.ble.keepfit.aidl.IRemoteService; import com.sxr.sdk.ble.keepfit.aidl.IServiceCallback; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Response; /** * Created by ScorpioMiku on 2019/8/18. @@ -80,6 +86,8 @@ public class OldPeopleMainActivity extends BaseActivity { private String bloodPressureDiastole = "0"; private String oxygen; + private Location location; + private Boolean mIsBound = false; private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener; @@ -116,6 +124,22 @@ public class OldPeopleMainActivity extends BaseActivity { break; case 3: //定位 + data.clear(); + data.put("parent", location.getParent()); + data.put("longitude", location.getLongitude()); + data.put("latitude", location.getLatitude()); + data.put("time", location.getTime()); + getWebUtils().upLocation(data, new okhttp3.Callback() { + @Override + public void onFailure(Call call, IOException e) { + LogUtils.loge(e.getMessage()); + } + + @Override + public void onResponse(Call call, Response response) throws IOException { + LogUtils.logd("上传位置成功"); + } + }); break; } } @@ -730,6 +754,11 @@ public class OldPeopleMainActivity extends BaseActivity { //获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明 int errorCode = bdLocation.getLocType(); LogUtils.logd(latitude + ";" + longitude + ";" + radius + ";" + coorType + ";" + errorCode); + location = new Location(); + location.setLatitude(latitude + ""); + location.setLongitude(longitude + ""); + location.setParent(getOldPeopleUser().getParentId()); + location.setTime(TimeUtils.getTime()); handler.sendEmptyMessage(3); } }); 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 3abf4d5..6278a02 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 @@ -249,6 +249,30 @@ public class WebUtils { Call call = mClient.newCall(request); call.enqueue(callback); } -// -// public void upLocation() + + /** + * 上传坐标 + * + * @param hashMap + * @param callback + */ + public void upLocation(HashMap hashMap, Callback callback) { + Request request = new Request.Builder().post(getRequestBody(hashMap)) + .url(webHost + "/location/add/").build(); + Call call = mClient.newCall(request); + call.enqueue(callback); + } + + /** + * 获取坐标 + * + * @param parentId + * @param callback + */ + public void getLocation(String parentId, Callback callback) { + Request request = new Request.Builder() + .url(webHost + "/location/get/" + parentId).build(); + Call call = mClient.newCall(request); + call.enqueue(callback); + } } diff --git a/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml b/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml new file mode 100644 index 0000000..a336f85 --- /dev/null +++ b/android/OldPeopleInterServer/.idea/libraries/gson_2_2_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml b/android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml new file mode 100644 index 0000000..7d9085c --- /dev/null +++ b/android/OldPeopleInterServer/.idea/libraries/okhttp_3_5_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 new file mode 100644 index 0000000..5682b21 --- /dev/null +++ b/android/OldPeopleInterServer/.idea/libraries/okio_1_11_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/misc.xml b/android/OldPeopleInterServer/.idea/misc.xml new file mode 100644 index 0000000..0548357 --- /dev/null +++ b/android/OldPeopleInterServer/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/modules.xml b/android/OldPeopleInterServer/.idea/modules.xml new file mode 100644 index 0000000..6c70889 --- /dev/null +++ b/android/OldPeopleInterServer/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/android/OldPeopleInterServer/.idea/workspace.xml b/android/OldPeopleInterServer/.idea/workspace.xml new file mode 100644 index 0000000..a221ec8 --- /dev/null +++ b/android/OldPeopleInterServer/.idea/workspace.xml @@ -0,0 +1,450 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.scorpiomiku.wifitrick. + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + +