Commit Graph

56 Commits

Author SHA1 Message Date
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
LitterDryFish
5d6abf037c 添加z-stack协议栈解决方案 2019-08-19 18:34:02 +08:00
LitterDryFish
1d2643cf44 添加z-stack协议栈解决方案 2019-08-19 18:31:08 +08:00
LitterDryFish
8e397a32a2 添加z-stack协议栈解决方案 2019-08-19 18:29:07 +08:00
LitterDryFish
15da5fad3e 添加RFID的解决方案 2019-08-19 18:12:07 +08:00
LitterDryFish
553a84360a 增加硬件要求 2019-08-19 18:06:57 +08:00
LitterDryFish
d45885d880 增加app功能 2019-08-19 17:58:35 +08:00
LitterDryFish
b02aa7ec42 修改app功能 2019-08-19 17:56:53 +08:00
LitterDryFish
9a6e5dab71 增加app功能 2019-08-19 17:55:24 +08:00
ScorpioMiku
e2824813d8 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-19 17:46:17 +08:00
ScorpioMiku
4bdcc7ba11 heart chart 2019-08-19 17:46:05 +08:00
jiangyuwei666
396bc9cd57 update README 2019-08-19 16:40:20 +08:00
jiangyuwei666
2c5876b055 update README 2019-08-19 16:32:43 +08:00
jiangyuwei666
718d7316a0 update conf 2019-08-19 16:31:30 +08:00
jiangyuwei666
355dc55751 update readme 2019-08-19 13:09:43 +08:00
jiangyuwei666
16d5370f9f create project 2019-08-19 11:22:33 +08:00
ScorpioMiku
2dbf84492c Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-19 09:44:06 +08:00
ScorpioMiku
85cdb0244a moon 2019-08-19 09:43:56 +08:00
vickihe
50e48cb1d0 登录demo 2019-08-18 17:46:26 +08:00
ScorpioMiku
52e4bf0b7d base fragment 2019-08-18 10:23:53 +08:00
ScorpioMiku
e639ef9e52 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-18 09:55:19 +08:00
ScorpioMiku
d8c69994a5 old main 2019-08-18 09:55:03 +08:00
ScorpioMiku
02b1ae0dd3 butter 2019-08-17 10:02:54 +08:00
jiangyuwei666
dd89685775 delete old 2019-08-16 16:32:27 +08:00
jiangyuwei666
ef821df9d2 update code 2019-08-15 21:51:10 +08:00
ScorpioMiku
1817f7a414 init 2019-08-15 09:17:40 +08:00