Skip to content

A
abook_check
Commit 4b2142f3 by Kim Jinsung
Options

コミュニケーションから「プッシュメッセージ一覧」「プッシュメッセージ送信」削除

parent 315b2da5
Showing with 44 additions and 41 deletions
ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="300dp"
android:minHeight="200dp"
......@@ -46,13 +47,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:orientation="vertical"
android:clickable="false"
android:focusable="false"
android:clickable="false">
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_item_meeting"
android:layout_width="match_parent"
......@@ -60,21 +62,21 @@
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_weight="3"
android:gravity="center"
android:orientation="horizontal"
android:background="@drawable/list_selector_holo_light"
android:focusable="true"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal"
android:visibility="visible">
<ImageView
android:id="@+id/btn_operation_meeting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_weight="0"
android:src="@drawable/ic_communication_meeting"
android:visibility="visible" />
......@@ -92,8 +94,8 @@
android:id="@+id/item3_nextLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_alignParentRight="true"
android:layout_weight="0"
android:src="@drawable/ic_navigation_next_item"
android:visibility="visible" />
......@@ -102,8 +104,8 @@
<View
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
android:background="@android:color/darker_gray" />
<!--
<LinearLayout
android:id="@+id/ll_item_push_message"
android:layout_width="match_parent"
......@@ -210,7 +212,7 @@
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
-->
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
......@@ -1261,21 +1261,21 @@ public class OperationListActivity extends ABVUIActivity {
List<PushMessageDto> pushMessageDtoList = mPushMessageLogic.getAllPushMessageList();
boolean existUnreadFlg = false;
for (PushMessageDto pushMessageDto : pushMessageDtoList) {
if (!pushMessageDto.readingFlg) {
existUnreadFlg = true;
break;
}
}
// boolean existUnreadFlg = false;
// for (PushMessageDto pushMessageDto : pushMessageDtoList) {
// if (!pushMessageDto.readingFlg) {
// existUnreadFlg = true;
// break;
// }
// }
ImageView ivIcon = (ImageView)mCommunicationMenuDialog.findViewById(R.id.btn_push_message_list);
// ImageView ivIcon = (ImageView)mCommunicationMenuDialog.findViewById(R.id.btn_push_message_list);
if (existUnreadFlg) {
ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list_with_badge);
} else {
ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list);
}
// if (existUnreadFlg) {
// ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list_with_badge);
// } else {
// ivIcon.setBackgroundResource(R.drawable.ic_communication_push_message_list);
// }
LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
......@@ -1286,23 +1286,23 @@ public class OperationListActivity extends ABVUIActivity {
}
});
LinearLayout ll_menuItem_push_message = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message);
ll_menuItem_push_message.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
showOperationSelectDialog();
mCommunicationMenuDialog.dismiss();
}
});
LinearLayout ll_menuItem_push_message_list = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message_list);
ll_menuItem_push_message_list.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
showPushMessageListDialog();
mCommunicationMenuDialog.dismiss();
}
});
// LinearLayout ll_menuItem_push_message = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message);
// ll_menuItem_push_message.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// showOperationSelectDialog();
// mCommunicationMenuDialog.dismiss();
// }
// });
// LinearLayout ll_menuItem_push_message_list = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_push_message_list);
// ll_menuItem_push_message_list.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// showPushMessageListDialog();
// mCommunicationMenuDialog.dismiss();
// }
// });
mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
@Override
......
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