Commit c8c58287 by hanfeihu

测试吧

parent 5bb8e26e
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>
......
...@@ -62,6 +62,13 @@ public class BleDevice implements Parcelable { ...@@ -62,6 +62,13 @@ public class BleDevice implements Parcelable {
return null; return null;
} }
public String getShowName() {
if (mDevice != null)
return mDevice.getName().replace("Traffic","Timer");
return null;
}
public String getMac() { public String getMac() {
if (mDevice != null) if (mDevice != null)
return mDevice.getAddress(); return mDevice.getAddress();
......
...@@ -25,9 +25,11 @@ import com.example.blu.toys.view.TypefaceTextView; ...@@ -25,9 +25,11 @@ 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;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -94,22 +96,21 @@ public class SetTimeActivity extends BaseActivity { ...@@ -94,22 +96,21 @@ public class SetTimeActivity extends BaseActivity {
String hour = wheelHour_dw.getSeletedItem(); String hour = wheelHour_dw.getSeletedItem();
String minute = wheelMinute_dw.getSeletedItem(); String minute = wheelMinute_dw.getSeletedItem();
String second = wheelSecond_dw.getSeletedItem(); String second = wheelSecond_dw.getSeletedItem();
timeBean.setmSecond(Integer.valueOf(second));
timeBean.setmMin(Integer.valueOf(minute));
timeBean.setmHour(Integer.valueOf(hour));
timeBean.toTime();
//设置上面的时间 Calendar calendar=Calendar.getInstance();
calendar.add(Calendar.HOUR_OF_DAY, Integer.valueOf(hour));
calendar.add(Calendar.MINUTE, Integer.valueOf(minute));
calendar.add(Calendar.SECOND, Integer.valueOf(second));
TimeBean showTime = TimeUtil.getTimeBeanBySecond(Long.valueOf(timeBean.getTotalSecond() + getNowTotalSecond()));
showTime.toTime();
//设置上面的时间
wheelHour.setSeletion(showTime.getmHour());
wheelMinute.setSeletion(showTime.getmMin());
wheelSecond.setSeletion(showTime.getmSecond());
//设置上面的时间
wheelHour.setSeletion(calendar.get(Calendar.HOUR));
wheelMinute.setSeletion(calendar.get(Calendar.MINUTE));
wheelSecond.setSeletion(calendar.get(Calendar.SECOND));
mAmPm.setSeletion(calendar.get(Calendar.AM_PM));
return timeBean; return timeBean;
} }
...@@ -119,32 +120,70 @@ public class SetTimeActivity extends BaseActivity { ...@@ -119,32 +120,70 @@ public class SetTimeActivity extends BaseActivity {
int hour1 = cal.get(Calendar.HOUR_OF_DAY);//小时 int hour1 = cal.get(Calendar.HOUR_OF_DAY);//小时
int minute2 = cal.get(Calendar.MINUTE);//分 int minute2 = cal.get(Calendar.MINUTE);//分
int second3 = cal.get(Calendar.SECOND);//秒 int second3 = cal.get(Calendar.SECOND);//秒
return hour1 * 3600 + minute2 * 60 + second3; return hour1 * 3600 + minute2 * 60 + second3;
} }
private TimeBean getTopTime() { private TimeBean getTopTime() {
//滚动的上面
TimeBean timeBean = new TimeBean(); TimeBean timeBean = new TimeBean();
String hour = wheelHour.getSeletedItem(); String hour = wheelHour.getSeletedItem();
String minute = wheelMinute.getSeletedItem(); String minute = wheelMinute.getSeletedItem();
String second = wheelSecond.getSeletedItem(); String second = wheelSecond.getSeletedItem();
String pm = mAmPm.getSeletedItem();
timeBean.setmSecond(Integer.valueOf(second)); timeBean.setmSecond(Integer.valueOf(second));
timeBean.setmMin(Integer.valueOf(minute)); timeBean.setmMin(Integer.valueOf(minute));
timeBean.setmHour(Integer.valueOf(hour)); timeBean.setmHour(Integer.valueOf(hour));
timeBean.setPm(pm);
timeBean.toTime(); timeBean.toTime();
int nowTotalSecond = getNowTotalSecond();
if (nowTotalSecond > timeBean.getTotalSecond()) {
if (0 > timeBean.getSelectTopTotalSecond24H()) {
wheelHour_dw.setSeletion(15); wheelHour_dw.setSeletion(15);
wheelMinute_dw.setSeletion(59); wheelMinute_dw.setSeletion(59);
wheelSecond_dw.setSeletion(59); wheelSecond_dw.setSeletion(59);
return timeBean; return timeBean;
} }
int selectTotalSecond = timeBean.getTotalSecond();
TimeBean showTime = TimeUtil.getTimeBeanBySecond(Long.valueOf(selectTotalSecond - nowTotalSecond)); TimeBean showTime=null;
try {
Date date=new Date();
//转换成时间格式12小时制
SimpleDateFormat df_12=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss a", Locale.ENGLISH);
//转换成时间格式24小时制
SimpleDateFormat yyyMMdd=new SimpleDateFormat("yyyy-MM-dd");
Date date1= df_12.parse(yyyMMdd.format(date)+" "+hour+":"+minute+":"+second+" "+pm);
System.out.println("日期:"+yyyMMdd.format(date));
System.out.println("12小时制时间::"+df_12.format(date));
showTime= TimeUtil.getTimeBeanBySecond((date1.getTime()-new Date().getTime())/1000);
System.out.println(showTime.getmHour());
System.out.println(showTime.getmMin());
System.out.println(showTime.getmSecond());
}catch (Exception e){
e.printStackTrace();
}
//设置下面的时间 //设置下面的时间
showTime.toTime(); showTime.toTime();
//设置上面的时间 //设置下面时间
wheelHour_dw.setSeletion(showTime.getmHour()); wheelHour_dw.setSeletion(showTime.getmHour());
wheelMinute_dw.setSeletion(showTime.getmMin()); wheelMinute_dw.setSeletion(showTime.getmMin());
wheelSecond_dw.setSeletion(showTime.getmSecond()); wheelSecond_dw.setSeletion(showTime.getmSecond());
...@@ -208,6 +247,9 @@ public class SetTimeActivity extends BaseActivity { ...@@ -208,6 +247,9 @@ public class SetTimeActivity extends BaseActivity {
@Override @Override
public void onSelected(int selectedIndex, String item) { public void onSelected(int selectedIndex, String item) {
//选择早上下午 //选择早上下午
LogUtils.e("滚动了00");
getTopTime();
} }
}); });
...@@ -248,70 +290,57 @@ public class SetTimeActivity extends BaseActivity { ...@@ -248,70 +290,57 @@ public class SetTimeActivity extends BaseActivity {
amPmList.add("AM"); amPmList.add("AM");
amPmList.add("PM"); amPmList.add("PM");
Date time = new Date();
int hour = LocalDateUtils.getHour(time);
int minute = LocalDateUtils.getSecond(time);
int second = LocalDateUtils.getMinute(time);
Calendar calendar= Calendar.getInstance();
int hour = calendar.get(Calendar.HOUR);
int minute = calendar.get(Calendar.MINUTE);
int second =calendar.get(Calendar.SECOND);
int pm= calendar.get(Calendar.AM_PM);
hourList.clear(); hourList.clear();
sixList.clear(); sixList.clear();
hourList.add("00");
for (int i = 1; i <= 24; i++) {
if (i < 10) { for (int i = 0; i < 13; i++) {
hourList.add("0" + i); hourList.add(TimeUtil.autoGenericCode(i+"",2));
} else {
hourList.add(String.valueOf(i));
}
}
for (int i = 0; i <= 59; i++) {
if (i < 10) {
sixList.add("0" + i);
} else {
sixList.add(String.valueOf(i));
}
} }
for (int i = 0; i <= 15; i++) { for (int i = 0; i < 60; i++) {
if (i < 10) { sixList.add(TimeUtil.autoGenericCode(i+"",2));
selectTime.add("0" + i);
} else {
selectTime.add(String.valueOf(i));
} }
for (int i = 0; i < 16; i++) {
selectTime.add(TimeUtil.autoGenericCode(i+"",2));
} }
///时//// ///时////
wheelHour.setOffset(3); wheelHour.setOffset(3);
wheelHour.setItems(hourList); wheelHour.setItems(hourList);
if (hour < 10) { selectHour = TimeUtil.autoGenericCode(hour+"",2);
selectHour = "0" + hour;
} else {
selectHour = String.valueOf(hour);
}
int indexHour = hourList.indexOf(selectHour); int indexHour = hourList.indexOf(selectHour);
wheelHour.setSeletion(indexHour); wheelHour.setSeletion(indexHour);
///分//// ///分////
wheelMinute.setOffset(3);// 对话框中当前项上面和下面的项数 wheelMinute.setOffset(3);// 对话框中当前项上面和下面的项数
wheelMinute.setItems(sixList);// 设置数据源 wheelMinute.setItems(sixList);// 设置数据源
if (minute < 10) {
selectMin = "0" + minute; selectMin = TimeUtil.autoGenericCode(minute+"",2);
} else {
selectMin = String.valueOf(minute);
}
int indexMinute = sixList.indexOf(selectMin); int indexMinute = sixList.indexOf(selectMin);
wheelMinute.setSeletion(indexMinute);// 默认选中第三项 wheelMinute.setSeletion(indexMinute);// 默认选中第三项
///秒//// ///秒////
wheelSecond.setOffset(3); wheelSecond.setOffset(3);
wheelSecond.setItems(sixList);// 设置数据源 wheelSecond.setItems(sixList);// 设置数据源
if (second < 10) { selectSec = TimeUtil.autoGenericCode(second+"",2);
selectSec = "0" + second;
} else {
selectSec = String.valueOf(second);
}
int indexSecond = sixList.indexOf(selectSec); int indexSecond = sixList.indexOf(selectSec);
wheelSecond.setSeletion(indexSecond); wheelSecond.setSeletion(indexSecond);
...@@ -319,7 +348,7 @@ public class SetTimeActivity extends BaseActivity { ...@@ -319,7 +348,7 @@ public class SetTimeActivity extends BaseActivity {
//amPM //amPM
mAmPm.setOffset(1); mAmPm.setOffset(1);
mAmPm.setItems(amPmList); mAmPm.setItems(amPmList);
mAmPm.setSeletion(pm);
/////////下//////// /////////下////////
///时//// ///时////
......
...@@ -23,7 +23,7 @@ public class BleDeviceAdapter extends BaseQuickAdapter<BleDevice, BaseViewHolder ...@@ -23,7 +23,7 @@ public class BleDeviceAdapter extends BaseQuickAdapter<BleDevice, BaseViewHolder
protected void convert(BaseViewHolder helper, BleDevice item) { protected void convert(BaseViewHolder helper, BleDevice item) {
String deviceName = item.getName(); String deviceName = item.getName();
if ((!TextUtils.isEmpty(deviceName) && deviceName.contains("Traffic"))||!TextUtils.isEmpty(deviceName) && deviceName.contains("blector")) { if ((!TextUtils.isEmpty(deviceName) && deviceName.contains("Traffic"))||!TextUtils.isEmpty(deviceName) && deviceName.contains("blector")) {
helper.setText(R.id.dv_name, item.getName() + ""); helper.setText(R.id.dv_name, item.getShowName() + "");
} }
} }
} }
\ No newline at end of file
...@@ -2,11 +2,25 @@ package com.example.blu.toys.utils; ...@@ -2,11 +2,25 @@ package com.example.blu.toys.utils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
public class TimeBean { public class TimeBean {
private int mHour; private int mHour;
private int mMin; private int mMin;
private int mSecond; private int mSecond;
private String pm;
public String getPm() {
return pm;
}
public void setPm(String pm) {
this.pm = pm;
}
public int getTotalMillisecond(){ public int getTotalMillisecond(){
return (mHour*3600+mMin*60+mSecond)*1000; return (mHour*3600+mMin*60+mSecond)*1000;
} }
...@@ -17,8 +31,28 @@ public class TimeBean { ...@@ -17,8 +31,28 @@ public class TimeBean {
} }
/**
* 将选择的时间转换为date 求算出与当前时间的总秒差
* @return
*/
public int getSelectTopTotalSecond24H(){
try {
SimpleDateFormat df_12=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss a", Locale.ENGLISH);
SimpleDateFormat yyyMMdd=new SimpleDateFormat("yyyy-MM-dd");
Date date1= df_12.parse(yyyMMdd.format(new Date())+" "+mHour+":"+mHour+":"+mSecond+" "+pm);
return Integer.valueOf(((date1.getTime()-new Date().getTime())/1000)+"");
}catch (Exception e){
e.printStackTrace();
}
return 0;
}
public void toTime(){ public void toTime(){
LogUtils.e(mHour+":"+mMin+":"+mSecond); LogUtils.e(mHour+":"+mMin+":"+mSecond+":"+pm);
} }
private String[] tims; private String[] tims;
......
package com.example.blu.toys.utils; package com.example.blu.toys.utils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Locale;
public class TimeUtil { public class TimeUtil {
...@@ -27,6 +29,28 @@ public class TimeUtil { ...@@ -27,6 +29,28 @@ public class TimeUtil {
return strHour+":"+strMinute + " : " + strSecond+","+strMilliSecond ; return strHour+":"+strMinute + " : " + strSecond+","+strMilliSecond ;
} }
/**
* 不够位数的在前面补0,保留num的长度位数字
* @param str
* @return
*/
public static String autoGenericCode(String str, int strLength) {
int strLen = str.length();
StringBuffer sb = null;
while (strLen < strLength) {
sb = new StringBuffer();
sb.append("0").append(str);// 左补0
// sb.append(str).append("0");//右补0
str = sb.toString();
strLen = str.length();
}
return str;
}
public static TimeBean getTimeBeanBySecond(Long second){ public static TimeBean getTimeBeanBySecond(Long second){
String time= formatTime(second*1000); String time= formatTime(second*1000);
TimeBean timeBean=new TimeBean(); TimeBean timeBean=new TimeBean();
...@@ -47,9 +71,30 @@ public class TimeUtil { ...@@ -47,9 +71,30 @@ public class TimeUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(Integer.valueOf("00"));
TimeBean timeBean= getTimeBeanBySecond(0l); try {
System.out.printf( timeBean.getmHour()+":"+ timeBean.getmMin()+":"+timeBean.getmSecond());
Date date=new Date();
//转换成时间格式12小时制
SimpleDateFormat df_12=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date1= df_12.parse("2021-04-10 12:12:12");
Calendar calendar= Calendar.getInstance();
calendar.setTime(date1);
int hour = calendar.get(Calendar.HOUR);
int minute = calendar.get(Calendar.MINUTE);
int second =calendar.get(Calendar.SECOND);
int pm= calendar.get(Calendar.AM_PM);
System.out.println(pm);
}catch (Exception e){
e.printStackTrace();
}
} }
......
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