Merge branch '1.2.360_develop_mk_local' into 'features/1.2.360_develop_mk'

既存のバグ修正。

See merge request !76

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingActivity.java

@@ -108,6 +108,11 @@ public class ABookSettingActivity extends PreferenceActivity {
 
 	public void stopContentRefresher() {
 		ABVUIActivity activity = ActivityHandlingHelper.getInstance().getPreviousOfSettingActivity();
+		if (activity == null) {
+			ParentWebViewActivity	chatActivity = ActivityHandlingHelper.getInstance().getPreviousForChatOfSettingActivity();
+			chatActivity.stopContentRefresher();
+		}else{
 			activity.stopContentRefresher();
 		}
+	}
 }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java

@@ -98,6 +98,15 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         settings.setAppCacheEnabled(false);
         settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
 
+        settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        settings.setDomStorageEnabled(true);
+        settings.setDatabaseEnabled(true);
+        settings.setMediaPlaybackRequiresUserGesture(false);
+        settings.setAllowFileAccess(true);
+        settings.setUseWideViewPort(true);
+        settings.setAllowContentAccess(true);
+        settings.setAllowFileAccessFromFileURLs(true);
+        settings.setAllowUniversalAccessFromFileURLs(true);
         if (Logger.isDebugEnabled()) {
             mChatWebView.setWebContentsDebuggingEnabled(true); //デバッグモード（chromeからinspect可)
         }
@@ -197,7 +206,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                         // サーバと接続された場合、チャット画面を閉じる
 
                         if (tempMessage.equals(getString(R.string.msg_error_chat_disconnected)) || tempMessage.equals(getString(R.string.msg_error_chat_room_sc_forbidden))) {
-                            mChatWebView.loadUrl("javascript:leaveRoom()");
+                            mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
                             finish();
                         } else if (tempMessage.equals(getString(R.string.msg_error_chat_join))) {
                             getLogin();
@@ -281,7 +290,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
             @Override
             public void onReceive(Context context, Intent intent) {
                 if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
-                    mChatWebView.loadUrl("javascript:dismissLoadingIndicator()");
+                    mChatWebView.loadUrl("javascript:CHAT_UI.dismissLoadingIndicator()");
                 }
             }
         };
@@ -307,7 +316,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                 // イメージをダウンロードする(png, jpg, jpeg, mp4, mov)
                 if (url.toLowerCase().endsWith(".png") || url.toLowerCase().endsWith(".jpg") || url.toLowerCase().endsWith(".jpeg")
                         || url.toLowerCase().endsWith(".mov") || url.toLowerCase().endsWith(".mp4")) {
-                    view.loadUrl("javascript:showLoadingIndicator()");
+                    view.loadUrl("javascript:CHAT_UI.showLoadingIndicator()");
                     DownloadManager mdDownloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
                     DownloadManager.Request request = new DownloadManager.Request(
                             Uri.parse(url));
@@ -332,7 +341,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         mOperationRelatedContentButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mChatWebView.loadUrl("javascript:leaveRoom()");
+                mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
                 finish();
                 showCommonContent();
             }
@@ -581,7 +590,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
      * 作業一覧へ遷移
      */
     private void backToHome() {
-        mChatWebView.loadUrl("javascript:leaveRoom()");
+        mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
         finish();
         Intent intent = new Intent();
         intent.setClass(ChatWebviewActivity.this, OperationListActivity.class);
@@ -613,7 +622,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
 
     // 設定画面へ遷移
     public void onClickSetting(View v) {
-        mChatWebView.loadUrl("javascript:leaveRoom()");
+        mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
         finish();
         showSetting();
     }

gradle.properties

@@ -38,12 +38,12 @@ app_versioncode=1
 # abvEnvironments.xml
 
 #cms server
-acms_address=https://abook189.abook.bz/acms
-download_server_address=https://abook189.abook.bz/acms
+acms_address=https://chatdev2.abook.bz/acms
+download_server_address=https://chatdev2.abook.bz/acms
 
 #syncview server
-websocket_server_http_url=https://abookplus.agentec.jp/v1
-websocket_server_ws_url=wss://abookplus.agentec.jp/v1
+websocket_server_http_url=https://chatdev2.abook.bz/v1
+websocket_server_ws_url=wss://chatdev2.abook.bz/v1
 #WebSocket debug出力
 websocket_debug=false