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
e9f7660e
Commit
e9f7660e
authored
Jan 29, 2021
by
onuma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#40865 閲覧できない状態になっている帳票フォームをタップした際の動作について
エラーダイアログを表示後、前の画面に戻るように修正した。
parent
37ce0f52
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
3 deletions
+15
-3
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
+11
-3
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
e9f7660e
...
@@ -1480,5 +1480,6 @@
...
@@ -1480,5 +1480,6 @@
<!-- 連続作業 -->
<!-- 連続作業 -->
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
<string
name=
"msg_ozd_file_could_not_opened"
>
帳票ファイルを開くことができませんでした。
</string>
</resources>
</resources>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
e9f7660e
...
@@ -1484,4 +1484,5 @@
...
@@ -1484,4 +1484,5 @@
<string
name=
"msg_error_chat_name_has_invalid_character"
>
특수문자 ;/?:@
&
=+$,-_.!~*\'()#\\\"` 는 방 제목에 포함될 수 없습니다.
</string>
<string
name=
"msg_error_chat_name_has_invalid_character"
>
특수문자 ;/?:@
&
=+$,-_.!~*\'()#\\\"` 는 방 제목에 포함될 수 없습니다.
</string>
<string
name=
"msg_error_chat_room_sc_forbidden"
>
사용자 정보를 확인할 수 없습니다. 다시 로그인하시기 바랍니다.
</string>
<string
name=
"msg_error_chat_room_sc_forbidden"
>
사용자 정보를 확인할 수 없습니다. 다시 로그인하시기 바랍니다.
</string>
<string
name=
"msg_error_all_process_delete"
>
모두 삭제 송신에 실패하였습니다.
</string>
<string
name=
"msg_error_all_process_delete"
>
모두 삭제 송신에 실패하였습니다.
</string>
<string
name=
"msg_ozd_file_could_not_opened"
>
장표 파일을 열 수 없습니다.
</string>
</resources>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
e9f7660e
...
@@ -1481,4 +1481,5 @@
...
@@ -1481,4 +1481,5 @@
<string
name=
"msg_error_chat_name_has_invalid_character"
>
The character ;/?:@
&
=+$,-_.!~*\'()#\\\"` cannot be included in the roomname.
</string>
<string
name=
"msg_error_chat_name_has_invalid_character"
>
The character ;/?:@
&
=+$,-_.!~*\'()#\\\"` cannot be included in the roomname.
</string>
<string
name=
"msg_error_chat_room_sc_forbidden"
>
Failed to authenticate. Please login again.
</string>
<string
name=
"msg_error_chat_room_sc_forbidden"
>
Failed to authenticate. Please login again.
</string>
<string
name=
"msg_error_all_process_delete"
>
Failed to send all deletes.
</string>
<string
name=
"msg_error_all_process_delete"
>
Failed to send all deletes.
</string>
<string
name=
"msg_ozd_file_could_not_opened"
>
Report file could not opened.
</string>
</resources>
</resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
View file @
e9f7660e
...
@@ -25,7 +25,6 @@ import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
...
@@ -25,7 +25,6 @@ import jp.agentec.abook.abv.bl.common.exception.NetworkDisconnectedException;
import
jp.agentec.abook.abv.bl.common.log.Logger
;
import
jp.agentec.abook.abv.bl.common.log.Logger
;
import
jp.agentec.abook.abv.ui.common.appinfo.AppDefType
;
import
jp.agentec.abook.abv.ui.common.appinfo.AppDefType
;
import
jp.agentec.abook.abv.ui.common.util.PatternStringUtil
;
import
jp.agentec.abook.abv.ui.common.util.PatternStringUtil
;
import
jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper
;
import
jp.agentec.abook.abv.ui.home.helper.OzdFileHelper
;
import
jp.agentec.abook.abv.ui.home.helper.OzdFileHelper
;
import
jp.agentec.abook.abv.launcher.android.PDFFileProvider
;
import
jp.agentec.abook.abv.launcher.android.PDFFileProvider
;
import
jp.agentec.abook.abv.launcher.android.R
;
import
jp.agentec.abook.abv.launcher.android.R
;
...
@@ -42,7 +41,6 @@ import oz.api.OZReportCommandListener;
...
@@ -42,7 +41,6 @@ import oz.api.OZReportCommandListener;
import
oz.api.OZReportViewer
;
import
oz.api.OZReportViewer
;
import
static
jp
.
agentec
.
abook
.
abv
.
cl
.
util
.
PreferenceUtil
.
getUserPref
;
import
static
jp
.
agentec
.
abook
.
abv
.
cl
.
util
.
PreferenceUtil
.
getUserPref
;
import
static
org
.
chromium
.
base
.
ContextUtils
.
getApplicationContext
;
/**
/**
* ABook Report(仮)ビュアー
* ABook Report(仮)ビュアー
...
@@ -245,7 +243,17 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
...
@@ -245,7 +243,17 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
Logger
.
i
(
TAG
,
"********mOzFilePath = %s"
+
mOzFilePath
);
Logger
.
i
(
TAG
,
"********mOzFilePath = %s"
+
mOzFilePath
);
if
(
mOzFilePath
==
null
)
{
if
(
mOzFilePath
==
null
)
{
ABVToastUtil
.
showMakeText
(
this
,
"ozFilePath null"
,
Toast
.
LENGTH_LONG
);
// 帳票ファイルが存在しない場合は、アラートを表示して前の画面に戻る
ABookAlertDialog
alertDialog
=
AlertDialogUtil
.
createAlertDialog
(
this
,
getResources
().
getString
(
R
.
string
.
error
));
alertDialog
.
setMessage
(
getResources
().
getString
(
R
.
string
.
msg_ozd_file_could_not_opened
));
alertDialog
.
setButton
(
DialogInterface
.
BUTTON_POSITIVE
,
getResources
().
getString
(
R
.
string
.
ok
),
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialog
,
int
which
)
{
ozdCancelProcess
();
// 閉じる
finishActivity
();
}
});
showAlertDialog
(
alertDialog
);
return
;
return
;
}
}
...
...
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