Merge branch 'features/1.1.300_chat_prototype' into 'features/1.1.300_chat'

1.1.300_chat_prototype

See merge request !39

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

@@ -61,8 +61,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         chatWebviewUrl = intent.getStringExtra("chatWebviewUrl");
         String sid = intent.getStringExtra("sid");
         Long roomId = intent.getLongExtra("roomId", 0);
-        String loginId = intent.getStringExtra("loginId");
         String roomName = intent.getStringExtra("roomName");
+        String loginId = intent.getStringExtra("loginId");
+        String shopName = intent.getStringExtra("shopName");
 
         // チャットViewのクローズボタン
         final ImageButton imageButton = findViewById(R.id.chat_close_btn);
@@ -88,13 +89,13 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         mChatWebView.addJavascriptInterface(jsInf, "android");
         //ページをロード
         if(roomId != 0 && roomName != null) {  // by push message
-            mChatWebView.loadUrl(chatWebviewUrl + "?sid=" + sid +  "&roomId=" + roomId + "&roomName=" + roomName + "&loginId=" + loginId);
+            mChatWebView.loadUrl(chatWebviewUrl + "?sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + roomId + "&roomName=" + roomName);
         }
         else {  // Chat
             if (lastRoomName.length() > 0 && lastRoomId.length() > 0) {
-                mChatWebView.loadUrl(chatWebviewUrl + "?sid=" + sid +  "&roomId=" + lastRoomId + "&roomName=" + lastRoomName + "&loginId=" + loginId);
+                mChatWebView.loadUrl(chatWebviewUrl + "?sid=" + sid + "&loginId=" + loginId +  "&shopName=" + shopName +  "&roomId=" + lastRoomId + "&roomName=" + lastRoomName);
             } else {
-                mChatWebView.loadUrl(chatWebviewUrl + "?sid=" + sid + "&loginId=" + loginId);
+                mChatWebView.loadUrl(chatWebviewUrl + "?sid=" + sid + "&loginId=" + loginId + "&shopName=" + shopName);
             }
         }
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -1551,7 +1551,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         String sid = ABVDataCache.getInstance().getMemberInfo().sid;
         intent.putExtra("sid", sid);
         String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+        String shopName = ABVDataCache.getInstance().getUrlPath();
         intent.putExtra("loginId", loginId);
+        intent.putExtra("shopName", shopName);
         if(dto != null)
         {
             intent.putExtra("roomId",dto.roomId);
@@ -1573,7 +1575,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
         String sid = ABVDataCache.getInstance().getMemberInfo().sid;
         intent.putExtra("sid", sid);
         String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
+        String shopName = ABVDataCache.getInstance().getUrlPath();
         intent.putExtra("loginId", loginId);
+        intent.putExtra("shopName", shopName);
         intent.setClassName(mContext.getPackageName(), className);
         Activity activity = getCurrentActivity();
         if (activity != null) {