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
e56f16bd
Commit
e56f16bd
authored
Jul 28, 2020
by
onuma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TR41温度計用bluetoothクラスを追加
parent
856dd495
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
1 deletions
+10
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
+2
-1
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/TR41BluetoothReceiveTask.java
+0
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
+7
-0
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
View file @
e56f16bd
...
...
@@ -176,6 +176,7 @@ public class Constant {
int
barcode
=
3
;
// バーコード
int
radiationThermomete
=
4
;
// 放射温度計
int
sppBluetoothMachine
=
5
;
// SPP通信機器
int
nfc
=
6
;
// nfc機器
int
nfc
=
7
;
// nfc機器
int
tr41
=
6
;
// TR41温度計
}
}
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
View file @
e56f16bd
...
...
@@ -129,6 +129,7 @@ public class ABookKeys {
public
static
final
String
TASK_QUESTION_ID
=
"qid"
;
// CMSのインターフェースのパラメータ:qid
// 2020/07/28 onuma 試験的にTR41 用、param1 は、シリアルNo.
public
static
final
String
TASK_DEVICE_TYPE_PARAM1
=
"param1"
;
// CMSのインターフェースのパラメータ:param1 (デバイスID)
public
static
final
String
TASK_DEVICE_TYPE_PARAM2
=
"param2"
;
// CMSのインターフェースのパラメータ:param2(1:温度、2:湿度)
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/TR41BluetoothReceiveTask.java
0 → 100644
View file @
e56f16bd
This diff is collapsed.
Click to expand it.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
View file @
e56f16bd
...
...
@@ -124,6 +124,7 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
// SPP通信機器のデバイスID(t_spp_device)
private
Integer
mSppDeviceId
;
// Bluetoothの接続状態
private
boolean
isConnection
;
/**
...
...
@@ -546,7 +547,13 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
setSppBluetoothDeviceInfo
();
}
else
if
(
mDeviceType
==
DeviceType
.
nfc
)
{
// NFC アタゴ糖度計・濃度計
setNfcDeviceInfo
();
}
else
if
(
mDeviceType
==
DeviceType
.
tr41
){
// TR41温度計
// param1はシリアルNo.
String
param1
=
abookCheckParam
.
get
(
ABookKeys
.
TASK_DEVICE_TYPE_PARAM1
);
}
else
{
Logger
.
e
(
"外部デバイスタイプ不正 deviceType = "
+
mDeviceType
);
}
...
...
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