|
@@ -505,7 +505,7 @@ public class SettingActivity extends BaseActivity
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
if (isConnected) {
|
|
if (isConnected) {
|
|
- Toast.makeText(mContext, "当前已经连接到" + devicesName, Toast.LENGTH_LONG).show();
|
|
|
|
|
|
+ Toast.makeText(mContext, "当前已经连接到" + devicesName, Toast.LENGTH_LONG).show();
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
// 判断设备蓝牙功能是否打开
|
|
// 判断设备蓝牙功能是否打开
|
|
@@ -532,7 +532,9 @@ public class SettingActivity extends BaseActivity
|
|
|
|
|
|
}).start();
|
|
}).start();
|
|
} else {
|
|
} else {
|
|
- Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_LONG).show();
|
|
|
|
|
|
+
|
|
|
|
+ Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_SHORT).show();
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (v == btn_selfCheckingPage_print) {
|
|
if (v == btn_selfCheckingPage_print) {
|
|
@@ -548,13 +550,16 @@ public class SettingActivity extends BaseActivity
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
Toast.makeText(mContext, getString(R.string.reconnect), Toast.LENGTH_LONG).show();
|
|
Toast.makeText(mContext, getString(R.string.reconnect), Toast.LENGTH_LONG).show();
|
|
|
|
+
|
|
}
|
|
}
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
}).start();
|
|
}).start();
|
|
} else {
|
|
} else {
|
|
|
|
+
|
|
Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_LONG).show();
|
|
Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_LONG).show();
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (v == btn_status_test) {
|
|
if (v == btn_status_test) {
|
|
@@ -585,7 +590,9 @@ public class SettingActivity extends BaseActivity
|
|
|
|
|
|
}).start();
|
|
}).start();
|
|
} else {
|
|
} else {
|
|
|
|
+
|
|
Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_LONG).show();
|
|
Toast.makeText(mContext, getString(R.string.no_connected), Toast.LENGTH_LONG).show();
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -691,7 +698,9 @@ public class SettingActivity extends BaseActivity
|
|
connect2BlueToothdevice();
|
|
connect2BlueToothdevice();
|
|
} else {
|
|
} else {
|
|
Log.e("yxz", devicesAddress);
|
|
Log.e("yxz", devicesAddress);
|
|
|
|
+
|
|
Toast.makeText(mContext, "蓝牙mac:" + devicesAddress + "不合法", Toast.LENGTH_LONG).show();
|
|
Toast.makeText(mContext, "蓝牙mac:" + devicesAddress + "不合法", Toast.LENGTH_LONG).show();
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (requestCode == ENABLE_BT) {
|
|
if (requestCode == ENABLE_BT) {
|