Merge remote-tracking branch 'origin/features/1.2.300' into features/1.2.0_ogawa-y

ABVJE_UI_Android/src/com/theta/helper/ThetaHelper.java

@@ -253,8 +253,45 @@ public class ThetaHelper {
             wifiManager.disableNetwork(wifi_inf.getNetworkId());
             wifiManager.disableNetwork(wifi_inf.getNetworkId());
             wifiManager.disconnect();
             wifiManager.disconnect();
         }
         }
+        //通常Wi-Fi再接続処理
+//        boolean disconnect = true;
+//        for (WifiConfiguration configuration : wifiManager.getConfiguredNetworks()) {
+//            if (wifi_inf.getNetworkId() == configuration.networkId) {
+//                String packageName = mContext.getPackageName();
+//                int result = configuration.toString().indexOf(packageName);
+//                if (result != -1) {
+//                    disconnect = false;
+//                    break;
+//                }
+//            }
+//        }
+//        if (disconnect) {
+//            //一番近くにあるの通常Wi-Fiに接続
+//            List<ScanResult> results = wifiManager.getScanResults();
+//            int level = 0;
+//            int networkId = -1;
+//            for (WifiConfiguration configuration : wifiManager.getConfiguredNetworks()) {
+//                int index = configuration.SSID.indexOf(ABookValues.THETA_MODEL_NAME_THETA);
+//                if (index != -1) {
+//                    continue;
+//                }
+//                for (ScanResult scanResult : results) {
+//                    if (configuration.SSID.indexOf(scanResult.SSID) != -1) {
+//                        if (level == 0 || WifiManager.compareSignalLevel(level, scanResult.level) < 0) {
+//                            level = scanResult.level;
+//                            networkId = configuration.networkId;
+//                        }
+//                        break;
+//                    }
+//                }
+//            }
+//            if (networkId != -1) {
+//                wifiManager.enableNetwork(networkId, true);
+//            }
+//        }
     }
     }
 
 
+
     /**
     /**
      * ConnectivityManagerを利用してアプリ(プロセス)全体のネットワークを設定します。
      * ConnectivityManagerを利用してアプリ(プロセス)全体のネットワークを設定します。
      */
      */

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

@@ -364,14 +364,7 @@ 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

@@ -1535,10 +1535,6 @@ public class ContentViewActivity extends ABVContentViewActivity {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		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) {
@@ -1560,7 +1556,9 @@ public class ContentViewActivity extends ABVContentViewActivity {
 				if(isLinkedContent) {
 				if(isLinkedContent) {
 					goToBack();
 					goToBack();
 				} else {
 				} else {
-					moveToBack();
+					if (mOperationId == -1) { //通常PDFコンテンツのみ戻る機能有効
+						moveToBack();
+					}
 				}
 				}
 			}
 			}
 			return false;
 			return false;

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

@@ -222,13 +222,12 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
             if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
             if (mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
                 showConfirmSavePanoEdit();
                 showConfirmSavePanoEdit();
             } else {
             } else {
-                if (mOperationId != null && mOperationId > -1) {
-                    putUserPref(AppDefType.UserPrefKey.SYNC_TARGET_OPERATION_ID, mOperationId);
-                }
                 if (isLinkedContent) {
                 if (isLinkedContent) {
                     goToBack();
                     goToBack();
                 } else {
                 } else {
-                    finishActivity();
+                    if (mOperationId == -1) { //通常リンクコンテンツのみ戻る機能有効
+                        finishActivity();
+                    }
                 }
                 }
             }
             }
         } else {
         } else {