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
3b6745b0
Commit
3b6745b0
authored
Feb 07, 2020
by
yuichiro ogawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
安定板_異常報告遷移のバグの修正
parent
be4f452f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+3
-11
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
+3
-0
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
View file @
3b6745b0
...
@@ -1740,6 +1740,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
...
@@ -1740,6 +1740,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
/**
/**
* KAGOME Ph2 検品→品質異常報告への遷移
* KAGOME Ph2 検品→品質異常報告への遷移
*
*
* Activityスタックから作業一覧を検索し、WebViewの起動を実行する
*
* @param operationId
* @param operationId
* @param contentId
* @param contentId
*/
*/
...
@@ -1754,18 +1756,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
...
@@ -1754,18 +1756,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
if
(
activity
instanceof
OperationListActivity
)
{
if
(
activity
instanceof
OperationListActivity
)
{
// 報告一覧の表示
// 報告一覧の表示
((
OperationListActivity
)
activity
).
startTaskDirectionOrReportView
(
dto
);
((
OperationListActivity
)
activity
).
startTaskDirectionOrReportView
(
dto
);
break
;
// // 報告一覧のWebViewから報告の新規追加処理をキックする
// final ABVAuthenticatedActivity peekActivity = currentActivityStack.peek();
// if (peekActivity instanceof HTMLWebViewActivity) {
// ((HTMLWebViewActivity) peekActivity).addTaskReportFlg = true;
// //((HTMLWebViewActivity) peekActivity).kickAddTaskReport();
// return;
// }
}
}
}
}
// // 報告の新規追加が出来なかった場合例外をスロー
// throw new IllegalStateException("transitioning to abnormality report is failed.");
}
}
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
View file @
3b6745b0
...
@@ -28,6 +28,7 @@ import android.widget.Toast;
...
@@ -28,6 +28,7 @@ import android.widget.Toast;
import
org.json.adf.JSONObject
;
import
org.json.adf.JSONObject
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
import
jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON
;
import
jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON
;
...
@@ -678,6 +679,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity implements KeyAct
...
@@ -678,6 +679,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity implements KeyAct
webViewLoadUrl
(
String
.
format
(
"javascript:CHK_L.addTaskReportWithInitParam('%s')"
,
param
));
webViewLoadUrl
(
String
.
format
(
"javascript:CHK_L.addTaskReportWithInitParam('%s')"
,
param
));
}
}
});
});
// キャッシュのクリア
getABVUIDataCache
().
ubnormalityReportParam
=
new
HashMap
<>();
}
}
@Override
@Override
...
...
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