Commit ba879da5 by Lee Munkyeong

HotFix

parent 875ce2d7
...@@ -75,6 +75,7 @@ import jp.agentec.abook.abv.bl.dto.ChatGroupDto; ...@@ -75,6 +75,7 @@ import jp.agentec.abook.abv.bl.dto.ChatGroupDto;
import jp.agentec.abook.abv.bl.dto.ChatMessageDto; import jp.agentec.abook.abv.bl.dto.ChatMessageDto;
import jp.agentec.abook.abv.bl.dto.ChatRoomDto; import jp.agentec.abook.abv.bl.dto.ChatRoomDto;
import jp.agentec.abook.abv.bl.dto.PushMessageDto; import jp.agentec.abook.abv.bl.dto.PushMessageDto;
import jp.agentec.abook.abv.bl.dto.ShopMemberDto;
import jp.agentec.abook.abv.bl.logic.AbstractLogic; import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.CommunicationLogic; import jp.agentec.abook.abv.bl.logic.CommunicationLogic;
import jp.agentec.abook.abv.cl.util.PreferenceUtil; import jp.agentec.abook.abv.cl.util.PreferenceUtil;
...@@ -170,6 +171,10 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -170,6 +171,10 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
private void setupDefaultChatWebViewURL() { private void setupDefaultChatWebViewURL() {
//ネットワークがない場合専用のページを表示。 //ネットワークがない場合専用のページを表示。
ShopMemberDto myInfo = communicationLogic.getMyShopMemberDto();
if (myInfo != null) {
shopMemberId = myInfo.shopMemberId;
}
chatWebviewUrl = NETWORK_ERROR_PLACE_HOLDER; chatWebviewUrl = NETWORK_ERROR_PLACE_HOLDER;
if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) { if (!ABVEnvironment.getInstance().networkAdapter.isNetworkConnected()) {
Logger.d("DEVICE_NOT_CONNECTED_NETWORK:"); Logger.d("DEVICE_NOT_CONNECTED_NETWORK:");
...@@ -195,6 +200,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -195,6 +200,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
updateMyInfoFromServer(); updateMyInfoFromServer();
updateAllGroupInfo(); updateAllGroupInfo();
updateFavoriteInfo(); updateFavoriteInfo();
shopMemberId = communicationLogic.getMyShopMemberDto().shopMemberId;
closeProgressPopup(); closeProgressPopup();
} catch (Exception e) { } catch (Exception e) {
Logger.d("Update error"); Logger.d("Update error");
...@@ -204,7 +210,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity { ...@@ -204,7 +210,6 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
} }
private void setupChatWebView() { private void setupChatWebView() {
shopMemberId = communicationLogic.getMyShopMemberDto().shopMemberId;
mChatWebView = findViewById(R.id.chatWebview2); mChatWebView = findViewById(R.id.chatWebview2);
mChatWebView.setOverScrollMode(View.OVER_SCROLL_NEVER); //オーバースクロールしない。 mChatWebView.setOverScrollMode(View.OVER_SCROLL_NEVER); //オーバースクロールしない。
mChatWebView.setVerticalScrollBarEnabled(false); //スクロールバーを消す。 mChatWebView.setVerticalScrollBarEnabled(false); //スクロールバーを消す。
......
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