メッセージ整理

アプリ権限にBluetoothはないので解除

メッセージ整理
アプリ権限にBluetoothはないので解除
a29ba3ee · Kim Jinsung · 19e6707c · a29ba3ee · a29ba3ee · a29ba3ee
Commit a29ba3ee authored May 22, 2019 by Kim Jinsung
5 changed files
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
@@ -126,7 +126,6 @@ public class Constant {
 		int AccessFineLocation = 1;
 		int Camera = 2;
 		int Audio =3;
-		int Bluetooth = 4;  // Bluetooth ディバイス情報:beacon
 	}
 	public interface TaskReportLevel {

--- a/ABVJE_Res_Default_Android/res/values-ja/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ja/strings.xml
@@ -1406,10 +1406,7 @@
    <string name="pairing_save_thermometer">登録された温度計</string>
    <string name="pairing_other_thermometer">その他温度計</string>
    <string name="pairing_other_thermometer_searching">その他温度計（検索中..）</string>
-    <string name="ble_connect_fail">接続失敗</string>
-    <string name="ble_disconnect">未接続</string>
    <string name="ble_connecting">接続中..</string>
-    <string name="ble_connect_success">接続済み</string>
    <string name="msg_no_device_info">登録された中心温度計情報がありません。\n設定画面のペアリングの中心温度計から登録できます。</string>
    <string name="title_okudake_sensor">置くだけセンサー</string>
    <string name="msg_ble_connect_error">登録した中心温度計と接続することができません。中心温度計の電源を確認した後、再度お試しください。(%s)</string>
@@ -1418,7 +1415,6 @@
    <string name="msg_thermometer_connect_bluetooth_no_allow">BlueToothの利用を「許可」しないと、中心温度計と接続できません。</string>
    <string name="msg_okudake_connect_bluetooth_no_allow">BlueToothの利用を「許可」しないと、置くだけセンサーと接続できません。</string>
    <string name="msg_location_device_no_allow">端末の設定から位置情報をONにしてください。</string>
-    <string name="bluetooth_is_not_supported">ブルートゥースを支援しません。</string>
+    <string name="bluetooth_is_not_supported">Bluetooth機能が利用できない端末です。</string>
-    <string name="msg_permission_dialog_bluetooth">ブルートゥース利用権限が必要です。\nアプリ設定画面へ遷移します。</string>
+    <string name="barcode">コードリーダー</string>
-    <string name="barcode">バーコード</string>
 </resources>
--- a/ABVJE_Res_Default_Android/res/values-ko/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ko/strings.xml
@@ -1414,10 +1414,7 @@
    <string name="pairing_save_thermometer">등록된 온도계</string>
    <string name="pairing_other_thermometer">그 밖에 온도계</string>
    <string name="pairing_other_thermometer_searching">그 밖에 온도계(검색중..)</string>
-    <string name="ble_connect_fail">접속 실패</string>
-    <string name="ble_disconnect">접속 안됨</string>
    <string name="ble_connecting">접속 시도 중..</string>
-    <string name="ble_connect_success">접속 완료</string>
    <string name="msg_no_device_info">등록된 중심 온도계 정보가 없습니다.\n 설정 화면의 페어링의 중심 온도계에서 등록 가능합니다.</string>
    <string name="title_okudake_sensor">오쿠다케 센서</string>
    <string name="msg_ble_connect_error">등록한 중심 온도계와 연결 할 수 없습니다. 중심 온도계의 전원을 확인후 다시 시도해 주시기 바랍니다.(%s)</string>
@@ -1427,6 +1424,5 @@
    <string name="msg_okudake_connect_bluetooth_no_allow">블루투스 사용를 [허용] 하지 않으면, 오쿠다케 센서와 연결이 불가능 합니다.</string>
    <string name="msg_location_device_no_allow">단말기의 설정에서 위치정보를 ON으로 설정해 주세요.</string>
    <string name="bluetooth_is_not_supported">블루투스는 지원되지 않습니다.</string>
-    <string name="msg_permission_dialog_bluetooth">블루투스이용권한이 필요합니다.\n앱 설정화면으로 이동합니다.</string>
+    <string name="barcode">코드 리더</string>
-    <string name="barcode">바코드</string>
 </resources>
\ No newline at end of file
--- a/ABVJE_Res_Default_Android/res/values/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values/strings.xml
@@ -1412,10 +1412,7 @@
    <string name="pairing_save_thermometer">Saved thermometer</string>
    <string name="pairing_other_thermometer">Other thermometer</string>
    <string name="pairing_other_thermometer_searching">Other thermometer(Searching..)</string>
-    <string name="ble_connect_fail">Connect fail</string>
-    <string name="ble_disconnect">Disconnect</string>
    <string name="ble_connecting">Connection..</string>
-    <string name="ble_connect_success">Connected</string>
    <string name="msg_no_device_info">There is no registered central thermometer information. \n You can register in the center thermometer of the pairing of setting screen.</string>
    <string name="title_okudake_sensor">OKUDAKE SENSOR</string>
    <string name="msg_ble_connect_error">You can not connect to the registered center thermometer. Check the power supply of the central thermometer and try again.(%s)</string>
@@ -1425,7 +1422,6 @@
    <string name="msg_okudake_connect_bluetooth_no_allow">If Bluetooth is not allow, the center okudake sensor connect is disabled.</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="msg_permission_dialog_bluetooth">You need Bluetooth access authority. \nIt changes to the application setting.</string>
+    <string name="barcode">Code Reader</string>
-    <string name="barcode">Barcode</string>
 </resources>
\ No newline at end of file
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookPermissionHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookPermissionHelper.java
@@ -154,17 +154,6 @@ public class ABookPermissionHelper {
                            getUserPref(mActivity.getApplicationContext(), AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
                }
                break;
-            //  Confirm Device Bluetooth
-            case Constant.ABookPermissionType.Bluetooth:
-                if (ContextCompat.checkSelfPermission(mActivity,
-                        Manifest.permission.BLUETOOTH) != PERMISSION_GRANTED) {
-                    // リソースパターンの適用
-                    permitionTextResourceId = PatternStringUtil.patternToInt(mActivity.getApplicationContext(),
-                            R.string.msg_permission_dialog_bluetooth,
-                            getUserPref(mActivity.getApplicationContext(), AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
-                }
-                break;
        }
        if (permitionTextResourceId > 0) {