调整闹钟提醒、睡眠时间以及其他功能调整

r17171709 · Jan 5, 2019 · e25ef2b · e25ef2b
1 parent 46c311f
commit e25ef2b
Show file tree

Hide file tree

Showing 3 changed files with 212 additions and 96 deletions.
diff --git a/app/src/main/java/com/renyu/androidblelibrary/activity/Main2Activity.java b/app/src/main/java/com/renyu/androidblelibrary/activity/Main2Activity.java
@@ -58,6 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
         models.add("读取心率");
         models.add("睡眠时间");
         models.add("设置用户信息");
+        models.add("设置久坐提醒模式");
         models.add("读取久坐提醒配置信息");
         models.add("读取闹钟信息");
         models.add("事件提醒添加");

diff --git a/app/src/main/java/com/renyu/androidblelibrary/adapter/Main2Adapter.java b/app/src/main/java/com/renyu/androidblelibrary/adapter/Main2Adapter.java
@@ -61,31 +61,33 @@ public void onClick(View view) {
                 } else if (holder.getLayoutPosition() == 9) {
                     BLEService2.writeUserInfo(holder.itemView.getContext(), 1, 180, 85, 10000);
                 } else if (holder.getLayoutPosition() == 10) {
-                    BLEService2.sedentaryReminder(holder.itemView.getContext());
+                    BLEService2.settingSedentaryReminder(holder.itemView.getContext(), 1);
                 } else if (holder.getLayoutPosition() == 11) {
-                    BLEService2.allAlarmInfo(holder.itemView.getContext());
+                    BLEService2.sedentaryReminder(holder.itemView.getContext());
                 } else if (holder.getLayoutPosition() == 12) {
-                    BLEService2.eventDelete(holder.itemView.getContext(), 9);
+                    BLEService2.allAlarmInfo(holder.itemView.getContext());
+                } else if (holder.getLayoutPosition() == 13) {
+                    BLEService2.eventDelete(holder.itemView.getContext(), 10);
 //                    BLEService2.eventAdd(holder.itemView.getContext(), 3, System.currentTimeMillis(), 0x81, "Hello你好你叫什么名字你住哪里你今年多大");
 //                    BLEService2.eventAdd(holder.itemView.getContext(), 4, System.currentTimeMillis(), 0x82, "Hello你好你叫什么名字你住哪里你今年多大");
 //                    BLEService2.eventAdd(holder.itemView.getContext(), 5, System.currentTimeMillis(), 0x01, "Hello你好你叫什么名字你住哪里你今年多大");
 //                    BLEService2.eventAdd(holder.itemView.getContext(), 6, System.currentTimeMillis(), 0x02, "Hello你好你叫什么名字你住哪里你今年多大");
 //                    BLEService2.eventAdd(holder.itemView.getContext(), 7, System.currentTimeMillis(), 0x81 | 0x82 | 0x84 | 0x88 | 0x90 | 0xA0 | 0xC0, "Hello你好你叫什么名字你住哪里你今年多大");
 //                    BLEService2.eventAdd(holder.itemView.getContext(), 8, System.currentTimeMillis(), 0xA0 | 0xC0, "Hello你好你叫什么名字你住哪里你今年多大");
-                    BLEService2.eventAdd(holder.itemView.getContext(), 9, System.currentTimeMillis(), 0x81 | 0x82, "Hello你好你叫什么名字你住哪里你今年多大");
-                } else if (holder.getLayoutPosition() == 13) {
-                    BLEService2.alarmClockAdd(holder.itemView.getContext(), 76, System.currentTimeMillis(), 0x00, 0);
+                    BLEService2.eventAdd(holder.itemView.getContext(), 10, true, System.currentTimeMillis(), 0x81 | 0x84, "Hello你好你叫什么名字你住哪里你今年多大");
                 } else if (holder.getLayoutPosition() == 14) {
-                    BLEService2.sedentaryByAlarmAdd(holder.itemView.getContext(), 51, System.currentTimeMillis(), 0x00);
+                    BLEService2.alarmClockAdd(holder.itemView.getContext(), 76, true, System.currentTimeMillis(), 0x00, true);
                 } else if (holder.getLayoutPosition() == 15) {
-                    BLEService2.noDisturb(holder.itemView.getContext(), 1, 0, 22, 0, 6);
+                    BLEService2.sedentaryByAlarmAdd(holder.itemView.getContext(), 51, true, System.currentTimeMillis(), 0x00);
                 } else if (holder.getLayoutPosition() == 16) {
-                    BLEService2.readAlarm(holder.itemView.getContext(), 9);
+                    BLEService2.noDisturb(holder.itemView.getContext(), 1, 0, 22, 0, 6);
                 } else if (holder.getLayoutPosition() == 17) {
-                    BLEService2.sportsRun(holder.itemView.getContext());
+                    BLEService2.readAlarm(holder.itemView.getContext(), 9);
                 } else if (holder.getLayoutPosition() == 18) {
-                    BLEService2.sportsFastWalk(holder.itemView.getContext());
+                    BLEService2.sportsRun(holder.itemView.getContext());
                 } else if (holder.getLayoutPosition() == 19) {
+                    BLEService2.sportsFastWalk(holder.itemView.getContext());
+                } else if (holder.getLayoutPosition() == 20) {
                     BLEService2.sportsSwim(holder.itemView.getContext());
                 }
             }