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
ecd97466
Commit
ecd97466
authored
Jul 04, 2019
by
Jeong Gilmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#33721 手書きパレット機能の追加
- イメージ編集の画面表示処理の修正 #33721 絞り検索のAPIとの連携 - 絞り検索のマスタデータを受信処理の修正
parent
88bdeb21
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+0
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
+2
-1
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
ecd97466
...
@@ -639,8 +639,6 @@ public class OperationListActivity extends ABVUIActivity {
...
@@ -639,8 +639,6 @@ public class OperationListActivity extends ABVUIActivity {
mOperationLogic
.
createJsonForOpenABookCheckPano
(
operationDto
.
operationId
,
operationDto
.
contentId
,
contentPath
);
mOperationLogic
.
createJsonForOpenABookCheckPano
(
operationDto
.
operationId
,
operationDto
.
contentId
,
contentPath
);
mOperationLogic
.
createJsonForOperationContent
(
operationDto
.
operationId
,
contentPath
,
operationDto
.
reportType
==
ReportType
.
RoutineTask
);
mOperationLogic
.
createJsonForOperationContent
(
operationDto
.
operationId
,
contentPath
,
operationDto
.
reportType
==
ReportType
.
RoutineTask
);
// 絞り検索マスタデータを受信、JSONファイルを生成
mApertureMasterDataLogic
.
initializeApertureMasterData
(
ABVDataCache
.
getInstance
().
getTempApertureMasterDataFetchDate
());
// サーバ作業後、対応必要
// サーバ作業後、対応必要
StringBuffer
path
=
new
StringBuffer
();
StringBuffer
path
=
new
StringBuffer
();
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
View file @
ecd97466
...
@@ -142,7 +142,8 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
...
@@ -142,7 +142,8 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
}
}
mLocalFile
=
null
;
mLocalFile
=
null
;
//編集可能可否をチェックする。
//編集可能可否をチェックする。
if
(
mEnablePhotoEdit
==
0
)
{
//編集の場合、編集画面を開ける。
if
(
mEnablePhotoEdit
.
equals
(
"1"
))
{
//編集の場合、編集画面を開ける。
setFixedOrientation
(
true
);
commonOpenEditPage
();
commonOpenEditPage
();
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
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