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
8b450337
Commit
8b450337
authored
Sep 06, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
テスト仕様書No.83~92 作業報告画面でインタネットが繋がらない状態で登録・更新しても同期フラグがfalseの状態である問題修正、自動同期時にインタネットチェック追加
parent
f297112b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+4
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
+3
-3
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
8b450337
...
...
@@ -493,6 +493,10 @@ public class OperationListActivity extends ABVUIActivity {
public
void
run
()
{
Logger
.
d
(
TAG
,
"onResume Sync operationId : "
+
operationId
);
if
(
operationDto
!=
null
&&
operationDto
.
needSyncFlg
)
{
if
(!
ABVEnvironment
.
getInstance
().
networkAdapter
.
isNetworkConnected
())
{
ABVToastUtil
.
showMakeText
(
OperationListActivity
.
this
,
R
.
string
.
msg_network_offline
,
Toast
.
LENGTH_SHORT
);
return
;
}
// 同期処理後、直列処理で新着更新を行う。
singleSyncOperation
(
operationId
,
operationDto
.
reportType
);
}
else
{
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
View file @
8b450337
...
...
@@ -149,7 +149,9 @@ public class ABookCheckWebViewHelper extends ABookHelper {
* @param taskKey タスクキー
*/
private
void
sendTaskData
(
final
ABVContentViewActivity
context
,
final
long
operationId
,
final
String
taskKey
,
final
int
taskReportLevel
)
{
// TODO 以下の処理見直し
// needSyncFlgをtrueに設定
mOperationLogic
.
updateSyncOperation
(
operationId
,
true
);
// ネットワーク通信チェック
if
(!
ABVEnvironment
.
getInstance
().
networkAdapter
.
isNetworkConnected
())
{
mFinishCallback
.
callback
(
false
);
...
...
@@ -177,11 +179,9 @@ public class ABookCheckWebViewHelper extends ABookHelper {
CommonExecutor
.
execute
(
new
Runnable
()
{
@Override
public
void
run
()
{
OperationDto
operationDto
=
mOperationLogic
.
getOperation
(
operationId
);
boolean
isError
=
false
;
try
{
mOperationLogic
.
updateSyncOperation
(
operationId
,
true
);
mOperationLogic
.
sendTaskReportSendData
(
operationId
,
taskKey
,
taskReportLevel
,
progressCallback
);
}
catch
(
AcmsException
ex
)
{
//noinspection EnumSwitchStatementWhichMissesCases
...
...
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