Skip to content

A
abook_check
Commit 98b4ca51 by Takuya Ogawa
Options

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

1.1.300_chat_prototype

See merge request !39
parents 7a39bdf4 c3e6f7d0
Showing with 9 additions and 4 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
...@@ -61,8 +61,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -61,8 +61,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
chatWebviewUrl = intent.getStringExtra("chatWebviewUrl"); chatWebviewUrl = intent.getStringExtra("chatWebviewUrl");
String sid = intent.getStringExtra("sid"); String sid = intent.getStringExtra("sid");
Long roomId = intent.getLongExtra("roomId", 0); Long roomId = intent.getLongExtra("roomId", 0);
String loginId = intent.getStringExtra("loginId");
String roomName = intent.getStringExtra("roomName"); String roomName = intent.getStringExtra("roomName");
String loginId = intent.getStringExtra("loginId");
String shopName = intent.getStringExtra("shopName");
// チャットViewのクローズボタン // チャットViewのクローズボタン
final ImageButton imageButton = findViewById(R.id.chat_close_btn); final ImageButton imageButton = findViewById(R.id.chat_close_btn);
...@@ -88,13 +89,13 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -88,13 +89,13 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
mChatWebView.addJavascriptInterface(jsInf, "android"); mChatWebView.addJavascriptInterface(jsInf, "android");
//ページをロード //ページをロード
if(roomId != 0 && roomName != null) { // by push message 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 else { // Chat
if (lastRoomName.length() > 0 && lastRoomId.length() > 0) { 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 { } 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 ...@@ -1551,7 +1551,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
String sid = ABVDataCache.getInstance().getMemberInfo().sid; String sid = ABVDataCache.getInstance().getMemberInfo().sid;
intent.putExtra("sid", sid); intent.putExtra("sid", sid);
String loginId = ABVDataCache.getInstance().getMemberInfo().loginId; String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
String shopName = ABVDataCache.getInstance().getUrlPath();
intent.putExtra("loginId", loginId); intent.putExtra("loginId", loginId);
intent.putExtra("shopName", shopName);
if(dto != null) if(dto != null)
{ {
intent.putExtra("roomId",dto.roomId); intent.putExtra("roomId",dto.roomId);
...@@ -1573,7 +1575,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1573,7 +1575,9 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
String sid = ABVDataCache.getInstance().getMemberInfo().sid; String sid = ABVDataCache.getInstance().getMemberInfo().sid;
intent.putExtra("sid", sid); intent.putExtra("sid", sid);
String loginId = ABVDataCache.getInstance().getMemberInfo().loginId; String loginId = ABVDataCache.getInstance().getMemberInfo().loginId;
String shopName = ABVDataCache.getInstance().getUrlPath();
intent.putExtra("loginId", loginId); intent.putExtra("loginId", loginId);
intent.putExtra("shopName", shopName);
intent.setClassName(mContext.getPackageName(), className); intent.setClassName(mContext.getPackageName(), className);
Activity activity = getCurrentActivity(); Activity activity = getCurrentActivity();
if (activity != null) { if (activity != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment