Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
7c921c9c
Commit
7c921c9c
authored
Jan 27, 2020
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
端末の再起動時、ble通信ができない問題対応
parent
a26bcdfe
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/BleManagerUtil.java
+0
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
+8
-7
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PairingSettingActivity.java
+3
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/BleManagerUtil.java
View file @
7c921c9c
This diff is collapsed.
Click to expand it.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
View file @
7c921c9c
...
...
@@ -216,11 +216,7 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
unregisterReceiver
(
mReceiver
);
// 接続されている機器と切断する。
if
(
null
!=
bleManagerUtil
.
mBluetoothGatt
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
JELLY_BEAN_MR2
)
{
bleManagerUtil
.
mBluetoothGatt
.
disconnect
();
}
}
bleThermometerDisconnect
();
super
.
onDestroy
();
}
...
...
@@ -378,9 +374,8 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
if
(
deviceAddress
.
length
()
>
0
)
{
//登録されている中心温度計がある
showWaitingDialog
(
getString
(
R
.
string
.
set_pairing_central_thermometer
),
getString
(
R
.
string
.
ble_connecting
));
bleManagerUtil
.
mDeviceAddress
=
deviceAddress
;
// 接続
bleManagerUtil
.
connect
();
bleManagerUtil
.
connect
(
deviceAddress
);
}
else
{
//登録されている中心温度計がない
errorAfterAbookCheckAip
(
getString
(
R
.
string
.
msg_no_device_info
));
...
...
@@ -531,4 +526,10 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
// mediaPlayerを初期化
mMediaPlayer
=
null
;
}
@Override
protected
void
onStop
()
{
super
.
onStop
();
Logger
.
d
(
TAG
,
"--onStop"
);
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PairingSettingActivity.java
View file @
7c921c9c
...
...
@@ -73,7 +73,9 @@ public class PairingSettingActivity extends ABVUIActivity {
@Override
public
void
run
()
{
BluetoothDevice
device
=
result
.
getDevice
();
Logger
.
d
(
"mLeScanCallback device.getName() = "
+
device
.
getName
());
if
(
device
.
getName
()
!=
null
)
{
Logger
.
d
(
"mScanCallback device.getName() = "
+
device
.
getName
());
}
// 識別商品名に絞る
if
(
device
.
getName
()
!=
null
&&
device
.
getName
().
startsWith
(
"MF500"
))
{
if
(!
device
.
getAddress
().
equals
(
mSavedDeviceAddress
))
{
//登録されたデバイスの場合、スキャン情報から除外する。
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment