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
9e1f318a
Commit
9e1f318a
authored
Aug 29, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log・コメント内容修正
parent
53f9fea7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+6
-5
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
9e1f318a
...
...
@@ -554,7 +554,7 @@ public class OperationListActivity extends ABVUIActivity {
return
;
}
refreshOperationList
();
//
作業指示・報告からプロジェクト
一覧へ戻った時の同期処理
//
報告画面から作業
一覧へ戻った時の同期処理
final
long
operationId
=
getUserPref
(
AppDefType
.
UserPrefKey
.
SYNC_TARGET_OPERATION_ID
,
-
1L
);
if
(
operationId
!=
-
1
)
{
final
OperationDto
operationDto
=
mOperationLogic
.
getOperation
(
operationId
);
...
...
@@ -774,7 +774,7 @@ public class OperationListActivity extends ABVUIActivity {
contentPath
=
ABVEnvironment
.
getInstance
().
getPanoImageDirName
(
ContentFileExtractor
.
getInstance
().
getContentCacheDirWithExtract
(
operationDto
.
contentId
));
}
//
プロジェクトの指示/報告
表示時、必要なJSONファイル作成
//
作業の報告画面を
表示時、必要なJSONファイル作成
mOperationLogic
.
createJsonForOpenABookCheckPano
(
operationDto
.
operationId
,
operationDto
.
contentId
,
contentPath
);
mOperationLogic
.
createJsonForOperationContent
(
operationDto
.
operationId
,
contentPath
,
operationDto
.
reportType
==
ReportType
.
RoutineTask
);
...
...
@@ -869,7 +869,7 @@ public class OperationListActivity extends ABVUIActivity {
}
/**
*
プロジェクト
同期処理
*
作業
同期処理
* @param operationId
* @param reportType
* @param buttonEventFlag
...
...
@@ -906,7 +906,7 @@ public class OperationListActivity extends ABVUIActivity {
if
(
mOperationLastEditDate
!=
null
&&
reportType
==
ReportType
.
RoutineTask
)
{
if
(
buttonEventFlag
)
{
String
dialogMsg
=
null
;
// 定期点検
プロジェクト
の利用可能日付を取得
// 定期点検の利用可能日付を取得
String
avilableDateStr
=
mOperationLogic
.
getRoutineTaskOperationAvailableDateStr
(
operationId
);
if
(!
StringUtil
.
isNullOrEmpty
(
avilableDateStr
))
{
// 利用可能メッセージ
...
...
@@ -2301,7 +2301,7 @@ public class OperationListActivity extends ABVUIActivity {
* カテゴリの一括同期ボタン
*/
public
void
categoryBatchSync
()
{
Logger
.
i
(
TAG
,
"---
category
batch sync start"
);
Logger
.
i
(
TAG
,
"---batch sync start"
);
// 作業種別に関連する作業リストを取得
List
<
OperationDto
>
operationList
=
mOperationDao
.
getNeedSyncOperationByGroupMasterId
(
getABVUIDataCache
().
getOperationGroupMasterId
());
...
...
@@ -2374,6 +2374,7 @@ public class OperationListActivity extends ABVUIActivity {
if
(
batchSyncView
.
checkMaxProgress
())
{
// 最後の処理が完了したと見做す
batchSyncView
.
closeProgressDialog
();
Logger
.
d
(
TAG
,
"---batchSync is end"
);
}
else
{
// プログレスバーに作業1つ完了をセット
batchSyncView
.
setProgress
(
batchSyncView
.
getProgress
()
+
1
);
...
...
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