Task #38748【@Form Android】報告入力中はデバイスの「戻る」ボタン機能を無効化

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java

@@ -364,16 +364,10 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
 
 
     @Override
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (mAddReport) {
-                ozdCancelProcess(); // Ozd作業画面を閉じる
-            } else {
-                // 作業追加区分がなしの場合
-                goToMain();  // 一覧画面に遷移
-            }
-        } else {
+        if (keyCode != KeyEvent.KEYCODE_BACK) {
             return super.onKeyUp(keyCode, event);
             return super.onKeyUp(keyCode, event);
         }
         }
+
         return false;
         return false;
     }
     }
 
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -1533,9 +1533,6 @@ public class ContentViewActivity extends ABVContentViewActivity {
 		if (keyCode == KeyEvent.KEYCODE_BACK) {
 		if (keyCode == KeyEvent.KEYCODE_BACK) {
 			Logger.d(TAG, "KeyEvent.KEYCODE_BACK");
 			Logger.d(TAG, "KeyEvent.KEYCODE_BACK");
 
 
-            if (mOperationId != null && mOperationId > -1) {
-				putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
-            }
 			if (isVideoMax) {
 			if (isVideoMax) {
 				videoMaxToDefault();
 				videoMaxToDefault();
 			} else if (isMarking) {
 			} else if (isMarking) {
@@ -1557,7 +1554,9 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				if(isLinkedContent) {
 				if(isLinkedContent) {
 					goToBack();
 					goToBack();
 				} else {
 				} else {
-					moveToBack();
+					if (mOperationId <= 0) { //通常PDFコンテンツのみ戻る機能有効
+						moveToBack();
+					}
 				}
 				}
 			}
 			}
 			return false;
 			return false;

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java

@@ -220,13 +220,12 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity {
     @Override
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (mOperationId != null && mOperationId > -1) {
-                putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
-            }
             if (isLinkedContent) {
             if (isLinkedContent) {
                 goToBack();
                 goToBack();
             } else {
             } else {
-                finishActivity();
+                if (mOperationId <= 0) { //コンテンツ間リンク及び通常リンクコンテンツのみ戻る機能有効
+                    finishActivity();
+                }
             }
             }
         } else {
         } else {
             return super.onKeyUp(keyCode, event);
             return super.onKeyUp(keyCode, event);