Skip to content

A
abook_check
Commit 970a3eb2 by Lee Jaebin
Options

Merge branch 'contract/sato/1.0.101' into contract/sato/1.0.200 

# Conflicts:
#	ABVJE_Res_Default_Android/res/values-ja/strings.xml
#	ABVJE_Res_Default_Android/res/values-ko/strings.xml
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/BleManagerUtil.java
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/BlePairingSettingActivity.java
parents 112bda13 618e40eb
Showing with 26 additions and 13 deletions
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -1431,4 +1431,5 @@ ...@@ -1431,4 +1431,5 @@
<string name="msg_no_support_nfc">NFC機能が利用できない端末です。</string> <string name="msg_no_support_nfc">NFC機能が利用できない端末です。</string>
<string name="msg_no_nfc_setting">端末の設定からNFCを有効にする必要があります。\n端末の設定画面へ遷移しますか？</string> <string name="msg_no_nfc_setting">端末の設定からNFCを有効にする必要があります。\n端末の設定画面へ遷移しますか？</string>
<string name="select_spp_device_title">シリアル通信機器選択</string> <string name="select_spp_device_title">シリアル通信機器選択</string>
<string name="msg_bluetooth_connect_timeout_error">%1$sとの接続が切れました。%1$sの電源や距離を確認し、再度お試し下さい。(%2$s)</string>
</resources> </resources>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -1439,4 +1439,5 @@ ...@@ -1439,4 +1439,5 @@
<string name="msg_no_support_nfc">NFC기능을 이용할 수 없는 단말기입니다.</string> <string name="msg_no_support_nfc">NFC기능을 이용할 수 없는 단말기입니다.</string>
<string name="msg_no_nfc_setting">단말기의 설정에서 NFC을 \n단말기의 설정화면으로 이동하시겠습니까?</string> <string name="msg_no_nfc_setting">단말기의 설정에서 NFC을 \n단말기의 설정화면으로 이동하시겠습니까?</string>
<string name="select_spp_device_title">시리얼 통신 기기 선택</string> <string name="select_spp_device_title">시리얼 통신 기기 선택</string>
<string name="msg_bluetooth_connect_timeout_error">%1$s와의 연결이 끊겼습니다. %1$s의 전원과 거리를 확인하고 다시 시도해주세요.(%s)</string>
</resources> </resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -1437,5 +1437,6 @@ ...@@ -1437,5 +1437,6 @@
<string name="msg_no_support_nfc">NFC機能が利用できない端末です。</string> <string name="msg_no_support_nfc">NFC機能が利用できない端末です。</string>
<string name="msg_no_nfc_setting">端末の設定からNFCを有効にする必要があります。\n端末の設定画面へ遷移しますか？</string> <string name="msg_no_nfc_setting">端末の設定からNFCを有効にする必要があります。\n端末の設定画面へ遷移しますか？</string>
<string name="select_spp_device_title">シリアル通信機器選択</string> <string name="select_spp_device_title">シリアル通信機器選択</string>
<string name="msg_bluetooth_connect_timeout_error">%1$s with the central thermometer has been lost. Check the power and distance of %1$s and try again.(%2$s)</string>
</resources> </resources>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVCheckContentViewActivity.java
...@@ -210,10 +210,19 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity { ...@@ -210,10 +210,19 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
// bluetoothのデバイスタイプ（中心温度計・放射温度計） // bluetoothのデバイスタイプ（中心温度計・放射温度計）
int bluetoothDeviceType = bleManagerUtil.getBluetoothDeviceType(); int bluetoothDeviceType = bleManagerUtil.getBluetoothDeviceType();
// タイプによってメッセージ内容をセット // タイプによってメッセージ内容をセット
if (bluetoothDeviceType == DeviceType.centerThermomete) { if (status == 8) {
errorAfterAbookCheckAip(String.format(getString(R.string.msg_bluetooth_connect_error), getString(R.string.center_thermometer))); // タイムアウトのステータス
} else if (bluetoothDeviceType == DeviceType.radiationThermomete) { if (bluetoothDeviceType == DeviceType.centerThermomete) {
errorAfterAbookCheckAip(String.format(getString(R.string.msg_bluetooth_connect_error), getString(R.string.radiation_thermometer))); errorAfterAbookCheckAip(String.format(getString(R.string.msg_bluetooth_timeout_error), getString(R.string.center_thermometer), String.valueOf(status)));
} else if (bluetoothDeviceType == DeviceType.radiationThermomete) {
errorAfterAbookCheckAip(String.format(getString(R.string.msg_bluetooth_timeout_error), getString(R.string.radiation_thermometer), String.valueOf(status)));
}
} else {
if (bluetoothDeviceType == DeviceType.centerThermomete) {
errorAfterAbookCheckAip(String.format(getString(R.string.msg_bluetooth_connect_error), getString(R.string.center_thermometer)));
} else if (bluetoothDeviceType == DeviceType.radiationThermomete) {
errorAfterAbookCheckAip(String.format(getString(R.string.msg_bluetooth_connect_error), getString(R.string.radiation_thermometer)));
}
} }
bleManagerDisconnect(); bleManagerDisconnect();
} }
...@@ -304,11 +313,7 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity { ...@@ -304,11 +313,7 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
unregisterReceiver(mReceiver); unregisterReceiver(mReceiver);
// 接続されている機器と切断する。 // 接続されている機器と切断する。
if( null != bleManagerUtil.mBluetoothGatt ) { bleManagerDisconnect();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
bleManagerUtil.mBluetoothGatt.disconnect();
}
}
super.onDestroy(); super.onDestroy();
} }
...@@ -1009,4 +1014,4 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity { ...@@ -1009,4 +1014,4 @@ public class ABVCheckContentViewActivity extends ABVContentViewActivity {
mWaitingDialog.dismiss(); mWaitingDialog.dismiss();
} }
} }
} }
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/BlePairingSettingActivity.java
...@@ -69,7 +69,9 @@ public class BlePairingSettingActivity extends ABVUIActivity { ...@@ -69,7 +69,9 @@ public class BlePairingSettingActivity extends ABVUIActivity {
@Override @Override
public void run() { public void run() {
BluetoothDevice device = result.getDevice(); BluetoothDevice device = result.getDevice();
Logger.d("mScanCallback device.getName() = " + device.getName()); if (device.getName() != null) {
Logger.d("mScanCallback device.getName() = " + device.getName());
}
// 識別商品名に絞る // 識別商品名に絞る
if(device.getName() != null && (device.getName().startsWith(CENTER_THERMOMETE_DEVICE_NAME) || device.getName().startsWith(RADIATION_THERMOMETE_DEVICE_NAME))) { if(device.getName() != null && (device.getName().startsWith(CENTER_THERMOMETE_DEVICE_NAME) || device.getName().startsWith(RADIATION_THERMOMETE_DEVICE_NAME))) {
if (!mSavedDeviceAddressList.contains(device.getAddress())) { //登録されたデバイスの場合、スキャン情報から除外する。 if (!mSavedDeviceAddressList.contains(device.getAddress())) { //登録されたデバイスの場合、スキャン情報から除外する。
......
gradle.properties
...@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true ...@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true
repeat_default=true repeat_default=true
#Setting Info(設定画面のABookについての設定情報) #Setting Info(設定画面のABookについての設定情報)
version_name=1.0.100 version_name=1.0.101
release_date=2019/09/25 release_date=2020/01/30
copy_right=SATO CORPORATION copy_right=SATO CORPORATION
hope_page=http://www.sato.co.jp hope_page=http://www.sato.co.jp
contact_email=grp-atform_support@sato-global.com contact_email=grp-atform_support@sato-global.com
......
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