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
f8f2373c
Commit
f8f2373c
authored
Jun 22, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文書協業ではコンテンツリンクが開けないように修正。
parent
43511904
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
1 deletions
+17
-1
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
+14
-1
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
f8f2373c
...
...
@@ -495,6 +495,7 @@
<string
name=
"content_link_update"
>
資料名「%1$s」は更新状態となります。\n更新しますか?
</string>
<string
name=
"msg_non_target_meeting_content"
>
遠隔支援中には対象外の資料なので、開けません。
</string>
<string
name=
"msg_non_target_collaboration_content"
>
協業中は閲覧できない資料です。
</string>
<string
name=
"msg_non_target_document_collaboration_content"
>
文書協業では利用できない機能です。
</string>
<string
name=
"msg_help_operation_list_list_view"
>
リスト表示に変更できます。
</string>
<string
name=
"msg_help_operation_list_panel_view"
>
パネル表示に変更できます。
</string>
<string
name=
"msg_help_operation_list_filter"
>
表示する作業の種類を選択できます。
</string>
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
f8f2373c
...
...
@@ -498,6 +498,7 @@
<string
name=
"content_link_update"
>
자료명[%1$s]는 업데이트 가능한 상태입니다.\n업데이트 하시겠습니까?
</string>
<string
name=
"msg_non_target_meeting_content"
>
원격 지원 접속 중에는 열람할 수 없는 자료입니다.
</string>
<string
name=
"msg_non_target_collaboration_content"
>
협업중에는 열람할 수 없는 자료입니다.
</string>
<string
name=
"msg_non_target_document_collaboration_content"
>
문서협업중에는 이용하실수 없는 기능입니다.
</string>
<string
name=
"msg_help_operation_list_list_view"
>
리스트 표시로 변경 가능합니다.
</string>
<string
name=
"msg_help_operation_list_panel_view"
>
패널 표시로 변경 가능합니다.
</string>
<string
name=
"msg_help_operation_list_filter"
>
표시할 작업의 종류를 선택 가능합니다.
</string>
...
...
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
f8f2373c
...
...
@@ -502,6 +502,7 @@
<string
name=
"content_link_update"
>
The document name [%1$s] will be updated. \nDo you want to update it?
</string>
<string
name=
"msg_non_target_meeting_content"
>
It is the document that can not be read during distance support connection.
</string>
<string
name=
"msg_non_target_collaboration_content"
>
It is the document that can not be read during collaboration.
</string>
<string
name=
"msg_non_target_document_collaboration_content"
>
This is a function that cannot be used in document collaboration.
</string>
<string
name=
"msg_help_operation_list_list_view"
>
You can change to list display.
</string>
<string
name=
"msg_help_operation_list_panel_view"
>
You can change to panel display.
</string>
<string
name=
"msg_help_operation_list_filter"
>
You can select the type of work to be displayed.
</string>
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
View file @
f8f2373c
...
...
@@ -138,6 +138,7 @@ import jp.agentec.abook.abv.ui.common.view.ABVEditText;
import
jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow
;
import
jp.agentec.abook.abv.ui.common.vo.Size
;
import
jp.agentec.abook.abv.ui.home.activity.ChatWebViewActivity
;
import
jp.agentec.abook.abv.ui.home.activity.OperationRelatedContentActivity
;
import
jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper
;
import
jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper
;
import
jp.agentec.abook.abv.ui.Interface.MovePageInterface
;
...
...
@@ -2683,8 +2684,20 @@ public class ContentViewActivity extends ABVContentViewActivity {
break
;
case
ActionInfoJSON
.
CONTENTLINK_ACTION
:
//コンテンツリンクに紐づいたAction Buttonのイベント
if
(
meetingManager
.
isCollaboration
())
{
final
ABookAlertDialog
nonTargetMeetingContentDialog
=
AlertDialogUtil
.
createAlertDialog
(
ContentViewActivity
.
this
,
R
.
string
.
app_name
);
nonTargetMeetingContentDialog
.
setCancelable
(
false
);
nonTargetMeetingContentDialog
.
setMessage
(
isCollaboration
?
R
.
string
.
msg_non_target_document_collaboration_content
:
R
.
string
.
msg_non_target_meeting_content
);
nonTargetMeetingContentDialog
.
setPositiveButton
(
R
.
string
.
ok
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialog
,
int
whichButton
)
{
nonTargetMeetingContentDialog
.
dismiss
();
}
});
nonTargetMeetingContentDialog
.
show
();
break
;
}
long
linkContentId
=
actionInfoJSON
.
getContentId
();
// プロジェクト関連資料なのかをチェック
if
(
ActivityHandlingHelper
.
getInstance
().
isExistCommonContent
(
getContentId
()))
{
if
(!
ActivityHandlingHelper
.
getInstance
().
isExistCommonContent
(
linkContentId
))
{
...
...
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