Commit da5143ab by Lee Jaebin

位置情報のテストビルド用

parent 4f7dd159
...@@ -234,8 +234,11 @@ public class LocationManagerUtil { ...@@ -234,8 +234,11 @@ public class LocationManagerUtil {
if (locationManager != null) { if (locationManager != null) {
final boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); final boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
final boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER); final boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
Logger.i("--------------gps is " + gps);
Logger.i("--------------network is " + network);
if (!gps && !network) { if (!gps && !network) {
ABVUIDataCache appDataCache = ABVApplication.getABVUIDataCache(context); ABVUIDataCache appDataCache = ABVApplication.getABVUIDataCache(context);
Logger.i("--------------checkLocationServiceFlg : " + appDataCache.checkLocationServiceFlg);
if (appDataCache.checkLocationServiceFlg) { if (appDataCache.checkLocationServiceFlg) {
// 位置情報が有効になっていない場合は、Google Maps アプリライクなダイアログを起動します。 // 位置情報が有効になっていない場合は、Google Maps アプリライクなダイアログを起動します。
ABookAlertDialog dialog = AlertDialogUtil.createAlertDialog(context, R.string.location_services_disabled); ABookAlertDialog dialog = AlertDialogUtil.createAlertDialog(context, R.string.location_services_disabled);
......
...@@ -210,6 +210,8 @@ public class PairingSettingActivity extends ABVUIActivity { ...@@ -210,6 +210,8 @@ public class PairingSettingActivity extends ABVUIActivity {
LocationManager lm = (LocationManager) this.getSystemService(this.LOCATION_SERVICE); LocationManager lm = (LocationManager) this.getSystemService(this.LOCATION_SERVICE);
final boolean gpsEnabled = lm.isProviderEnabled(LocationManager.GPS_PROVIDER); final boolean gpsEnabled = lm.isProviderEnabled(LocationManager.GPS_PROVIDER);
Logger.i("-------------------lm : " + (lm != null ? "is not null" : "is null"));
Logger.i("-------------------gpsEnabled : " + gpsEnabled);
//端末側の位置情報許可チェック //端末側の位置情報許可チェック
if (!gpsEnabled) { if (!gpsEnabled) {
showSimpleAlertDialog(R.string.set_pairing_central_thermometer, R.string.msg_location_device_no_allow); showSimpleAlertDialog(R.string.set_pairing_central_thermometer, R.string.msg_location_device_no_allow);
......
...@@ -53,7 +53,7 @@ google_public_key2=jtdSzewQsnaXsnVfwUiqZMa5I7feBfs6FZ61LvnUWI6VTAQgwogI9Xa3DcfCf ...@@ -53,7 +53,7 @@ google_public_key2=jtdSzewQsnaXsnVfwUiqZMa5I7feBfs6FZ61LvnUWI6VTAQgwogI9Xa3DcfCf
google_public_key3=LShEIudH7Q7jLZERczfa0PknZCC5I3G0bTNa/EndTMLIR6/W3DLHToDk5L5Nkhx8Nl6V12WGIgHKSLh9OrGZGNnlM8DBmG6ACLm0CXW7KPoSWasiXI7MW6CIs2wIDAQAB google_public_key3=LShEIudH7Q7jLZERczfa0PknZCC5I3G0bTNa/EndTMLIR6/W3DLHToDk5L5Nkhx8Nl6V12WGIgHKSLh9OrGZGNnlM8DBmG6ACLm0CXW7KPoSWasiXI7MW6CIs2wIDAQAB
#Application Settings #Application Settings
app_name=ABook Check app_name=@Form
#true:スリープ禁止, false:スリープ許可 #true:スリープ禁止, false:スリープ許可
keep_screen=false keep_screen=false
scheme_url=jp.agentec.abook.check scheme_url=jp.agentec.abook.check
......
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