Skip to content

A
abook_check
Commit 5a09128d by Lee Munkyeong
Options

43220対応。

parent cfd54b29
Showing with 8 additions and 88 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
...@@ -1648,28 +1648,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1648,28 +1648,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent.putExtra("roomName", dto.roomName); intent.putExtra("roomName", dto.roomName);
} }
intent.setClassName(mContext.getPackageName(), className); intent.setClassName(mContext.getPackageName(), className);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Activity activity2 = null; getCurrentActivity().startActivity(intent);
if (!currentActivityStack.isEmpty()) {
int size = currentActivityStack.size();
for(int i = size-1; i >= 0; i--) {
ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
if (activity instanceof ChatWebViewActivity) {
activity2 = (ChatWebViewActivity) activity;
}
}
}
if (activity2 != null) {
activity2.finish();
activity2.startActivity(intent);
} else {
Activity activity = getCurrentActivity();
if (activity != null) {
activity.startActivity(intent);
}
}
} }
//チャットに入る //チャットに入る
...@@ -1685,28 +1665,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1685,28 +1665,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent.putExtra("loginId", loginId); intent.putExtra("loginId", loginId);
intent.putExtra("shopName", shopName); intent.putExtra("shopName", shopName);
intent.setClassName(mContext.getPackageName(), className); intent.setClassName(mContext.getPackageName(), className);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Activity activity2 = null; getCurrentActivity().startActivity(intent);
if (!currentActivityStack.isEmpty()) {
int size = currentActivityStack.size();
for(int i = size-1; i >= 0; i--) {
ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
if (activity instanceof ChatWebViewActivity) {
activity2 = (ChatWebViewActivity) activity;
}
}
}
if (activity2 != null) {
activity2.finish();
activity2.startActivity(intent);
} else {
Activity activity = getCurrentActivity();
if (activity != null) {
activity.startActivity(intent);
}
}
} }
// プシュメッセージからチャットに入る // プシュメッセージからチャットに入る
...@@ -1725,28 +1685,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1725,28 +1685,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent.putExtra("roomName", roomName); intent.putExtra("roomName", roomName);
intent.setClassName(mContext.getPackageName(), className); intent.setClassName(mContext.getPackageName(), className);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Activity activity2 = null; getCurrentActivity().startActivity(intent);
if (!currentActivityStack.isEmpty()) {
int size = currentActivityStack.size();
for(int i = size-1; i >= 0; i--) {
ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
if (activity instanceof ChatWebViewActivity) {
activity2 = (ChatWebViewActivity) activity;
}
}
}
if (activity2 != null) {
activity2.finish();
activity2.startActivity(intent);
} else {
Activity activity = getCurrentActivity();
if (activity != null) {
activity.startActivity(intent);
}
}
} }
/** /**
...@@ -1990,28 +1930,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve ...@@ -1990,28 +1930,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent.putExtra("roomName", roomName); intent.putExtra("roomName", roomName);
intent.putExtra("roomType", roomType); intent.putExtra("roomType", roomType);
intent.setClassName(mContext.getPackageName(), className); intent.setClassName(mContext.getPackageName(), className);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Activity activity2 = null; getCurrentActivity().startActivity(intent);
if (!currentActivityStack.isEmpty()) {
int size = currentActivityStack.size();
for (int i = size - 1; i >= 0; i--) {
ABVAuthenticatedActivity activity = currentActivityStack.elementAt(i);
if (activity instanceof ChatWebViewActivity) {
activity2 = (ChatWebViewActivity) activity;
}
}
}
if (activity2 != null) {
activity2.finish();
activity2.startActivity(intent);
} else {
Activity activity = getCurrentActivity();
if (activity != null) {
activity.startActivity(intent);
}
}
} }
/** /**
......
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