Commit ea6bc7f4 by hanfeihu

测试吧

parent 1f94b577
...@@ -243,6 +243,8 @@ public class PlayActivity extends BaseActivity { ...@@ -243,6 +243,8 @@ public class PlayActivity extends BaseActivity {
} }
}); });
} }
}); });
builder.setNegativeButton("取消", new DialogInterface.OnClickListener() { builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
......
...@@ -7,6 +7,7 @@ import android.os.Bundle; ...@@ -7,6 +7,7 @@ import android.os.Bundle;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.Switch; import android.widget.Switch;
import com.blankj.utilcode.util.LogUtils;
import com.clj.fastble.callback.BleWriteCallback; import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.exception.BleException; import com.clj.fastble.exception.BleException;
import com.example.blu.toys.R; import com.example.blu.toys.R;
...@@ -42,6 +43,31 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -42,6 +43,31 @@ public class SelectTimerActivity extends BaseActivity {
return R.layout.activity_select_timer; return R.layout.activity_select_timer;
} }
private void sendBle(){
SpUtils spUtils = SpUtils.getSpUtils(SelectTimerActivity.this);
int close = spUtils.getSPValue("close", 1);
int open = spUtils.getSPValue("open", 10);
int alarm = spUtils.getSPValue("alarm", 1);
int green = spUtils.getSPValue("green", 1);
int brightness = spUtils.getSPValue("brightness", 50);
TrafficLightBean ttt = new TrafficLightBean(2, 0,
0, brightness, open, close, green, alarm);
byte[] bytes12 = ttt.toByte();
BlePlay.getInstance().sendPause(bytes12, new BleWriteCallback() {
@Override
public void onWriteSuccess(int current, int total, byte[] justWrite) {
LogUtils.e("发送成功:" );
}
@Override
public void onWriteFailure(BleException exception) {
}
});
}
@Override @Override
public void init(Bundle savedInstanceState) { public void init(Bundle savedInstanceState) {
...@@ -56,6 +82,8 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -56,6 +82,8 @@ public class SelectTimerActivity extends BaseActivity {
//数据回显 //数据回显
alarmSwitch.setChecked(alarm == 1 ? true : false); alarmSwitch.setChecked(alarm == 1 ? true : false);
greenSwitch.setChecked(green == 1 ? true : false); greenSwitch.setChecked(green == 1 ? true : false);
musicSwitch.setChecked(open == 1 ? true : false);
brightnessBar.setProgress(brightness); brightnessBar.setProgress(brightness);
...@@ -65,10 +93,18 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -65,10 +93,18 @@ public class SelectTimerActivity extends BaseActivity {
} else { } else {
spUtils.putSPValue("alarm", 0); spUtils.putSPValue("alarm", 0);
} }
sendBle();
}); });
musicSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { musicSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
startActivity(new Intent(SelectTimerActivity.this, MusicActivity.class)); //startActivity(new Intent(SelectTimerActivity.this, MusicActivity.class));
if (isChecked) {
spUtils.putSPValue("open", 1);
} else {
spUtils.putSPValue("open", 0);
}
sendBle();
}); });
greenSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { greenSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
...@@ -77,12 +113,14 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -77,12 +113,14 @@ public class SelectTimerActivity extends BaseActivity {
} else { } else {
spUtils.putSPValue("green", 0); spUtils.putSPValue("green", 0);
} }
sendBle();
}); });
brightnessBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { brightnessBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override @Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
spUtils.putSPValue("brightness", progress); spUtils.putSPValue("brightness", progress);
sendBle();
} }
@Override @Override
......
...@@ -26,7 +26,7 @@ public class TimerManager { ...@@ -26,7 +26,7 @@ public class TimerManager {
@Override @Override
public void run() { public void run() {
if (handler != null) { if (handler != null) {
LogUtils.e("定时器在走"); // LogUtils.e("定时器在走");
Message msg = new Message(); Message msg = new Message();
handler.sendMessage(msg); handler.sendMessage(msg);
......
...@@ -22,7 +22,7 @@ public class BleDeviceAdapter extends BaseQuickAdapter<BleDevice, BaseViewHolder ...@@ -22,7 +22,7 @@ public class BleDeviceAdapter extends BaseQuickAdapter<BleDevice, BaseViewHolder
@Override @Override
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")) { 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.getName() + "");
} }
} }
......
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