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
0f385278
Commit
0f385278
authored
Aug 06, 2020
by
yuichiro ogawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
簡易帳票関連の修正依頼対応(アイコンは未差し替え)
parent
c43e2abe
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
9 deletions
+49
-9
ABVJE_Res_Default_Android/res/drawable/btn_history_back_for_webview.xml
+6
-0
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-1
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+1
-1
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-1
ABVJE_UI_Android/res/layout/ac_online_html_webview.xml
+22
-5
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/OnlineHTMLWebViewActivity.java
+18
-1
No files found.
ABVJE_Res_Default_Android/res/drawable/btn_history_back_for_webview.xml
0 → 100644
View file @
0f385278
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_enabled=
"true"
android:drawable=
"@drawable/ic_history_back_off"
/>
<item
android:state_enabled=
"false"
android:drawable=
"@drawable/ic_history_back_disable"
/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
0f385278
...
...
@@ -534,7 +534,7 @@
<string
name=
"title_all_operation"
>
全作業
</string>
<!-- ABookCheck 1.2.3 -->
<string
name=
"title_quick_report_output"
>
簡易帳票出力
</string>
<string
name=
"title_quick_report_output"
>
帳票確認
</string>
<!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0-->
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
0f385278
...
...
@@ -536,7 +536,7 @@
<string
name=
"title_all_operation"
>
전체 작업
</string>
<!-- ABookCheck 1.2.3 -->
<string
name=
"title_quick_report_output"
>
간이 장표 출력
</string>
<string
name=
"title_quick_report_output"
>
장표 확인
</string>
<!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0-->
...
...
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
0f385278
...
...
@@ -540,7 +540,7 @@
<string
name=
"title_all_operation"
>
All
</string>
<!-- ABookCheck 1.2.3 -->
<string
name=
"title_quick_report_output"
>
Simple form output
</string>
<string
name=
"title_quick_report_output"
>
Report confirmation
</string>
<!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0-->
...
...
ABVJE_UI_Android/res/layout/ac_online_html_webview.xml
View file @
0f385278
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/LinearLayout1"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
@@ -12,22 +13,38 @@
android:background=
"@color/app_color"
android:minHeight=
"50dp"
>
<Button
android:id=
"@+id/
close
Btn"
<
Image
Button
android:id=
"@+id/
back
Btn"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"
fals
e"
android:layout_alignParentLeft=
"
tru
e"
android:layout_alignParentStart=
"true"
android:layout_alignTop=
"@+id/linearLayout"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"5dp"
android:layout_marginStart=
"5dp"
android:background=
"@null"
android:src=
"@drawable/btn_history_back_for_webview"
/>
<Button
android:id=
"@+id/closeBtn"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentEnd=
"true"
android:layout_alignParentLeft=
"false"
android:layout_alignParentStart=
"false"
android:layout_centerVertical=
"true"
android:layout_marginEnd=
"5dp"
android:layout_marginRight=
"5dp"
android:background=
"@drawable/btn_close"
android:contentDescription=
"@string/cont_desc"
/>
android:contentDescription=
"@string/cont_desc"
android:layout_alignParentRight=
"true"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerInParent=
"true"
>
android:layout_centerInParent=
"true"
android:id=
"@+id/linearLayout"
>
<TextView
android:id=
"@+id/title"
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/OnlineHTMLWebViewActivity.java
View file @
0f385278
...
...
@@ -14,6 +14,7 @@ import android.webkit.WebSettings;
import
android.webkit.WebView
;
import
android.webkit.WebViewClient
;
import
android.widget.Button
;
import
android.widget.ImageButton
;
import
android.widget.TextView
;
import
android.widget.Toast
;
...
...
@@ -34,6 +35,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
private
WebView
webView
;
private
Button
closeButton
;
private
ImageButton
backButton
;
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
...
...
@@ -59,7 +61,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
OnlineHTMLWebViewLogic
logic
=
AbstractLogic
.
getLogic
(
OnlineHTMLWebViewLogic
.
class
);
webView
.
postUrl
(
url
,
logic
.
getPostData
(
param
));
// *****
戻
るボタン
// *****
閉じ
るボタン
closeButton
=
findViewById
(
R
.
id
.
closeBtn
);
closeButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
...
...
@@ -67,6 +69,15 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
finishActivity
();
}
});
// ***** 戻るボタン
backButton
=
findViewById
(
R
.
id
.
backBtn
);
backButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
webView
.
goBack
();
}
});
}
private
void
setWebView
()
{
...
...
@@ -98,6 +109,12 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
Logger
.
v
(
TAG
,
"shouldOverrideUrlLoading: %s"
,
url
);
return
false
;
}
@Override
public
void
onPageFinished
(
WebView
view
,
String
url
)
{
// ***** 戻るボタンの活性制御
backButton
.
setEnabled
(
webView
.
canGoBack
());
super
.
onPageFinished
(
view
,
url
);
}
});
webView
.
setDownloadListener
(
new
DownloadListener
()
{
...
...
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