Merge branch 'features/Modify-to-include-footer-menu-in-html' into 'features/1.2.360_develop'

Modify footer toolbar

See merge request !78

ABVJE_UI_Android/res/layout/chat_webview.xml

@@ -50,70 +50,5 @@
 
 
     </FrameLayout>
     </FrameLayout>
 
 
-    <LinearLayout
-        android:id="@+id/toolbar2"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@drawable/bottom_toolbar_border"
-        android:minHeight="50dp"
-        android:visibility="visible">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:gravity="center">
-
-            <ImageButton
-                android:id="@+id/btn_operation_home"
-                style="@style/ToolBarIcon"
-                android:src="@drawable/btn_operation_home" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:gravity="center">
-
-            <ImageButton
-                android:id="@+id/btn_common_content"
-                style="@style/ToolBarIcon"
-                android:src="@drawable/btn_common_content" />
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:gravity="center">
-
-            <ImageButton
-                android:id="@+id/btn_communication_menu"
-                style="@style/ToolBarIcon"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_communication_menu" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:gravity="center">
-
-            <ImageButton
-                android:id="@+id/btn_setting"
-                style="@style/ToolBarIcon"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_operation_setting"
-                android:onClick="onClickSetting" />
-        </LinearLayout>
 
 
-    </LinearLayout>
 </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

@@ -332,25 +332,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
             }
             }
         });
         });
 
 
-        // ホームボタン（作業一覧へ遷移ボタン）
-        mOperationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
-        // 共通資料ボタン
-        mOperationRelatedContentButton = (ImageButton) findViewById(R.id.btn_common_content);
-
-        // 共通関連資料ボタン
-        mOperationRelatedContentButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
-                finish();
-                showCommonContent();
-            }
-        });
-        communicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
-
-        // Toolbar
-        settingBottomToolbar();
-        setOnButtonEvent();
     }
     }
 
 
     @Override
     @Override
@@ -584,6 +565,43 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
             });
             });
         }
         }
 
 
+        @JavascriptInterface
+        public void goHome() {
+            mChatWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    backToHome();
+                }
+            });
+        }
+
+        @JavascriptInterface
+        public void openOperationRelatedContent() {
+            mChatWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    showCommonContent();
+                }
+            });
+        }
+
+        @JavascriptInterface
+        public void openCommunication() {
+            showCommunicationMenuDialog();
+        }
+
+        @JavascriptInterface
+        public void openSetting() {
+            mChatWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    mChatWebView.loadUrl("javascript:CHAT.leaveRoom()");
+                    finish();
+                    showSetting();
+                }
+            });
+        }
+
     }
     }
 
 
     /**
     /**