Skip to content

B
BluToysApplication
Commit 4d8f4ea6 by 韩飞虎
Options

搞定时间联动

parent d935d3c2
Showing with 278 additions and 174 deletions
app/src/main/java/com/example/blu/toys/activity/PlayActivity.java
...@@ -76,7 +76,9 @@ public class PlayActivity extends BaseActivity { ...@@ -76,7 +76,9 @@ public class PlayActivity extends BaseActivity {
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
super.handleMessage(msg); super.handleMessage(msg);
LogUtils.e("定时器在走111",msg.what,mHour,mMin,mSecond); LogUtils.e("定时器在走111",msg.what,mHour,mMin,mSecond);
if((mHour+mMin+mSecond)<1){
suspendAndContinue=0;
}
if(suspendAndContinue==1) { if(suspendAndContinue==1) {
computeTime(); computeTime();
String mHourStr = addZeroForNum(mHour + "", 2); String mHourStr = addZeroForNum(mHour + "", 2);
...@@ -183,7 +185,9 @@ public class PlayActivity extends BaseActivity { ...@@ -183,7 +185,9 @@ public class PlayActivity extends BaseActivity {
@OnClick(R.id.back_but) @OnClick(R.id.back_but)
public void onViewClicked() { public void onViewClicked() {
timerManager.cancelTimer(); timerManager.cancelTimer();
finish(); Intent intent = new Intent(PlayActivity.this, SetTimeActivity.class);
startActivity(intent);
} }
@OnClick({R.id.cancel_but, R.id.pause_but, R.id.resume_but}) @OnClick({R.id.cancel_but, R.id.pause_but, R.id.resume_but})
......
app/src/main/java/com/example/blu/toys/activity/SelectDeviceActivity.java
package com.example.blu.toys.activity; package com.example.blu.toys.activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -85,6 +86,8 @@ public class SelectDeviceActivity extends BaseActivity { ...@@ -85,6 +86,8 @@ public class SelectDeviceActivity extends BaseActivity {
@OnClick(R.id.back_but) @OnClick(R.id.back_but)
public void onViewClicked() { public void onViewClicked() {
finish(); Intent intent = new Intent(SelectDeviceActivity.this, AddDeviceActivity.class);
startActivity(intent);
} }
} }
\ No newline at end of file
app/src/main/java/com/example/blu/toys/activity/SelectTimerActivity.java
...@@ -92,6 +92,8 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -92,6 +92,8 @@ public class SelectTimerActivity extends BaseActivity {
@OnClick(R.id.back_but) @OnClick(R.id.back_but)
public void onViewClicked() { public void onViewClicked() {
finish(); Intent intent = new Intent(SelectTimerActivity.this, SelectDeviceActivity.class);
startActivity(intent);
} }
} }
\ No newline at end of file
app/src/main/java/com/example/blu/toys/activity/SetTimeActivity.java
...@@ -17,6 +17,8 @@ import com.example.blu.toys.ble.BlePlay; ...@@ -17,6 +17,8 @@ import com.example.blu.toys.ble.BlePlay;
import com.example.blu.toys.ble.agreement.TrafficLightBean; import com.example.blu.toys.ble.agreement.TrafficLightBean;
import com.example.blu.toys.utils.LocalDateUtils; import com.example.blu.toys.utils.LocalDateUtils;
import com.example.blu.toys.utils.SpUtils; import com.example.blu.toys.utils.SpUtils;
import com.example.blu.toys.utils.TimeBean;
import com.example.blu.toys.utils.TimeUtil;
import com.example.blu.toys.view.TypefaceTextView; import com.example.blu.toys.view.TypefaceTextView;
import com.example.blu.toys.view.WheelView; import com.example.blu.toys.view.WheelView;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
...@@ -34,11 +36,11 @@ import butterknife.OnClick; ...@@ -34,11 +36,11 @@ import butterknife.OnClick;
public class SetTimeActivity extends BaseActivity { public class SetTimeActivity extends BaseActivity {
@BindView(R.id.wheel_hour) @BindView(R.id.wheel_hour) //时
WheelView wheelHour; WheelView wheelHour;
@BindView(R.id.wheel_minute) @BindView(R.id.wheel_minute)//分
WheelView wheelMinute; WheelView wheelMinute;
@BindView(R.id.wheel_second) @BindView(R.id.wheel_second)//秒
WheelView wheelSecond; WheelView wheelSecond;
// @BindView(R.id.wheel_am_pm) // @BindView(R.id.wheel_am_pm)
// WheelView wheelAmPm; // WheelView wheelAmPm;
...@@ -80,164 +82,215 @@ public class SetTimeActivity extends BaseActivity { ...@@ -80,164 +82,215 @@ public class SetTimeActivity extends BaseActivity {
return R.layout.activity_set_time; return R.layout.activity_set_time;
} }
private TimeBean getBottomTime(){
TimeBean timeBean=new TimeBean();
//设置底部的时间
private void setDwTime() {
Date time = new Date(); String hour = wheelHour_dw.getSeletedItem();
int currHour = LocalDateUtils.getHour(time); String minute = wheelMinute_dw.getSeletedItem();
int currMinute = LocalDateUtils.getSecond(time); String second = wheelSecond_dw.getSeletedItem();
int currSecond = LocalDateUtils.getMinute(time); timeBean.setmSecond(Integer.valueOf(second));
timeBean.setmMin(Integer.valueOf(minute));
timeBean.setmHour(Integer.valueOf(hour));
String hour = wheelHour.getSeletedItem();
String minute = wheelMinute.getSeletedItem();
String second = wheelSecond.getSeletedItem();
timeBean.toTime();
int selectHourTime; //设置上面的时间
int selectMinTime;
int selectSecTime;
String selectHour_dw; TimeBean showTime= TimeUtil.getTimeBeanBySecond(Long.valueOf(timeBean.getTotalSecond()+getNowTotalSecond()));
String selectMin_dw; showTime.toTime();
String selectSec_dw; //设置上面的时间
wheelHour.setSeletion(showTime.getmHour());
wheelMinute.setSeletion(showTime.getmMin());
wheelSecond.setSeletion(showTime.getmSecond());
//小时
if (hour.startsWith("0")) {
hour = hour.substring(1);
}
selectHourTime = Integer.parseInt(hour);
int dowHour = selectHourTime - currHour;
if (dowHour < 10) { return timeBean;
selectHour_dw = "0" + dowHour;
} else {
selectHour_dw = String.valueOf(dowHour);
} }
wheelHour_dw.setSeletion(selectTime.indexOf(selectHour_dw));
public int getNowTotalSecond(){
Calendar cal = Calendar.getInstance();
//分钟 int hour1=cal.get(Calendar.HOUR_OF_DAY);//小时
if (minute.startsWith("0")) { int minute2=cal.get(Calendar.MINUTE);//分
minute = minute.substring(1); int second3=cal.get(Calendar.SECOND);//秒
return hour1*3600+minute2*60+second3;
} }
selectMinTime = Integer.parseInt(minute);
int dowMin = selectMinTime - currMinute;
if (dowMin < 10) {
selectMin_dw = "0" + dowMin;
} else {
selectMin_dw = String.valueOf(dowMin);
}
wheelMinute_dw.setSeletion(sixList.indexOf(selectMin_dw));
//秒
if (second.startsWith("0")) {
second = second.substring(1);
}
selectSecTime = Integer.parseInt(second);
int dowSec = selectSecTime - currSecond;
if (dowSec < 10) {
selectSec_dw = "0" + dowSec;
} else {
selectSec_dw = String.valueOf(dowSec);
}
wheelSecond_dw.setSeletion(sixList.indexOf(selectSec_dw));
} private TimeBean getTopTime(){
TimeBean timeBean=new TimeBean();
//设置顶部的时间
private void setUpTime() {
String hour = wheelHour.getSeletedItem(); String hour = wheelHour.getSeletedItem();
String minute = wheelMinute.getSeletedItem(); String minute = wheelMinute.getSeletedItem();
String second = wheelSecond.getSeletedItem(); String second = wheelSecond.getSeletedItem();
timeBean.setmSecond(Integer.valueOf(second));
String dwHour = wheelHour_dw.getSeletedItem(); timeBean.setmMin(Integer.valueOf(minute));
String dwMinute = wheelMinute_dw.getSeletedItem(); timeBean.setmHour(Integer.valueOf(hour));
String dwSecond = wheelSecond_dw.getSeletedItem();
timeBean.toTime();
int selectHourTime; return timeBean;
int selectMinTime; }
int selectSecTime;
int dwHourTime; // //设置底部的时间
int dwMinTime; // private void setDwTime() {
int dwSecTime; //
// Date time = new Date();
// int currHour = LocalDateUtils.getHour(time);
if (hour.startsWith("0")) { // int currMinute = LocalDateUtils.getSecond(time);
hour = hour.substring(1); // int currSecond = LocalDateUtils.getMinute(time);
} //
selectHourTime = Integer.parseInt(hour); //
// String hour = wheelHour.getSeletedItem();
if (dwHour.startsWith("0")) { // String minute = wheelMinute.getSeletedItem();
dwHour = dwHour.substring(1); // String second = wheelSecond.getSeletedItem();
} //
dwHourTime = Integer.parseInt(dwHour); //
// int selectHourTime;
selectHourTime = selectHourTime + dwHourTime; // int selectMinTime;
if (selectHourTime < 10) { // int selectSecTime;
hour = "0" + selectHourTime; //
} else { // String selectHour_dw;
hour = String.valueOf(selectHourTime); // String selectMin_dw;
} // String selectSec_dw;
//
wheelHour.setSeletion(hourList.indexOf(hour)); // //小时
// if (hour.startsWith("0")) {
// hour = hour.substring(1);
//分钟 // }
if (minute.startsWith("0")) { // selectHourTime = Integer.parseInt(hour);
minute = minute.substring(1); //
} // int dowHour = selectHourTime - currHour;
selectMinTime = Integer.parseInt(minute); //
// if (dowHour < 10) {
if (dwMinute.startsWith("0")) { // selectHour_dw = "0" + dowHour;
dwMinute = dwMinute.substring(1); // } else {
} // selectHour_dw = String.valueOf(dowHour);
dwMinTime = Integer.parseInt(dwMinute); // }
// wheelHour_dw.setSeletion(selectTime.indexOf(selectHour_dw));
//
//
// //分钟
// if (minute.startsWith("0")) {
// minute = minute.substring(1);
// }
// selectMinTime = Integer.parseInt(minute);
//
// int dowMin = selectMinTime - currMinute;
// if (dowMin < 10) {
// selectMin_dw = "0" + dowMin;
// } else {
// selectMin_dw = String.valueOf(dowMin);
// }
//
// wheelMinute_dw.setSeletion(sixList.indexOf(selectMin_dw));
//
//
// //秒
// if (second.startsWith("0")) {
// second = second.substring(1);
// }
// selectSecTime = Integer.parseInt(second);
//
// int dowSec = selectSecTime - currSecond;
// if (dowSec < 10) {
// selectSec_dw = "0" + dowSec;
// } else {
// selectSec_dw = String.valueOf(dowSec);
// }
//
// wheelSecond_dw.setSeletion(sixList.indexOf(selectSec_dw));
//
// }
selectMinTime = selectMinTime + dwMinTime; //设置顶部的时间
if (selectMinTime < 10) { // private void setUpTime() {
minute = "0" + selectMinTime; // String hour = wheelHour.getSeletedItem();
} else { // String minute = wheelMinute.getSeletedItem();
minute = String.valueOf(selectMinTime); // String second = wheelSecond.getSeletedItem();
} //
// String dwHour = wheelHour_dw.getSeletedItem();
wheelMinute.setSeletion(sixList.indexOf(minute)); // String dwMinute = wheelMinute_dw.getSeletedItem();
// String dwSecond = wheelSecond_dw.getSeletedItem();
//
// int selectHourTime;
//秒 // int selectMinTime;
if (second.startsWith("0")) { // int selectSecTime;
second = second.substring(1); //
} // int dwHourTime;
selectSecTime = Integer.parseInt(second); // int dwMinTime;
// int dwSecTime;
if (dwSecond.startsWith("0")) { //
dwSecond = dwSecond.substring(1); //
} // if (hour.startsWith("0")) {
dwSecTime = Integer.parseInt(dwSecond); // hour = hour.substring(1);
// }
// selectHourTime = Integer.parseInt(hour);
selectSecTime = selectSecTime + dwSecTime; //
if (selectSecTime < 10) { // if (dwHour.startsWith("0")) {
second = "0" + selectSecTime; // dwHour = dwHour.substring(1);
} else { // }
second = String.valueOf(selectSecTime); // dwHourTime = Integer.parseInt(dwHour);
} //
// selectHourTime = selectHourTime + dwHourTime;
wheelSecond.setSeletion(sixList.indexOf(second)); // if (selectHourTime < 10) {
// hour = "0" + selectHourTime;
// } else {
} // hour = String.valueOf(selectHourTime);
// }
//
// wheelHour.setSeletion(hourList.indexOf(hour));
//
//
// //分钟
// if (minute.startsWith("0")) {
// minute = minute.substring(1);
// }
// selectMinTime = Integer.parseInt(minute);
//
// if (dwMinute.startsWith("0")) {
// dwMinute = dwMinute.substring(1);
// }
// dwMinTime = Integer.parseInt(dwMinute);
//
//
// selectMinTime = selectMinTime + dwMinTime;
// if (selectMinTime < 10) {
// minute = "0" + selectMinTime;
// } else {
// minute = String.valueOf(selectMinTime);
// }
//
// wheelMinute.setSeletion(sixList.indexOf(minute));
//
//
//
// //秒
// if (second.startsWith("0")) {
// second = second.substring(1);
// }
// selectSecTime = Integer.parseInt(second);
//
// if (dwSecond.startsWith("0")) {
// dwSecond = dwSecond.substring(1);
// }
// dwSecTime = Integer.parseInt(dwSecond);
//
//
// selectSecTime = selectSecTime + dwSecTime;
// if (selectSecTime < 10) {
// second = "0" + selectSecTime;
// } else {
// second = String.valueOf(selectSecTime);
// }
//
// wheelSecond.setSeletion(sixList.indexOf(second));
//
//
// }
@Override @Override
public void init(Bundle savedInstanceState) { public void init(Bundle savedInstanceState) {
...@@ -245,14 +298,15 @@ public class SetTimeActivity extends BaseActivity { ...@@ -245,14 +298,15 @@ public class SetTimeActivity extends BaseActivity {
wheelHour.setOnWheelViewListener(new WheelView.OnWheelViewListener() { wheelHour.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
if (StringUtils.isEmpty(item)) { // if (StringUtils.isEmpty(item)) {
//不能动 // //不能动
int indexHour = hourList.indexOf(selectHour); // int indexHour = hourList.indexOf(selectHour);
wheelHour.setSeletion(indexHour); // wheelHour.setSeletion(indexHour);
return; // return;
} // }
setDwTime(); // setDwTime();
LogUtils.e("滚动了6");
getTopTime();
} }
}); });
...@@ -260,12 +314,14 @@ public class SetTimeActivity extends BaseActivity { ...@@ -260,12 +314,14 @@ public class SetTimeActivity extends BaseActivity {
wheelMinute.setOnWheelViewListener(new WheelView.OnWheelViewListener() { wheelMinute.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
if (StringUtils.isEmpty(item)) { // if (StringUtils.isEmpty(item)) {
int indexMinute = sixList.indexOf(selectMin); // int indexMinute = sixList.indexOf(selectMin);
wheelMinute.setSeletion(indexMinute); // wheelMinute.setSeletion(indexMinute);
return; // return;
} // }
setDwTime(); LogUtils.e("滚动了5");
// setDwTime();
getTopTime();
} }
}); });
...@@ -275,13 +331,14 @@ public class SetTimeActivity extends BaseActivity { ...@@ -275,13 +331,14 @@ public class SetTimeActivity extends BaseActivity {
wheelSecond.setOnWheelViewListener(new WheelView.OnWheelViewListener() { wheelSecond.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
if (StringUtils.isEmpty(item)) { // if (StringUtils.isEmpty(item)) {
int indexSecond = sixList.indexOf(selectSec); // int indexSecond = sixList.indexOf(selectSec);
wheelSecond.setSeletion(indexSecond); // wheelSecond.setSeletion(indexSecond);
return; // return;
} // }
LogUtils.e("滚动了4");
setDwTime(); // setDwTime();
getTopTime();
} }
}); });
...@@ -290,7 +347,9 @@ public class SetTimeActivity extends BaseActivity { ...@@ -290,7 +347,9 @@ public class SetTimeActivity extends BaseActivity {
wheelHour_dw.setOnWheelViewListener(new WheelView.OnWheelViewListener() { wheelHour_dw.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
setUpTime(); // setUpTime();
LogUtils.e("滚动了3");
getBottomTime();
} }
}); });
...@@ -298,7 +357,9 @@ public class SetTimeActivity extends BaseActivity { ...@@ -298,7 +357,9 @@ public class SetTimeActivity extends BaseActivity {
wheelMinute_dw.setOnWheelViewListener(new WheelView.OnWheelViewListener() { wheelMinute_dw.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
setUpTime(); // setUpTime();
LogUtils.e("滚动了2");
getBottomTime();
} }
}); });
...@@ -306,7 +367,9 @@ public class SetTimeActivity extends BaseActivity { ...@@ -306,7 +367,9 @@ public class SetTimeActivity extends BaseActivity {
wheelSecond_dw.setOnWheelViewListener(new WheelView.OnWheelViewListener() { wheelSecond_dw.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
setUpTime(); LogUtils.e("滚动了1");
// setUpTime();
getBottomTime();
} }
}); });
...@@ -340,7 +403,7 @@ public class SetTimeActivity extends BaseActivity { ...@@ -340,7 +403,7 @@ public class SetTimeActivity extends BaseActivity {
} }
} }
for (int i = 1; i <= 16; i++) { for (int i = 0; i <= 15; i++) {
if (i < 10) { if (i < 10) {
selectTime.add("0" + i); selectTime.add("0" + i);
} else { } else {
...@@ -412,7 +475,9 @@ public class SetTimeActivity extends BaseActivity { ...@@ -412,7 +475,9 @@ public class SetTimeActivity extends BaseActivity {
switch (view.getId()) { switch (view.getId()) {
case R.id.back_but: case R.id.back_but:
BlePlay.getInstance().closeBle(); BlePlay.getInstance().closeBle();
finish(); Intent intent = new Intent(SetTimeActivity.this, SelectDeviceActivity.class);
startActivity(intent);
break; break;
case R.id.start_but: case R.id.start_but:
boolean bleOpen = BlePlay.getInstance().isBleOpen(); boolean bleOpen = BlePlay.getInstance().isBleOpen();
...@@ -423,6 +488,13 @@ public class SetTimeActivity extends BaseActivity { ...@@ -423,6 +488,13 @@ public class SetTimeActivity extends BaseActivity {
String selectHour_dw = wheelHour_dw.getSeletedItem(); String selectHour_dw = wheelHour_dw.getSeletedItem();
String selectMin_dw = wheelMinute_dw.getSeletedItem(); String selectMin_dw = wheelMinute_dw.getSeletedItem();
String selectSec_dw = wheelSecond_dw.getSeletedItem(); String selectSec_dw = wheelSecond_dw.getSeletedItem();
int time = Integer.valueOf(selectHour_dw) * 3600 +Integer.valueOf( selectMin_dw) * 60 + Integer.valueOf( selectSec_dw);
if(time==0){
ToastUtils.show("请选择时间");
return;
}
LogUtils.e("滚动了");
if (TextUtils.isEmpty(selectHour_dw)) { if (TextUtils.isEmpty(selectHour_dw)) {
hour = 0; hour = 0;
...@@ -447,7 +519,7 @@ public class SetTimeActivity extends BaseActivity { ...@@ -447,7 +519,7 @@ public class SetTimeActivity extends BaseActivity {
//转换成秒 0000000000000000 //转换成秒 0000000000000000
int time = hour * 3600 + min * 60 + second;
SpUtils spUtils = SpUtils.getSpUtils(SetTimeActivity.this); SpUtils spUtils = SpUtils.getSpUtils(SetTimeActivity.this);
int close = spUtils.getSPValue("close", 1); int close = spUtils.getSPValue("close", 1);
int open = spUtils.getSPValue("open", 10); int open = spUtils.getSPValue("open", 10);
......
app/src/main/java/com/example/blu/toys/ble/BlePlay.java
...@@ -91,7 +91,7 @@ public class BlePlay { ...@@ -91,7 +91,7 @@ public class BlePlay {
public void scanBle() { public void scanBle() {
BleScanRuleConfig scanRuleConfig = new BleScanRuleConfig.Builder().setAutoConnect(false) BleScanRuleConfig scanRuleConfig = new BleScanRuleConfig.Builder().setAutoConnect(false)
//.setServiceUuids(serviceIds) //.setServiceUuids(serviceIds)
.setScanTimeOut(1000).build(); .setScanTimeOut(5000).build();
BleManager.getInstance().initScanRule(scanRuleConfig); BleManager.getInstance().initScanRule(scanRuleConfig);
BleManager.getInstance().scan(new BleScanCallback() { BleManager.getInstance().scan(new BleScanCallback() {
@Override @Override
......
app/src/main/java/com/example/blu/toys/utils/TimeBean.java
package com.example.blu.toys.utils; package com.example.blu.toys.utils;
import com.blankj.utilcode.util.LogUtils;
public class TimeBean { public class TimeBean {
private int mHour; private int mHour;
private int mMin; private int mMin;
private int mSecond; private int mSecond;
public int getTotalMillisecond(){
return (mHour*3600+mMin*60+mSecond)*1000;
}
public int getTotalSecond(){
return (mHour*3600+mMin*60+mSecond);
}
public void toTime(){
LogUtils.e(mHour+":"+mMin+":"+mSecond);
}
private String[] tims; private String[] tims;
public String[] getTims() { public String[] getTims() {
......
app/src/main/java/com/example/blu/toys/utils/TimeUtil.java
...@@ -36,13 +36,19 @@ public class TimeUtil { ...@@ -36,13 +36,19 @@ public class TimeUtil {
timeBean.setTims(tims); timeBean.setTims(tims);
timeBean.setmHour(Integer.valueOf(tims[0].trim())); timeBean.setmHour(Integer.valueOf(tims[0].trim()));
timeBean.setmMin(Integer.valueOf(tims[1].trim())); timeBean.setmMin(Integer.valueOf(tims[1].trim()));
try {
timeBean.setmSecond(Integer.valueOf(tims[2].split(",")[0].trim())); timeBean.setmSecond(Integer.valueOf(tims[2].split(",")[0].trim()));
}catch (Exception e){
e.printStackTrace();
}
return timeBean; return timeBean;
} }
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(Integer.valueOf("00")); System.out.println(Integer.valueOf("00"));
TimeBean timeBean= getTimeBeanBySecond(60l); TimeBean timeBean= getTimeBeanBySecond(0l);
System.out.printf( timeBean.getmHour()+":"+ timeBean.getmMin()+":"+timeBean.getmSecond()); System.out.printf( timeBean.getmHour()+":"+ timeBean.getmMin()+":"+timeBean.getmSecond());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment