Commit Graph

81 Commits

Author SHA1 Message Date
ScorpioMiku
b4fcde96e3 rate 2019-08-29 10:31:58 +08:00
ScorpioMiku
ce3514a928 rate 2019-08-29 10:31:32 +08:00
ScorpioMiku
5934dc9233 heart rate 2019-08-29 10:16:13 +08:00
ScorpioMiku
9f649b4f33 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-29 09:37:56 +08:00
ScorpioMiku
61e28d2613 heartrate 2019-08-29 09:37:49 +08:00
vickihe
2a8b87b76b update 2019-08-28 21:54:29 +08:00
ScorpioMiku
dd3946829d Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-28 16:51:57 +08:00
ScorpioMiku
4fcc41e7b6 step 2019-08-28 16:51:45 +08:00
jiangyuwei666
203489b72f add column 2019-08-27 21:28:36 +08:00
vickihe
1a923fafe8 update 2019-08-27 19:54:52 +08:00
JiangYuWei
4410650225 Update README.md 2019-08-27 17:12:20 +08:00
vickihe
5e5b113512 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-25 21:43:37 +08:00
vickihe
068bd96f95 update 2019-08-25 21:42:37 +08:00
ScorpioMiku
9580d0e68c 1 2019-08-25 17:23:28 +08:00
ScorpioMiku
5c446380a5 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-23 17:01:12 +08:00
ScorpioMiku
3f8678a9be step is ok 2019-08-23 16:59:47 +08:00
jiangyuwei666
f42eef6ff1 modify conf 2019-08-23 16:14:43 +08:00
jiangyuwei666
260dd5d04a add sql file 2019-08-23 16:10:17 +08:00
jiangyuwei666
b896a4f671 add sql file 2019-08-23 16:06:21 +08:00
jiangyuwei666
ee6dd13bb6 update README 2019-08-23 15:51:57 +08:00
jiangyuwei666
bb8b0e6ae4 基本接口已完成 2019-08-23 13:58:20 +08:00
LitterDryFish
6b0d1c0743 add node 2019-08-23 12:26:53 +08:00
LitterDryFish
0657e3a6a9 组网 2019-08-23 09:32:51 +08:00
ScorpioMiku
bbe613b74b jyo 2019-08-22 15:30:07 +08:00
ScorpioMiku
09fff5b9ab drawer 2019-08-21 17:35:13 +08:00
ScorpioMiku
4e52a0c2f9 drawer 2019-08-21 16:41:36 +08:00
ScorpioMiku
e7a37e6bce drawer 2019-08-21 16:40:43 +08:00
ScorpioMiku
9a15d7f09d drawer 2019-08-21 16:06:49 +08:00
ScorpioMiku
edc31ac520 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-21 14:41:09 +08:00
ScorpioMiku
00ea00445d spinner 2019-08-21 14:39:31 +08:00
vickihe
66f8d1b0c8 modify 2019-08-21 13:55:47 +08:00
vickihe
9339204d1d modify 2019-08-21 13:54:38 +08:00
vickihe
d3104efe2a modify 2019-08-21 13:53:43 +08:00
ScorpioMiku
7844c9d854 child begin 2019-08-21 10:01:23 +08:00
jiangyuwei666
3d25edc115 parent room business done 2019-08-20 21:25:26 +08:00
ScorpioMiku
416f42efc1 enviroment 2019-08-20 16:29:48 +08:00
ScorpioMiku
17ba8fb698 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-20 15:30:34 +08:00
ScorpioMiku
eee362050c sleep ok 2019-08-20 15:29:34 +08:00
vickihe
417374b529 修改 2019-08-20 13:51:29 +08:00
vickihe
b2784e15aa update loginDemo 2019-08-20 13:45:17 +08:00
vickihe
812b3ce79a update LoginDemo 2019-08-20 13:41:52 +08:00
vickihe
5aba4c9f3f update登录demo 2019-08-20 13:40:03 +08:00
vickihe
8c348eda33 Update登录demo 2019-08-20 13:33:02 +08:00
ScorpioMiku
a4b695f8ef indicator 2019-08-20 10:55:21 +08:00
ScorpioMiku
b3d47c53e2 heart rate 2019-08-20 09:52:38 +08:00
LitterDryFish
40d0fb3fbb 绑定测试 2019-08-19 21:40:40 +08:00
LitterDryFish
5d37503439 更新说明 2019-08-19 20:43:41 +08:00
LitterDryFish
2bdfd643b1 修改z-stack协议栈基础代码 2019-08-19 18:48:35 +08:00
LitterDryFish
5068d7e8ee 添加z-stack协议栈基础代码 2019-08-19 18:41:27 +08:00
LitterDryFish
709985b5dc 添加z-stack协议栈解决方案 2019-08-19 18:36:13 +08:00