Skip to content

A
abook_check
Commit 5a8a3b39 by onuma
Options

#41843 @Form I/O帳票Android UI修正

parent 781669e0
Showing with 625 additions and 263 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ServiceOption.java
......@@ -160,5 +160,11 @@ public interface ServiceOption {
* 作業種別：N(通常）、Y（作業種別毎に絞り込み可能なボタン・画面表示）
*/
int OperationGroupMaster = 175;
/**
* I/O帳票使用
* 利用しない：N(通常）、利用する：Y
*/
int UsableIOReport = 186;
}
}
\ No newline at end of file
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java
......@@ -361,6 +361,14 @@ public class ServiceOption {
public boolean isOperationGroupMaster() {
return isServiceOptionEnable(ServiceOptionId.OperationGroupMaster);
}
/**
* I/O帳票使用のサービスオプション情報取得
* @return
*/
public boolean isUnableIOReport() {
return isServiceOptionEnable(ServiceOptionId.UsableIOReport);
}
}
public void setDiffMinFromUTC(String timeZone) {
......
ABVJE_Res_Default_Android/res/drawable/bottom_toolbar_border.xml 0 → 100644
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<stroke
android:width="1px"
android:color="#000000" />
<solid android:color="@color/bottom_toolbar"/>
</shape>
ABVJE_Res_Default_Android/res/drawable/btn_common_content.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_enabled="false"
android:drawable="@drawable/home_common_content_icon_off"/>
<item
android:drawable="@drawable/home_common_content_icon_on"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_operation_home.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_enabled="false"
android:drawable="@drawable/home_icon_off"/>
<item
android:drawable="@drawable/home_icon_on"/>
</selector>
ABVJE_Res_Default_Android/res/drawable/btn_operation_print.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:drawable="@drawable/home_print_on"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/drawable/btn_operation_search.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_enabled="false"
android:drawable="@drawable/ic_operation_search_off"/>
<item
android:drawable="@drawable/ic_operation_search_on"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/colors.xml
......@@ -89,4 +89,5 @@
<color name="operation_related_content_new_mark">#ff0000</color>
<color name="operation_bg">#FFFFFF</color>
<color name="bottom_toolbar">#F2F2F2</color>
</resources>
\ No newline at end of file
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
......@@ -30,7 +30,7 @@
android:layout_toRightOf="@+id/btn_view_mode"
android:onClick="onClickOperationFilterList"
android:src="@drawable/ic_filter" />
<!-- カテゴリ選択機能追加 -->
<ImageButton
android:id="@+id/btn_category_location"
style="@style/ToolBarIcon"
......@@ -39,7 +39,6 @@
android:layout_toRightOf="@+id/icon_filter"
android:onClick="onClickGroupLocationByTablet"
android:src="@drawable/ic_category_off" />
<!-- ここまで -->
<TextView
android:id="@+id/title"
......@@ -53,85 +52,116 @@
android:textSize="15dp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/search_result"
<ImageButton
android:id="@+id/btn_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:layout_toLeftOf="@+id/btn_communication_menu"
android:background="@drawable/radius_frame"
android:gravity="center"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:text="@string/search_result"
android:textColor="@color/app_color"
android:textSize="@dimen/app_normal_text_size"
android:textStyle="bold" />
</LinearLayout>
android:layout_toLeftOf="@+id/btn_help"
android:background="@drawable/btn_operation_search"
android:contentDescription="@string/list" />
<ImageButton
android:id="@+id/btn_communication_menu"
android:id="@+id/btn_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_search"
android:background="@drawable/ic_communication_menu" />
android:background="@drawable/ic_operation_help"
android:onClick="onClickShowHelpView" />
</RelativeLayout>
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/content_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_weight="1"></FrameLayout>
<ImageButton
android:id="@+id/btn_search"
<LinearLayout
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bottom_toolbar_border"
android:minHeight="50dp"
android:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_sub_menu"
android:background="@drawable/ic_operation_search"
android:contentDescription="@string/list" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_sub_menu"
<ImageButton
android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon"
android:src="@drawable/btn_operation_home" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_common_content"
android:background="@drawable/ic_operation_setting"
android:onClick="onClickOperationSubMenu" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_common_content"
<ImageButton
android:id="@+id/btn_common_content"
style="@style/ToolBarIcon"
android:src="@drawable/btn_common_content" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_help"
android:background="@drawable/ic_common_content_off" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_help"
<ImageButton
android:id="@+id/btn_communication_menu"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_communication_menu" />
</LinearLayout>
<LinearLayout
android:id="@+id/print_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:background="@drawable/ic_operation_help"
android:onClick="onClickShowHelpView" />
</RelativeLayout>
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/operation_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageButton
android:id="@+id/btn_operation_print"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:scaleX="0.6"
android:scaleY="0.6"
android:src="@drawable/btn_operation_print" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_setting"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_operation_setting"
android:onClick="onClickSetting" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
......@@ -4,12 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical"
android:background="@color/basic_white1"
android:clickable="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
......@@ -25,22 +27,6 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
android:gravity="left|center" >
<ImageButton
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_operation_home"
android:contentDescription="@null" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center" >
......@@ -141,5 +127,89 @@
android:divider="@null" />
</LinearLayout>
<LinearLayout
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/bottom_toolbar"
android:minHeight="50dp"
android:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon"
android:src="@drawable/btn_operation_home" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_common_content"
style="@style/ToolBarIcon"
android:src="@drawable/btn_common_content" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_communication_menu"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_communication_menu" />
</LinearLayout>
<LinearLayout
android:id="@+id/print_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_print"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:scaleX="0.6"
android:scaleY="0.6"
android:src="@drawable/btn_operation_print" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_setting"
style="@style/ToolBarIcon"
android:onClick="onClickSetting"
android:src="@drawable/ic_operation_setting" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
......@@ -31,7 +31,6 @@
android:onClick="onClickOperationFilterList"
android:src="@drawable/ic_filter" />
<!-- カテゴリ選択機能追加 -->
<ImageButton
android:id="@+id/btn_category_location"
style="@style/ToolBarIcon"
......@@ -40,7 +39,7 @@
android:layout_toRightOf="@+id/icon_filter"
android:onClick="onClickGroupLocationByNormalSize"
android:src="@drawable/ic_category_off" />
<!-- ここまで -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -59,24 +58,17 @@
android:visibility="visible"
android:textStyle="bold" />
<ImageButton
android:id="@+id/btn_batch_sync"
style="@style/ToolBarIcon"
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/btn_sort"
android:src="@drawable/btn_operation_batch_sync"
android:visibility="gone" />
</LinearLayout>
<ImageButton
android:id="@+id/btn_common_content"
android:id="@+id/btn_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_centerInParent="true"
android:layout_toLeftOf="@+id/btn_help"
android:background="@drawable/ic_common_content_off" />
android:background="@drawable/btn_operation_search"
android:contentDescription="@string/list" />
<ImageButton
android:id="@+id/btn_help"
......@@ -90,73 +82,96 @@
</RelativeLayout>
<RelativeLayout
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/content_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_weight="1"></FrameLayout>
<LinearLayout
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/operation_color"
android:background="@drawable/bottom_toolbar_border"
android:minHeight="50dp"
android:visibility="visible">
<ImageButton
android:id="@+id/btn_communication_menu"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_communication_menu" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon"
android:src="@drawable/btn_operation_home" />
</LinearLayout>
<LinearLayout
android:id="@+id/search_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_toLeftOf="@+id/btn_search"
android:layout_marginRight="10dp"
android:background="@drawable/radius_frame"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:text="@string/search_result"
android:textColor="@color/app_color"
android:textSize="@dimen/app_normal_text_size"
android:textStyle="bold" />
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_common_content"
style="@style/ToolBarIcon"
android:src="@drawable/btn_common_content" />
</LinearLayout>
<ImageButton
android:id="@+id/btn_search"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:background="@drawable/ic_operation_search"
android:contentDescription="@string/list" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_sub_menu"
<ImageButton
android:id="@+id/btn_communication_menu"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_communication_menu" />
</LinearLayout>
<LinearLayout
android:id="@+id/print_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_alignParentRight="true"
android:background="@drawable/ic_operation_setting"
android:onClick="onClickOperationSubMenu" />
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
</RelativeLayout>
<ImageButton
android:id="@+id/btn_operation_print"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:scaleX="0.6"
android:scaleY="0.6"
android:src="@drawable/btn_operation_print" />
</LinearLayout>
<FrameLayout
android:id="@+id/operation_list_layout"
style="@style/content_list_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_setting"
style="@style/ToolBarIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_operation_setting"
android:onClick="onClickSetting" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
......@@ -4,12 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical"
android:background="@color/basic_white1"
android:clickable="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
......@@ -25,22 +27,6 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
android:gravity="left|center">
<ImageButton
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:background="@drawable/ic_operation_home"
android:contentDescription="@null" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center">
......@@ -135,5 +121,93 @@
android:divider="@null" />
</LinearLayout>
<LinearLayout
android:id="@+id/toolbar2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/bottom_toolbar"
android:minHeight="50dp"
android:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_operation_home" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_common_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_common_content" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_communication_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/ic_communication_menu" />
</LinearLayout>
<LinearLayout
android:id="@+id/print_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_print"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/btn_operation_print"
android:scaleX="0.6"
android:scaleY="0.6" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center">
<ImageButton
android:id="@+id/btn_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/ic_operation_setting"
android:onClick="onClickSetting" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVUIActivity.java
......@@ -25,6 +25,7 @@ import jp.agentec.abook.abv.ui.common.util.ABVToastUtil;
import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
import jp.agentec.abook.abv.ui.common.util.LogUtil;
import jp.agentec.abook.abv.ui.home.activity.ABookSettingActivity;
import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
import android.content.DialogInterface;
import android.content.Intent;
......@@ -486,11 +487,16 @@ public abstract class ABVUIActivity extends ABVAuthenticatedActivity {
}
}
///////////////////////////////////////////////////////////////////////////////////////////////////////
// カテゴリ選択機能
///////////////////////////////////////////////////////////////////////////////////////////////////////
// 設定画面表示
public void showSettingPopup() {
public void showSetting() {
Intent intent = new Intent();
intent.setClassName(getApplicationContext().getPackageName(), ABookSettingActivity.class.getName());
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
// 設定画面の前のActivityを保存する（設定画面から戻る用）
ActivityHandlingHelper.getInstance().setPreviousOfSettingActivity(this);
startActivity(intent);
// ※ 設定画面からログアウトした場合、このActivityも残らないようにfinishして遷移する
finish();
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ABookSettingActivity.java
......@@ -14,9 +14,13 @@ import java.io.InputStream;
import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.data.ABVDataCache;
import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
import jp.agentec.abook.abv.launcher.android.ABVApplication;
import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.activity.ABVUIActivity;
import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
import jp.agentec.adf.util.FileUtil;
public class ABookSettingActivity extends PreferenceActivity {
......@@ -73,7 +77,32 @@ public class ABookSettingActivity extends PreferenceActivity {
// ホーム画面へ戻る処理
private void backToHome() {
Intent intent = new Intent(getApplicationContext(), OperationListActivity.class);
///////////////////////////////////////////////////////////////////////////////////////////////////////
// カテゴリ選択機能
///////////////////////////////////////////////////////////////////////////////////////////////////////
ABVUIActivity activity = ActivityHandlingHelper.getInstance().getPreviousOfSettingActivity();
// Chat
ParentWebViewActivity chatActity = null;
Intent intent = null;
if (activity == null) {
chatActity = ActivityHandlingHelper.getInstance().getPreviousForChatOfSettingActivity();
intent = new Intent(this, (chatActity != null ? chatActity.getClass() : OperationListActivity.class));
//noinspection VariableNotUsedInsideIf
if (chatActity != null) {
intent.putExtra("chatWebviewUrl", ABVEnvironment.getInstance().acmsAddress + ABVDataCache.getInstance().getUrlPath() + "/chatapi/chat/");
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 (chatActity == null) {
intent = new Intent(this, (activity != null ? activity.getClass() : OperationListActivity.class));
}
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(intent);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
......@@ -132,8 +132,9 @@ public class OperationListActivity extends ABVUIActivity {
private ImageButton mViewModeButton;
private ImageButton mSearchButton;
private ImageButton mCommunicationButton;
private ImageButton mCommonContentButton;
private ImageButton mCommonContentButton; // 関連資料
private ImageButton mCommunicationButton; // コミュニケーション
private ImageButton mQuickReportPrintButton; // 簡易帳票印刷ボタン
private List<OperationDto> mOperationList;
......@@ -144,7 +145,6 @@ public class OperationListActivity extends ABVUIActivity {
private EditText mSearchTextView;
private TextView mStartDate;
private TextView mEndDate;
private LinearLayout mSearchResultLayout;
private TextView mTitleView;
private LinearLayout mReportTypeLayoutLabel;
......@@ -220,23 +220,22 @@ public class OperationListActivity extends ABVUIActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.ac_operation_list);
//mListHelper = new OperationListHelper(this);
// カテゴリ選択機能
mListHelper = getListHelper();
mViewModeButton = (ImageButton) findViewById(R.id.btn_view_mode);
mSearchButton = (ImageButton) findViewById(R.id.btn_search);
mSearchResultLayout = (LinearLayout) findViewById(R.id.search_result);
mTitleView = (TextView) findViewById(R.id.title);
mCommunicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
mCommonContentButton = (ImageButton) findViewById(R.id.btn_common_content);
// ツールバーのタイトル表示
//mOperationTitle = (TextView) findViewById(R.id.operation_title);
//mOperationBatchSyncButton = (ImageButton) findViewById(R.id.btn_batch_sync);
// カテゴリボタン
mCategoryLocationButton = (ImageButton) findViewById(R.id.btn_category_location);
// 下ツールバー
mCommunicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
mCommonContentButton = (ImageButton) findViewById(R.id.btn_common_content);
mQuickReportPrintButton = (ImageButton) findViewById(R.id.btn_operation_print);
// ホームボタンは非活性化（ホーム画面では必要ないため）
ImageButton operationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
operationHomeButton.setEnabled(false);
// 作業一覧のタイトルパータンでセット
mTitleView.setText(PatternStringUtil.patternToString(getApplicationContext(),
R.string.operation_list,
......@@ -258,7 +257,7 @@ public class OperationListActivity extends ABVUIActivity {
// サービスオプション(作業種別使用)をセット
mOperationGroupMasterServiceOperationFlg = ABVDataCache.getInstance().serviceOption.isOperationGroupMaster();
// 検索アイコンのクリックイベント
// クリックイベント
mSearchButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -266,16 +265,14 @@ public class OperationListActivity extends ABVUIActivity {
}
});
mSearchResultLayout.setOnClickListener(new View.OnClickListener() {
mCommonContentButton.setEnabled(true);
mCommonContentButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showSearchDialog();
showCommonContent();
}
});
mSelectedFixPuchMessagePosition = 0;
mSendType = 0;
mCommunicationButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -283,12 +280,8 @@ public class OperationListActivity extends ABVUIActivity {
}
});
mCommonContentButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showCommonContent();
}
});
mSelectedFixPuchMessagePosition = 0;
mSendType = 0;
if (!StringUtil.isNullOrEmpty(getIntent().getStringExtra(AppDefType.PushMessageKey.operationId))) {
final long operationId = Long.parseLong(getIntent().getStringExtra(AppDefType.PushMessageKey.operationId));
......@@ -345,7 +338,7 @@ public class OperationListActivity extends ABVUIActivity {
}
}
mAllOperationReportTypes = getOperationReportTypeList(true);
// リスト更新
// 作業リスト更新
setOperationListView();
}
......@@ -356,13 +349,22 @@ public class OperationListActivity extends ABVUIActivity {
startActivity(intent);
}
/**
* ホーム画面下のツールバー、各アイコンの有効・無効
*/
private void configurationToolbarIcon() {
// ツールバーの検索結果レイアウトの表示・非表示
checkShowSearchResult();
// 関連資料
//if (mOperationLogic.isExistCommonContent()) {
mCommonContentButton.setImageDrawable(getRDrawable(R.drawable.home_common_content_icon_on));
mCommonContentButton.setEnabled(true);
//} else {
// mCommonContentButton.setImageDrawable(getRDrawable(R.drawable.home_common_content_icon_off));
// mCommonContentButton.setEnabled(false);
//}
// コミュニケーション
List<PushMessageDto> pushMessageDtoList = mPushMessageLogic.getAllPushMessageList();
boolean existUnreadFlg = false;
for (PushMessageDto pushMessageDto : pushMessageDtoList) {
if (!pushMessageDto.readingFlg) {
......@@ -370,19 +372,18 @@ public class OperationListActivity extends ABVUIActivity {
break;
}
}
if (existUnreadFlg) {
mCommunicationButton.setImageDrawable(getRDrawable(R.drawable.ic_communication_menu_with_badge));
} else {
mCommunicationButton.setImageDrawable(getRDrawable(R.drawable.ic_communication_menu));
}
if (mOperationLogic.isExistCommonContent()) {
mCommonContentButton.setImageDrawable(getRDrawable(R.drawable.ic_common_content_on));
mCommonContentButton.setEnabled(true);
// 簡易帳票印刷ボタン
if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
mQuickReportPrintButton.setVisibility(View.VISIBLE);
} else {
mCommonContentButton.setImageDrawable(getRDrawable(R.drawable.ic_common_content_off));
mCommonContentButton.setEnabled(false);
findViewById(R.id.print_layout).setVisibility(View.GONE);
mQuickReportPrintButton.setVisibility(View.GONE);
}
// フィルター選択判定
checkSelectedFilterType();
......@@ -391,45 +392,40 @@ public class OperationListActivity extends ABVUIActivity {
///////////////////////////////////////////////////////////////////////////////////////////////////////
// 作業種別表示・非表示
if (mOperationGroupMasterServiceOperationFlg) {
// サービスオプションON
mCategoryLocationButton.setVisibility(View.VISIBLE);
// アイコンの変更
if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
// カテゴリ選択時
setCategoryImage(true);
//mOperationTitle.setText(R.string.title_category);
mTitleView.setText(R.string.title_category);
// 検索ワード削除
clearSearch();
// 検索ボタンを無効にする
mSearchButton.setEnabled(false);
// 一括同期ボタン表示
//mOperationBatchSyncButton.setVisibility(View.VISIBLE);
} else {
// 全て
// 検索ボタンを活性化
// 検索ボタン、カテゴリボタンを活性化
mSearchButton.setEnabled(true);
mCategoryLocationButton.setEnabled(true);
setCategoryImage(false);
// 一括同期ボタン非表示
//mOperationBatchSyncButton.setVisibility(View.GONE);
//mOperationTitle.setText(R.string.title_all_operation);
mTitleView.setText(R.string.title_all_operation);
}
} else {
//mOperationTitle.setText(R.string.title_all_operation);
// サービスオプションOFF
mTitleView.setText(R.string.title_all_operation);
// アイコン非表示
setCategoryImage(false);
mCategoryLocationButton.setVisibility(View.GONE);
// 一括同期ボタンを非表示
//mOperationBatchSyncButton.setVisibility(View.GONE);
// 検索ボタンを活性化
mSearchButton.setEnabled(true);
}
// 検索済みの場合、タイトルを「検索結果」にする
// 検索済みの場合、タイトルを「検索結果」にする。検索結果表示時は、カテゴリボタン非活性化
if (isSearched()) {
//mOperationTitle.setText(R.string.search_result);
mTitleView.setText(R.string.search_result);
// TODO:アイコン差替え
mCategoryLocationButton.setEnabled(false);
}
}
......@@ -672,16 +668,6 @@ public class OperationListActivity extends ABVUIActivity {
if (mSearchTextView != null) {
mSearchTextView.setText(StringUtil.Empty);
}
/**
// 開始日の初期化
mStartDate.setText(StringUtil.Empty);
// 終了日の初期化
mEndDate.setText(StringUtil.Empty);
// プロジェクト名の初期化
mSearchTextView.setText(StringUtil.Empty);
*/
}
// 開始日と終了日のバリデーション
......@@ -718,11 +704,11 @@ public class OperationListActivity extends ABVUIActivity {
private void checkShowSearchResult() {
if (StringUtil.isNullOrEmpty(mSearchWord) && StringUtil.isNullOrEmpty(mStartDateStr) && StringUtil.isNullOrEmpty(mEndDateStr)) {
// 検索ワードが存在しない場合、検索結果ではないので非表示
mSearchResultLayout.setVisibility(View.GONE);
//mSearchResultLayout.setVisibility(View.GONE);
mTitleView.setVisibility(View.VISIBLE);
} else {
// 検索ワードが存在するため、検索結果と見做し、表示
mSearchResultLayout.setVisibility(View.VISIBLE);
//mSearchResultLayout.setVisibility(View.VISIBLE);
mTitleView.setVisibility(View.GONE);
}
}
......@@ -920,18 +906,8 @@ public class OperationListActivity extends ABVUIActivity {
}
}
// 設定画面へ遷移
public void onClickOperationSubMenu(View v) {
showSettingPopup();
}
public void onClickShowHelpView(View v) {
// if (mOperationAuthLevel == OperationAuthLevel.OPERATION_INSTRUCTOR) {
// showHelpViewDialog(Constant.HelpViewType.OperationListDirector);
// } else {
showHelpViewDialog(Constant.HelpViewType.OperationListReporter);
// }
showHelpViewDialog(Constant.HelpViewType.OperationListReporter);
}
/**
* 360編集画面表示
......@@ -1367,6 +1343,9 @@ public class OperationListActivity extends ABVUIActivity {
}
}
/**
* コミュニケーションダイアログの表示
*/
private void showCommunicationMenuDialog() {
mCommunicationMenuDialog = new Dialog(OperationListActivity.this);
mCommunicationMenuDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
......@@ -1374,23 +1353,6 @@ public class OperationListActivity extends ABVUIActivity {
mCommunicationMenuDialog.setContentView(R.layout.communication_menu_dialog);
List<PushMessageDto> pushMessageDtoList = mPushMessageLogic.getAllPushMessageList();
//SATOではプッシュメッセージ機能を利用しないため、無効化する。
// boolean existUnreadFlg = false;
// for (PushMessageDto pushMessageDto : pushMessageDtoList) {
// if (!pushMessageDto.readingFlg) {
// existUnreadFlg = true;
// break;
// }
// }
// 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);
// }
LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
@Override
......@@ -1400,24 +1362,6 @@ 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();
// }
// });
mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -2031,17 +1975,14 @@ public class OperationListActivity extends ABVUIActivity {
}
///////////////////////////////////////////////////////////////////////////////////////////////////////
//
// カテゴリ選択機能
//
///////////////////////////////////////////////////////////////////////////////////////////////////////
//private TextView mOperationTitle; // 一覧のタイトル
private ImageButton mCategoryLocationButton; // カテゴリ選択ボタン
private Map<Integer, Integer> operationCountMap;
private OperationGroupMasterLogic mOperationGroupMasterLogic = AbstractLogic.getLogic(OperationGroupMasterLogic.class);
private ABVListDialog mShowDialog;
private OperationDao mOperationDao = AbstractDao.getDao(OperationDao.class);
//private ImageButton mOperationBatchSyncButton; // カテゴリの一括同期ボタン
// 作業種別のサービスオプション値を保持用フラグ
private boolean mOperationGroupMasterServiceOperationFlg;
......@@ -2302,4 +2243,9 @@ public class OperationListActivity extends ABVUIActivity {
popup.showAsDropDown(anchor);
}
}
// 設定画面へ遷移
public void onClickSetting(View v) {
showSetting();
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
package jp.agentec.abook.abv.ui.home.activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.view.View;
import android.view.Window;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ImageView;
......@@ -21,11 +23,14 @@ import jp.agentec.abook.abv.bl.common.Constant;
import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
import jp.agentec.abook.abv.bl.common.exception.ExceptionHandler;
import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.data.ABVDataCache;
import jp.agentec.abook.abv.bl.download.ContentZipDownloadNotification;
import jp.agentec.abook.abv.bl.dto.CategoryContentDto;
import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.PushMessageDto;
import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.OperationLogic;
import jp.agentec.abook.abv.bl.logic.PushMessageLogic;
import jp.agentec.abook.abv.bl.websocket.MeetingManager;
import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.activity.ABVUIActivity;
......@@ -76,6 +81,12 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
mAllSaveButton = (Button) findViewById(R.id.btn_all_save);
mContentListView = (ListView) findViewById(R.id.lv_content_list);
// 共通資料ボタン
mCommonContentButton = (ImageButton) findViewById(R.id.btn_common_content);
// コミュニケーションボタン
mCommunicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
// 簡易帳票印刷ボタン
mQuickReportPrintButton = (ImageButton) findViewById(R.id.btn_operation_print);
Intent i = getIntent();
operationId = i.getLongExtra(ABookKeys.OPERATION_ID, 0);
......@@ -100,7 +111,14 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
mTxtOperationName.setText(operationName);
mAllSaveButton.setVisibility(View.GONE);
mCommunicationButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showCommunicationMenuDialog();
}
});
// 下ツールバー設定
configurationToolbarIcon();
setOnButtonEvent();
}
......@@ -417,4 +435,78 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
showHelpViewDialog(Constant.HelpViewType.OperationDetail);
}
}
///////////////////////////////////////////////////////////////////////////////////////////////////////
// カテゴリ選択機能
///////////////////////////////////////////////////////////////////////////////////////////////////////
private ImageButton mCommonContentButton; // 関連資料
private ImageButton mCommunicationButton; // コミュニケーション
private ImageButton mQuickReportPrintButton; // 簡易帳票印刷ボタン
private PushMessageLogic mPushMessageLogic = AbstractLogic.getLogic(PushMessageLogic.class);
private Dialog mCommunicationMenuDialog;
// 設定画面へ遷移
public void onClickSetting(View v) {
showSetting();
}
// 下辺のツールバー設定
private void configurationToolbarIcon() {
// ホームボタン活性化
mOperationHomeButton.setEnabled(true);
// 共通資料ボタンの非活性化
mCommonContentButton.setEnabled(false);
// コミュニケーション
List<PushMessageDto> pushMessageDtoList = mPushMessageLogic.getAllPushMessageList();
boolean existUnreadFlg = false;
for (PushMessageDto pushMessageDto : pushMessageDtoList) {
if (!pushMessageDto.readingFlg) {
existUnreadFlg = true;
break;
}
}
if (existUnreadFlg) {
mCommunicationButton.setImageDrawable(getRDrawable(R.drawable.ic_communication_menu_with_badge));
} else {
mCommunicationButton.setImageDrawable(getRDrawable(R.drawable.ic_communication_menu));
}
// 簡易帳票印刷ボタン
if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
mQuickReportPrintButton.setVisibility(View.VISIBLE);
} else {
findViewById(R.id.print_layout).setVisibility(View.GONE);
mQuickReportPrintButton.setVisibility(View.GONE);
}
}
/**
* コミュニケーションダイアログの表示
*/
private void showCommunicationMenuDialog() {
mCommunicationMenuDialog = new Dialog(OperationRelatedContentActivity.this);
mCommunicationMenuDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
mCommunicationMenuDialog.setCanceledOnTouchOutside(false);
mCommunicationMenuDialog.setContentView(R.layout.communication_menu_dialog);
List<PushMessageDto> pushMessageDtoList = mPushMessageLogic.getAllPushMessageList();
LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
ActivityHandlingHelper.getInstance().startMeetingActivity();
mCommunicationMenuDialog.dismiss();
}
});
mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mCommunicationMenuDialog.dismiss();
}
});
mCommunicationMenuDialog.show();
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
......@@ -61,6 +61,7 @@ import jp.agentec.abook.abv.launcher.android.R;
import jp.agentec.abook.abv.ui.common.activity.ABVActivity;
import jp.agentec.abook.abv.ui.common.activity.ABVAuthenticatedActivity;
import jp.agentec.abook.abv.ui.common.activity.ABVContentViewActivity;
import jp.agentec.abook.abv.ui.common.activity.ABVUIActivity;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.DefPrefKey;
import jp.agentec.abook.abv.ui.common.appinfo.AppDefType.UserPrefKey;
......@@ -1696,4 +1697,44 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
}
return context;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////
// カテゴリ選択機能
///////////////////////////////////////////////////////////////////////////////////////////////////////
private ABVUIActivity previousOfSettingActivity;
// Chat
private ParentWebViewActivity previousOfSettingActivity2;
/**
* 設定画面から戻る用
* @return 設定画面へ遷移前の画面
*/
public ABVUIActivity getPreviousOfSettingActivity() {
return previousOfSettingActivity;
}
/**
* 設定画面遷移前に設定
* @param activity
*/
public void setPreviousOfSettingActivity(ABVUIActivity activity) {
this.previousOfSettingActivity2 = null;
this.previousOfSettingActivity = activity;
}
/**
* 設定画面から戻る用
* @return 設定画面へ遷移前の画面
*/
public ParentWebViewActivity getPreviousForChatOfSettingActivity() {
return previousOfSettingActivity2;
}
/**
* 設定画面遷移前に設定
* @param activity
*/
public void setPreviousOfSettingActivity(ParentWebViewActivity activity) {
this.previousOfSettingActivity = null;
this.previousOfSettingActivity2 = activity;
}
}
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