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
abbdc0d5
Commit
abbdc0d5
authored
Oct 01, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
おくだけセンサーのパラメータに文字列を登録するとアプリが落ちるため、エラーメッセージを表示
parent
a26bcdfe
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
0 deletions
+11
-0
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+2
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
+6
-0
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
abbdc0d5
...
@@ -1417,4 +1417,5 @@
...
@@ -1417,4 +1417,5 @@
<string
name=
"msg_location_device_no_allow"
>
端末の設定から位置情報をONにしてください。
</string>
<string
name=
"msg_location_device_no_allow"
>
端末の設定から位置情報をONにしてください。
</string>
<string
name=
"bluetooth_is_not_supported"
>
Bluetooth機能が利用できない端末です。
</string>
<string
name=
"bluetooth_is_not_supported"
>
Bluetooth機能が利用できない端末です。
</string>
<string
name=
"barcode"
>
コードリーダー
</string>
<string
name=
"barcode"
>
コードリーダー
</string>
<string
name=
"msg_okudake_fraud_parameter"
>
おくだけセンサーのパラメータに数値以外の文字列が含まれています。
</string>
</resources>
</resources>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
abbdc0d5
...
@@ -1425,4 +1425,5 @@
...
@@ -1425,4 +1425,5 @@
<string
name=
"msg_location_device_no_allow"
>
단말기의 설정에서 위치정보를 ON으로 설정해 주세요.
</string>
<string
name=
"msg_location_device_no_allow"
>
단말기의 설정에서 위치정보를 ON으로 설정해 주세요.
</string>
<string
name=
"bluetooth_is_not_supported"
>
블루투스는 지원되지 않습니다.
</string>
<string
name=
"bluetooth_is_not_supported"
>
블루투스는 지원되지 않습니다.
</string>
<string
name=
"barcode"
>
코드 리더
</string>
<string
name=
"barcode"
>
코드 리더
</string>
<string
name=
"msg_okudake_fraud_parameter"
>
오쿠다케 센서의 파라미터에 숫자가 아닌 문자열이 포합되어 있습니다.
</string>
</resources>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
abbdc0d5
...
@@ -1423,5 +1423,6 @@
...
@@ -1423,5 +1423,6 @@
<string
name=
"msg_location_device_no_allow"
>
Please set the location information to ON in the device setting.
</string>
<string
name=
"msg_location_device_no_allow"
>
Please set the location information to ON in the device setting.
</string>
<string
name=
"bluetooth_is_not_supported"
>
Bluetooth is not supported.
</string>
<string
name=
"bluetooth_is_not_supported"
>
Bluetooth is not supported.
</string>
<string
name=
"barcode"
>
Code Reader
</string>
<string
name=
"barcode"
>
Code Reader
</string>
<string
name=
"msg_okudake_fraud_parameter"
>
The okudake sensor parameter contains a non-numeric string.
</string>
</resources>
</resources>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
View file @
abbdc0d5
...
@@ -274,8 +274,14 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
...
@@ -274,8 +274,14 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
setThermometerDeviceInfo
();
setThermometerDeviceInfo
();
}
else
if
(
mDeviceType
==
Constant
.
DeviceType
.
sensor
)
{
// 置くだけセンサー
}
else
if
(
mDeviceType
==
Constant
.
DeviceType
.
sensor
)
{
// 置くだけセンサー
try
{
mScaningDeviceId
=
Integer
.
valueOf
(
abookCheckParam
.
get
(
ABookKeys
.
TASK_DEVICE_TYPE_PARAM1
));
// デバイスID取得
mScaningDeviceId
=
Integer
.
valueOf
(
abookCheckParam
.
get
(
ABookKeys
.
TASK_DEVICE_TYPE_PARAM1
));
// デバイスID取得
mScaningServiceId
=
Integer
.
valueOf
(
abookCheckParam
.
get
(
ABookKeys
.
TASK_DEVICE_TYPE_PARAM2
));
// ServiceId ID取得
mScaningServiceId
=
Integer
.
valueOf
(
abookCheckParam
.
get
(
ABookKeys
.
TASK_DEVICE_TYPE_PARAM2
));
// ServiceId ID取得
}
catch
(
NumberFormatException
e
)
{
Logger
.
e
(
"param is not Int"
,
e
);
errorAfterAbookCheckAip
(
getString
(
R
.
string
.
msg_okudake_fraud_parameter
));
return
;
}
startOkudakeBeaconScan
();
startOkudakeBeaconScan
();
}
else
if
(
mDeviceType
==
Constant
.
DeviceType
.
barcode
)
{
// バーコード
}
else
if
(
mDeviceType
==
Constant
.
DeviceType
.
barcode
)
{
// バーコード
...
...
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