diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml
index d79e813..26e812c 100644
--- a/android/OldPeopleHome/.idea/workspace.xml
+++ b/android/OldPeopleHome/.idea/workspace.xml
@@ -64,50 +64,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -125,51 +81,44 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
@@ -177,62 +126,78 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -252,11 +217,6 @@
- 断开连接
- -4389
- gong'l
- gong'li
- g
公里
callRemoteDisconnect
disc
@@ -282,6 +242,11 @@
voiddialog
void dialog
log
+ login
+ case 1
+ callRemoteConnect
+ Y-
+ 断开连接
@color/choosed
@@ -2090,15 +2055,11 @@
@@ -2167,6 +2132,7 @@
+
@@ -2242,6 +2208,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2369,7 +2399,6 @@
-
@@ -2494,7 +2523,7 @@
-
+
@@ -2541,7 +2570,7 @@
-
+
@@ -2575,6 +2604,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2702,7 +2752,7 @@
-
+
@@ -2783,8 +2833,7 @@
-
-
+
@@ -2794,6 +2843,7 @@
+
@@ -2806,28 +2856,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2836,44 +2864,44 @@
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
@@ -2883,24 +2911,24 @@
+
+
+
+
+
-
-
-
-
-
@@ -2916,24 +2944,24 @@
+
+
+
+
+
-
-
-
-
-
@@ -2964,34 +2992,24 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3018,13 +3036,6 @@
-
-
-
-
-
-
-
@@ -3057,16 +3068,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -3086,19 +3087,18 @@
-
+
+
+
-
-
-
@@ -3107,70 +3107,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3187,7 +3127,7 @@
-
+
@@ -3208,20 +3148,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3231,37 +3160,159 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
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 2ee4dce..3d1bfc6 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
@@ -9,6 +9,7 @@ import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
@@ -16,7 +17,6 @@ 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;
@@ -51,6 +51,8 @@ public class EnvironmentFragment extends BaseFragment {
Unbinder unbinder;
@BindView(R.id.now_time_text)
TextView nowTimeText;
+ @BindView(R.id.change_button)
+ Button changeButton;
private RoomState roomState;
private OldPeople oldPeople;
@@ -133,7 +135,7 @@ public class EnvironmentFragment extends BaseFragment {
public void refreshUi(OldPeople oldPeople) {
super.refreshUi(oldPeople);
this.oldPeople = oldPeople;
- getWebUtils().getRoomData(oldPeople.getParentId(), new Callback() {
+ getWebUtils().getRoomData(oldPeople.getParentRoomId(), new Callback() {
@Override
public void onFailure(Call call, IOException e) {
LogUtils.loge(e.getMessage());
@@ -154,10 +156,6 @@ public class EnvironmentFragment extends BaseFragment {
});
}
- @OnClick(R.id.temperature_text)
- public void onViewClicked() {
- dialog();
- }
/**
* 弹出dialog进行老人绑定
@@ -194,4 +192,9 @@ public class EnvironmentFragment extends BaseFragment {
});
builder.show();
}
+
+ @OnClick(R.id.change_button)
+ public void onViewClicked() {
+ dialog();
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
index 5d263be..28c8fd5 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
@@ -1,13 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.loginregister;
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.widget.Button;
import android.widget.EditText;
import android.widget.RadioButton;
import android.widget.RadioGroup;
+import android.widget.Toast;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseActivity;
@@ -107,6 +110,7 @@ public class RegisterActivity extends BaseActivity {
@OnClick(R.id.register_button)
public void onViewClicked() {
+ dialog();
getText();
data.clear();
data.put("childSex", sexText);
@@ -115,17 +119,18 @@ public class RegisterActivity extends BaseActivity {
data.put("childName", nameText);
data.put("childLongId", idCardText);
data.put("childPhone", phoneText);
- getWebUtils().registerChild(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 {
- handler.sendEmptyMessage(1);
- }
- });
+// getWebUtils().registerChild(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 {
+// handler.sendEmptyMessage(1);
+//
+// }
+// });
}
/**
@@ -139,4 +144,21 @@ public class RegisterActivity extends BaseActivity {
passwordText = password.getText().toString();
}
+ private void dialog() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this).setIcon(R.mipmap.ic_launcher).setTitle("错误提醒")
+ .setMessage("注册失败，该账户已存在").setPositiveButton("确定", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ //ToDo: 你想做的事情
+ }
+ }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ //ToDo: 你想做的事情
+ dialogInterface.dismiss();
+ }
+ });
+ builder.create().show();
+ }
+
}
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 e5b7673..bd80579 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
@@ -89,6 +89,7 @@ public class OldPeopleMainActivity extends BaseActivity {
private Location location;
private Boolean mIsBound = false;
+ private BleDeviceItem targetItem;
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener;
private FragmentManager fragmentManager;
@@ -138,6 +139,7 @@ public class OldPeopleMainActivity extends BaseActivity {
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传位置成功");
+ changeLoc();
}
});
break;
@@ -177,7 +179,7 @@ public class OldPeopleMainActivity extends BaseActivity {
};
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
initFragmentManager();
- initBlueSDK();
+// initBlueSDK();
setUser((OldPeople) getIntent().getSerializableExtra("user"));
for (int i = 0; i < fragments.length; i++) {
fragments[i].refreshUi((OldPeople) getIntent().getSerializableExtra("user"));
@@ -280,6 +282,7 @@ public class OldPeopleMainActivity extends BaseActivity {
LogUtils.logList(nearbyItemList);
if (item.getBleDeviceName().equals("Y1-4389")) {
callRemoteDisconnect();
+ targetItem = item;
mac = item.getBleDeviceAddress();
callRemoteConnect(item.getBleDeviceName(), item.getBleDeviceAddress());
}
@@ -664,7 +667,6 @@ public class OldPeopleMainActivity extends BaseActivity {
LogUtils.logd("callRemoteConnect: ble device mac address is not correctly!");
return;
}
-
if (mService != null) {
try {
mService.connectBt(name, mac);
@@ -724,7 +726,10 @@ public class OldPeopleMainActivity extends BaseActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.floating_button:
- getNewHandData();
+// LogUtils.loge(targetItem.toString());
+ initBlueSDK();
+
+// getNewHandData();
break;
case R.id.close_button:
callRemoteDisconnect();
@@ -741,6 +746,8 @@ public class OldPeopleMainActivity extends BaseActivity {
}
}
+ private boolean upLoc = true;
+
private void startLocation() {
mLocationClient = new LocationClient(getApplicationContext());
mLocationClient.registerLocationListener(new BDAbstractLocationListener() {
@@ -759,7 +766,10 @@ public class OldPeopleMainActivity extends BaseActivity {
location.setLongitude(longitude + "");
location.setParent(getOldPeopleUser().getParentId());
location.setTime(TimeUtils.getTime());
- handler.sendEmptyMessage(3);
+ if (upLoc) {
+ handler.sendEmptyMessage(3);
+ upLoc = false;
+ }
}
});
LocationClientOption option = new LocationClientOption();
@@ -775,5 +785,19 @@ public class OldPeopleMainActivity extends BaseActivity {
mLocationClient.start();
}
+ private void changeLoc() {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ upLoc = true;
+ }
+ }).start();
+ }
+
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
index 33dfffa..99f860b 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
@@ -1,12 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt;
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.Button;
+import android.widget.EditText;
import android.widget.TextView;
import com.github.mikephil.charting.charts.LineChart;
@@ -14,6 +18,7 @@ import com.github.mikephil.charting.data.Entry;
import com.google.gson.JsonObject;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
+import com.scorpiomiku.oldpeoplehome.bean.OldPeople;
import com.scorpiomiku.oldpeoplehome.utils.ChartUtils;
import com.scorpiomiku.oldpeoplehome.utils.LogUtils;
import com.scorpiomiku.oldpeoplehome.utils.TimeUtils;
@@ -23,6 +28,7 @@ import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
+import butterknife.OnClick;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Callback;
@@ -46,10 +52,13 @@ public class EnvironmentFragment extends BaseFragment {
TextView titleTimeText;
@BindView(R.id.get_data_time)
TextView getDataTime;
+ @BindView(R.id.change_button)
+ Button changeButton;
private String temperature;
private String humidity;
private Boolean first = true;
+ private OldPeople oldPeople;
@SuppressLint("HandlerLeak")
@Override
@@ -66,6 +75,8 @@ public class EnvironmentFragment extends BaseFragment {
upWeather();
initChart();
break;
+ case 2:
+ break;
}
}
};
@@ -83,7 +94,6 @@ public class EnvironmentFragment extends BaseFragment {
@Override
protected void initView() {
- getWeatherData();
titleTimeText.setText(TimeUtils.getUpDate());
}
@@ -101,6 +111,12 @@ public class EnvironmentFragment extends BaseFragment {
unbinder.unbind();
}
+ @Override
+ public void onResume() {
+ super.onResume();
+ getWeatherData();
+ }
+
/**
* 初始化Chart
*/
@@ -183,8 +199,54 @@ public class EnvironmentFragment extends BaseFragment {
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传天气数据成功");
- getWeatherData();
}
});
}
+
+ @Override
+ public void refreshUi(OldPeople oldPeople) {
+ super.refreshUi(oldPeople);
+ this.oldPeople = oldPeople;
+ }
+
+ @OnClick(R.id.change_button)
+ 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/oldpeople/fragmemt/HeartRateFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
index 628f4e7..7e63233 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
@@ -114,12 +114,16 @@ public class HeartRateFragment extends BaseFragment {
@Override
public void onResponse(Call call, Response response) throws IOException {
- JsonArray jsonElements = getWebUtils().getJsonArray(response);
- LogUtils.loge(jsonElements.toString());
- Gson gson = new Gson();
- HeartRate[] heartRates = gson.fromJson(jsonElements, HeartRate[].class);
- firstHeart = Float.valueOf(heartRates[heartRates.length - 1].getRate());
- handler.sendEmptyMessage(2);
+ try {
+ JsonArray jsonElements = getWebUtils().getJsonArray(response);
+ LogUtils.loge(jsonElements.toString());
+ Gson gson = new Gson();
+ HeartRate[] heartRates = gson.fromJson(jsonElements, HeartRate[].class);
+ firstHeart = Float.valueOf(heartRates[heartRates.length - 1].getRate());
+ handler.sendEmptyMessage(2);
+ }catch (Exception e){
+ LogUtils.loge(e.getMessage());
+ }
}
});
}
@@ -199,8 +203,8 @@ public class HeartRateFragment extends BaseFragment {
handler.sendEmptyMessage(1);
}
heartRateText.setText(heart);
- this.diastolic.setText(diastolic);
- this.systolic.setText(systolic);
+ this.diastolic.setText(systolic);
+ this.systolic.setText(diastolic);
this.oxy.setText(oxy);
}
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
index 5e4e331..f55d399 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
@@ -1,15 +1,31 @@
package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt;
+import android.content.Intent;
+import android.os.Bundle;
import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
+import com.scorpiomiku.oldpeoplehome.modules.loginregister.LoginActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
/**
* Created by ScorpioMiku on 2019/8/18.
*/
public class MyInformationFragment extends BaseFragment {
+ @BindView(R.id.change)
+ RelativeLayout change;
+ Unbinder unbinder;
+
@Override
protected Handler initHandle() {
return null;
@@ -29,4 +45,25 @@ public class MyInformationFragment extends BaseFragment {
protected void initView() {
}
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ // TODO: inflate a fragment view
+ View rootView = super.onCreateView(inflater, container, savedInstanceState);
+ unbinder = ButterKnife.bind(this, rootView);
+ return rootView;
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ unbinder.unbind();
+ }
+
+ @OnClick(R.id.change)
+ public void onViewClicked() {
+ getActivity().finish();
+ Intent intent = new Intent(getContext(), LoginActivity.class);
+ startActivity(intent);
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
index 11756fc..8a68ef0 100644
--- a/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
+++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
@@ -27,10 +27,10 @@
android:textSize="14sp" />
@@ -107,9 +107,21 @@
-
+
+
+
+
-
+
+
+
+
@@ -224,7 +225,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
- android:text="关联的亲人"
+ android:text="切换账号"
android:textSize="16sp" />