Bug #43097【@Form】Android デンソーBHT1600でのアプリ強制終了について

69991e8c · Kim Jinsung · 9de76191 · 69991e8c · 69991e8c · 69991e8c
Commit 69991e8c authored Jun 07, 2021 by Kim Jinsung
3 changed files
--- a/ABVJE_UI_Android/res/layout/ac_html_xwalk.xml
+++ b/ABVJE_UI_Android/res/layout/ac_html_xwalk.xml
@@ -184,12 +184,24 @@
                android:background="@drawable/ic_operation_task_list"
                android:layout_marginRight="10dp"
                android:visibility="gone" />
+            <ImageButton
+                android:id="@+id/btn_print"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_centerInParent="true"
+                android:layout_toLeftOf="@+id/btn_help"
+                android:layout_marginRight="5dp"
+                android:background="@drawable/btn_operation_print_white"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
+                android:visibility="gone" />
            <ImageButton
                android:id="@+id/btn_help"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:background="@drawable/ic_operation_help"
+                android:layout_marginTop="6dp"
                android:layout_marginRight="10dp"
                android:visibility="gone"
                android:onClick="onClickShowHelpView"/>

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
 package jp.agentec.abook.abv.ui.viewer.activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -35,42 +33,24 @@ import org.apache.http.impl.client.DefaultHttpClient;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Date;
 import jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON;
-import jp.agentec.abook.abv.bl.acms.type.AcmsApis;
 import jp.agentec.abook.abv.bl.acms.type.DownloadStatusType;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.CommonExecutor;
 import jp.agentec.abook.abv.bl.common.Constant;
 import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
 import jp.agentec.abook.abv.bl.common.log.Logger;
-import jp.agentec.abook.abv.bl.data.ABVDataCache;
-import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
-import jp.agentec.abook.abv.bl.data.dao.ContentDao;
-import jp.agentec.abook.abv.bl.data.dao.OperationDao;
 import jp.agentec.abook.abv.bl.download.ContentDownloader;
 import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
-import jp.agentec.abook.abv.bl.dto.ContentDto;
-import jp.agentec.abook.abv.bl.dto.OperationDto;
-import jp.agentec.abook.abv.bl.logic.AbstractLogic;
-import jp.agentec.abook.abv.bl.logic.ContractLogic;
 import jp.agentec.abook.abv.cl.util.ContentLogUtil;
-import jp.agentec.abook.abv.cl.util.LocationManagerUtil;
-import jp.agentec.abook.abv.cl.util.PreferenceUtil;
 import jp.agentec.abook.abv.launcher.android.R;
-import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
-import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.DefPrefKey;
 import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
 import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
-import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
-import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
 import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
-import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
 import jp.agentec.abook.abv.ui.viewer.view.CheckFormWebview;
-import jp.agentec.abook.abv.ui.viewer.view.CheckFormXWalkWebview;
 //TODO: later 遠隔連動関連はContentView,NoPdfViewと共通しているので要集約
 public class HTMLWebViewActivity extends ParentWebViewActivity {
@@ -379,15 +359,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
            }
        });
-        // 簡易帳票印刷ボタン
-        printButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Logger.d(TAG, "Print");
-                showPrintTargetSelect();
-            }
-        });
        downloadButton = (ImageButton) findViewById(R.id.btn_download);
        downloadButton.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -732,37 +703,4 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
        }
        mUploadMessage = null;
    }
-    // 簡易帳票印刷対象選択画面表示
-    private void showPrintTargetSelect() {
-        if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
-            showDisConnectNetworkDialog();
-            return;
-        }
-        Intent intent = new Intent();
-        intent.setClass(HTMLWebViewActivity.this, OnlineHTMLWebViewActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision));
-        intent.putExtra("operationId", mOperationId);
-        startActivity(intent, NaviConsts.Right);
-    }
-    /**
-     * インターネットが繋がってない場合のダイアログ表示
-     */
-    private void showDisConnectNetworkDialog() {
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                final ABookAlertDialog messageDialog = AlertDialogUtil.createAlertDialog(HTMLWebViewActivity.this, R.string.app_name);
-                messageDialog.setMessage(getString(R.string.msg_network_offline));
-                messageDialog.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        messageDialog.dismiss();
-                    }
-                });
-                messageDialog.show();
-            }
-        });
-    }
 }
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
@@ -3,6 +3,7 @@ package jp.agentec.abook.abv.ui.viewer.activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.Uri;
 import android.view.KeyEvent;
 import android.view.View;
@@ -17,6 +18,7 @@ import java.util.HashMap;
 import java.util.Map;
 import jp.agentec.abook.abv.bl.acms.client.json.content.ContentJSON;
+import jp.agentec.abook.abv.bl.acms.type.AcmsApis;
 import jp.agentec.abook.abv.bl.acms.type.OperationType;
 import jp.agentec.abook.abv.bl.common.ABVEnvironment;
 import jp.agentec.abook.abv.bl.common.Callback;
@@ -41,6 +43,7 @@ import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
 import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
 import jp.agentec.abook.abv.ui.common.constant.ErrorCode;
 import jp.agentec.abook.abv.ui.common.constant.ErrorMessage;
+import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
 import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
 import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.abook.abv.ui.common.util.PatternStringUtil;
@@ -86,7 +89,14 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity {
        btnWebForward = (Button) findViewById(R.id.btnWebForward);
        m_progress = (ProgressBar) findViewById(R.id.refresh_prog);
        printButton = (ImageButton) findViewById(R.id.btn_print);
+        // 簡易帳票印刷ボタン
+        printButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Logger.d(TAG, "Print");
+                showPrintTargetSelect();
+            }
+        });
        btnLinkOriginalBack = (Button) findViewById(R.id.btn_link_original_back);
        if (!isLinkedContent) {
@@ -500,4 +510,38 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity {
        }
        return super.dispatchKeyEvent(event);
    }
+    /**
+     * 簡易帳票印刷対象選択画面表示
+     */
+    private void showPrintTargetSelect() {
+        if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
+            showDisConnectNetworkDialog();
+            return;
+        }
+        Intent intent = new Intent();
+        intent.setClass(ParentWebViewActivity.this, OnlineHTMLWebViewActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision));
+        intent.putExtra("operationId", mOperationId);
+        startActivity(intent, NaviConsts.Right);
+    }
+    /**
+     * インターネットが繋がってない場合のダイアログ表示
+     */
+    private void showDisConnectNetworkDialog() {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                final ABookAlertDialog messageDialog = AlertDialogUtil.createAlertDialog(ParentWebViewActivity.this, R.string.app_name);
+                messageDialog.setMessage(getString(R.string.msg_network_offline));
+                messageDialog.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                        messageDialog.dismiss();
+                    }
+                });
+                messageDialog.show();
+            }
+        });
+    }
 }