Commit 1f94b577 by 韩飞虎

测试吧

parent d07f0383
package com.example.blu.toys.activity; package com.example.blu.toys.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
...@@ -186,6 +188,8 @@ public class PlayActivity extends BaseActivity { ...@@ -186,6 +188,8 @@ 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();
AppManager.getInstance().finishActivity(); AppManager.getInstance().finishActivity();
} }
...@@ -207,6 +211,16 @@ public class PlayActivity extends BaseActivity { ...@@ -207,6 +211,16 @@ public class PlayActivity extends BaseActivity {
switch (view.getId()) { switch (view.getId()) {
case R.id.cancel_but://取消 关机 case R.id.cancel_but://取消 关机
//需要有个提示 直接返回加号页面
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("提示:将断开蓝牙连接");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
timerManager.cancelTimer(); timerManager.cancelTimer();
TrafficLightBean trafficLightBean = new TrafficLightBean( TrafficLightBean trafficLightBean = new TrafficLightBean(
1, 0, 1, 0,
...@@ -216,7 +230,11 @@ public class PlayActivity extends BaseActivity { ...@@ -216,7 +230,11 @@ public class PlayActivity extends BaseActivity {
@Override @Override
public void onWriteSuccess(int current, int total, byte[] justWrite) { public void onWriteSuccess(int current, int total, byte[] justWrite) {
ToastUtils.show("关机-发送成功"); ToastUtils.show("关机-发送成功");
AppManager.getInstance().finishActivity(); BlePlay.getInstance().closeBle();
Intent intent=new Intent(PlayActivity.this,AddDeviceActivity.class);
startActivity(intent);
} }
@Override @Override
...@@ -225,6 +243,23 @@ public class PlayActivity extends BaseActivity { ...@@ -225,6 +243,23 @@ public class PlayActivity extends BaseActivity {
} }
}); });
}
});
builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
}
});
builder.create();
builder.show();
break; break;
case R.id.pause_but://暂停 case R.id.pause_but://暂停
// int time = mHour * 3600 + mMin * 60 + mSecond; // int time = mHour * 3600 + mMin * 60 + mSecond;
......
package com.example.blu.toys.activity; package com.example.blu.toys.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.Switch; import android.widget.Switch;
import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.exception.BleException;
import com.example.blu.toys.R; import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager; import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.ble.BlePlay;
import com.example.blu.toys.ble.agreement.TrafficLightBean;
import com.example.blu.toys.utils.SpUtils; import com.example.blu.toys.utils.SpUtils;
import com.example.blu.toys.view.TypefaceTextView; import com.example.blu.toys.view.TypefaceTextView;
import com.hjq.toast.ToastUtils;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -100,6 +107,9 @@ public class SelectTimerActivity extends BaseActivity { ...@@ -100,6 +107,9 @@ public class SelectTimerActivity extends BaseActivity {
@OnClick(R.id.back_but) @OnClick(R.id.back_but)
public void onViewClicked() { public void onViewClicked() {
AppManager.getInstance().finishActivity(); AppManager.getInstance().finishActivity();
} }
} }
\ No newline at end of file
package com.example.blu.toys.activity; package com.example.blu.toys.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
...@@ -322,8 +324,39 @@ public class SetTimeActivity extends BaseActivity { ...@@ -322,8 +324,39 @@ public class SetTimeActivity extends BaseActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("提示:将断开蓝牙连接");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
BlePlay.getInstance().closeBle(); BlePlay.getInstance().closeBle();
AppManager.getInstance().finishActivity();
Intent intent=new Intent(SetTimeActivity.this,AddDeviceActivity.class);
startActivity(intent);
}
});
builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
}
});
builder.create();
builder.show();
// BlePlay.getInstance().closeBle();
// AppManager.getInstance().finishActivity();
} }
...@@ -343,8 +376,32 @@ public class SetTimeActivity extends BaseActivity { ...@@ -343,8 +376,32 @@ public class SetTimeActivity extends BaseActivity {
startActivity(intent); startActivity(intent);
break; break;
case R.id.back_but: case R.id.back_but:
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("提示:将断开蓝牙连接");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
BlePlay.getInstance().closeBle(); BlePlay.getInstance().closeBle();
AppManager.getInstance().finishActivity();
Intent intent=new Intent(SetTimeActivity.this,AddDeviceActivity.class);
startActivity(intent);
}
});
builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
}
});
builder.create();
builder.show();
break; break;
case R.id.start_but: case R.id.start_but:
boolean bleOpen = BlePlay.getInstance().isBleOpen(); boolean bleOpen = BlePlay.getInstance().isBleOpen();
......
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