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
da5143ab
Commit
da5143ab
authored
Jun 13, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
位置情報のテストビルド用
parent
4f7dd159
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
+6
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/LocationManagerUtil.java
+3
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PairingSettingActivity.java
+2
-0
gradle.properties
+1
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/LocationManagerUtil.java
View file @
da5143ab
...
@@ -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
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PairingSettingActivity.java
View file @
da5143ab
...
@@ -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
);
...
...
gradle.properties
View file @
da5143ab
...
@@ -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
...
...
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