Skip to content

A
abook_check
Commit 5d48026f by Jung Kwangkyu
Options

Merge branch 'features/1.4.100_develop_mk' into 'features/1.4.202' 

デザイン修正,360工程管理関連

See merge request !243
parents f4e17d53 340b5419
Showing with 155 additions and 20 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
package jp.agentec.abook.abv.bl.logic; package jp.agentec.abook.abv.bl.logic;
import static jp.agentec.abook.abv.bl.acms.type.OperationType.DRAWING;
import static jp.agentec.abook.abv.bl.acms.type.OperationType.PANO;
import net.lingala.zip4j.exception.ZipException; import net.lingala.zip4j.exception.ZipException;
import org.json.adf.JSONArray; import org.json.adf.JSONArray;
...@@ -1154,6 +1157,10 @@ public class OperationLogic extends AbstractLogic { ...@@ -1154,6 +1157,10 @@ public class OperationLogic extends AbstractLogic {
List<JSONObject> taskJsonList = new ArrayList<JSONObject>(); List<JSONObject> taskJsonList = new ArrayList<JSONObject>();
JSONObject hotspotJson = new JSONObject(); JSONObject hotspotJson = new JSONObject();
List<TaskDto> taskDtoList = mTaskDao.selectTaskByOperationId(operationId); List<TaskDto> taskDtoList = mTaskDao.selectTaskByOperationId(operationId);
OperationDto operation = mOperationDao.getOperation(operationId);
if (operation.reportType == Constant.ReportType.ReportContinuous) {
contentPath = contentPath.replaceAll("panoImage","processList");
}
for (TaskDto dto : taskDtoList) { for (TaskDto dto : taskDtoList) {
if (!StringUtil.isNullOrEmpty(dto.taskHotSpotInfo)) { if (!StringUtil.isNullOrEmpty(dto.taskHotSpotInfo)) {
JSONObject taskHotSpot = new JSONObject(dto.taskHotSpotInfo); JSONObject taskHotSpot = new JSONObject(dto.taskHotSpotInfo);
...@@ -1211,6 +1218,10 @@ public class OperationLogic extends AbstractLogic { ...@@ -1211,6 +1218,10 @@ public class OperationLogic extends AbstractLogic {
JSONObject phaseStatusJson = new JSONObject(); JSONObject phaseStatusJson = new JSONObject();
phaseStatusJson.put(ABookKeys.PROCESS_LIST, processInfoList); phaseStatusJson.put(ABookKeys.PROCESS_LIST, processInfoList);
OperationDto operation = mOperationDao.getOperation(operationId);
if (operation.operationType == PANO || operation.operationType == DRAWING) {
contentPath = contentPath.replaceAll("panoImage","processList");
}
FileUtil.createFile(contentPath + "/phaseStatus.json", phaseStatusJson.toString()); FileUtil.createFile(contentPath + "/phaseStatus.json", phaseStatusJson.toString());
} }
/** /**
...@@ -1233,6 +1244,10 @@ public class OperationLogic extends AbstractLogic { ...@@ -1233,6 +1244,10 @@ public class OperationLogic extends AbstractLogic {
taskJsonList.add(taskDtoJson); taskJsonList.add(taskDtoJson);
} }
processInfoJson.put("processList", taskJsonList); processInfoJson.put("processList", taskJsonList);
OperationDto operation = mOperationDao.getOperation(operationId);
if (operation.operationType == PANO || operation.operationType == DRAWING) {
contentPath = contentPath.replaceAll("panoImage","processList");
}
Logger.d(TAG, "createProcessInfoJson : " + processInfoJson.toString()); Logger.d(TAG, "createProcessInfoJson : " + processInfoJson.toString());
FileUtil.createFile(contentPath + "/processInfo.json", processInfoJson.toString()); FileUtil.createFile(contentPath + "/processInfo.json", processInfoJson.toString());
} }
......
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png

502 Bytes | W: | H:

ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png

1.34 KB | W: | H:

ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_off.png
  • 2-up
  • Swipe
  • Onion skin
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png

479 Bytes | W: | H:

ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png

1.34 KB | W: | H:

ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png
ABVJE_Res_Default_Android/res/drawable-xhdpi/home_icon_on.png
  • 2-up
  • Swipe
  • Onion skin
ABVJE_Res_Default_Android/res/drawable/btn_common_content.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android" > <selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item <item
android:state_enabled="false" android:state_enabled="false"
android:drawable="@drawable/home_common_content_icon_off"/> android:drawable="@drawable/home_common_content_icon_on"/>
<item <item
android:drawable="@drawable/home_common_content_icon_on"/> android:drawable="@drawable/home_common_content_icon_on"/>
</selector> </selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -1503,5 +1503,9 @@ ...@@ -1503,5 +1503,9 @@
<string name="msg_fail_collaboration_not_action_allow">文書協業中には利用できない機能です。</string> <string name="msg_fail_collaboration_not_action_allow">文書協業中には利用できない機能です。</string>
<string name="msg_fail_collaboration_join_error">協業に参加することができませんでした。</string> <string name="msg_fail_collaboration_join_error">協業に参加することができませんでした。</string>
<string name="msg_fail_collaboration_pip_change_host">PIP状態ではホスト変更できません。PIPを解除してください。</string> <string name="msg_fail_collaboration_pip_change_host">PIP状態ではホスト変更できません。PIPを解除してください。</string>
<string name="btn_home">ホーム</string>
<string name="btn_content">関連資料</string>
<string name="btn_communication">コミュニケーション</string>
<string name="btn_setting">設定</string>
<string name="btn_print">PDF</string>
</resources> </resources>
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -1508,4 +1508,9 @@ ...@@ -1508,4 +1508,9 @@
<string name="msg_fail_collaboration_not_action_allow">문서협업 중에는 이용할 수 없는 기능입니다.</string> <string name="msg_fail_collaboration_not_action_allow">문서협업 중에는 이용할 수 없는 기능입니다.</string>
<string name="msg_fail_collaboration_join_error">협업에 참여하실수 없습니다.</string> <string name="msg_fail_collaboration_join_error">협업에 참여하실수 없습니다.</string>
<string name="msg_fail_collaboration_pip_change_host">PIP 상태에서는 호스트 변경이 불가능합니다. PIP 모드를 해제해 주세요.</string> <string name="msg_fail_collaboration_pip_change_host">PIP 상태에서는 호스트 변경이 불가능합니다. PIP 모드를 해제해 주세요.</string>
<string name="btn_home">홈</string>
<string name="btn_content">관련자료</string>
<string name="btn_communication">커뮤니케이션</string>
<string name="btn_setting">설정</string>
<string name="btn_print">PDF</string>
</resources> </resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/colors.xml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<color name="operation_name">#333333</color> <color name="operation_name">#333333</color>
<color name="operation_description">#333333</color> <color name="operation_description">#333333</color>
<color name="operation_date">#37648C</color> <color name="operation_date">#37648C</color>
<color name="operation_color">#095395</color> <color name="operation_color">#0053F0</color>
<color name="operation_disable_color">#CCCCCC</color> <color name="operation_disable_color">#CCCCCC</color>
<color name="operation_search_header">#CCCCCC</color> <color name="operation_search_header">#CCCCCC</color>
<color name="operation_search_button_color">#0068CB</color> <color name="operation_search_button_color">#0068CB</color>
......
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -1504,4 +1504,9 @@ ...@@ -1504,4 +1504,9 @@
<string name="msg_fail_collaboration_not_action_allow">This function cannot be used during document collaboration.</string> <string name="msg_fail_collaboration_not_action_allow">This function cannot be used during document collaboration.</string>
<string name="msg_fail_collaboration_join_error">Could not connect to the collaboration.</string> <string name="msg_fail_collaboration_join_error">Could not connect to the collaboration.</string>
<string name="msg_fail_collaboration_pip_change_host">Host change is not possible in PIP state. Please turn off picture-in-picture mode.</string> <string name="msg_fail_collaboration_pip_change_host">Host change is not possible in PIP state. Please turn off picture-in-picture mode.</string>
<string name="btn_home">Home</string>
<string name="btn_content">Related Content</string>
<string name="btn_communication">Communication</string>
<string name="btn_setting">Setting</string>
<string name="btn_print">PDF</string>
</resources> </resources>
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/bottom_toolbar" android:background="@color/bottom_toolbar"
android:minHeight="50dp" android:minHeight="70dp"
android:visibility="visible"> android:visibility="visible">
<LinearLayout <LinearLayout
...@@ -104,25 +104,49 @@ ...@@ -104,25 +104,49 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_operation_home" android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon" style="@style/ToolBarIcon"
android:layout_width="27dp"
android:layout_height="27dp"
android:scaleType="fitCenter"
android:src="@drawable/btn_operation_home" /> android:src="@drawable/btn_operation_home" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_home"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_common_content" android:id="@+id/btn_common_content"
style="@style/ToolBarIcon" style="@style/ToolBarIcon"
android:scaleType="fitCenter"
android:layout_width="27dp"
android:layout_height="27dp"
android:src="@drawable/btn_common_content" /> android:src="@drawable/btn_common_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:textColor="@color/operation_color"
android:text="@string/btn_content"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
...@@ -130,13 +154,24 @@ ...@@ -130,13 +154,24 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_communication_menu" android:id="@+id/btn_communication_menu"
style="@style/ToolBarIcon" style="@style/ToolBarIcon"
android:layout_width="27dp"
android:layout_height="27dp"
android:scaleType="fitCenter"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_communication_menu" /> android:src="@drawable/ic_communication_menu" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_communication"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -144,26 +179,48 @@ ...@@ -144,26 +179,48 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_operation_print" android:id="@+id/btn_operation_print"
style="@style/ToolBarIcon" style="@style/ToolBarIcon"
android:layout_width="27dp"
android:layout_height="27dp"
android:scaleType="fitCenter"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/btn_operation_print" /> android:src="@drawable/btn_operation_print" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_print"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_setting" android:id="@+id/btn_setting"
style="@style/ToolBarIcon" style="@style/ToolBarIcon"
android:layout_width="27dp"
android:layout_height="27dp"
android:scaleType="fitCenter"
android:onClick="onClickSetting" android:onClick="onClickSetting"
android:src="@drawable/ic_operation_setting" /> android:src="@drawable/ic_operation_setting" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_setting"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/related_content_main_linear" android:id="@+id/related_content_main_linear"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/bottom_toolbar" android:background="@color/bottom_toolbar"
android:minHeight="50dp" android:minHeight="70dp"
android:visibility="visible"> android:visibility="visible">
<LinearLayout <LinearLayout
...@@ -89,13 +90,23 @@ ...@@ -89,13 +90,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_operation_home" android:id="@+id/btn_operation_home"
android:layout_width="wrap_content" android:layout_width="27dp"
android:layout_height="27dp"
android:background="@drawable/btn_operation_home"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/btn_operation_home" /> android:textSize="11sp"
android:text="@string/btn_home"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
...@@ -104,13 +115,23 @@ ...@@ -104,13 +115,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_common_content" android:id="@+id/btn_common_content"
android:layout_width="wrap_content" android:layout_width="27dp"
android:layout_height="wrap_content" android:layout_height="27dp"
android:background="@drawable/btn_common_content" /> android:background="@drawable/btn_common_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_content"
android:textColor="@color/operation_color"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
...@@ -119,14 +140,23 @@ ...@@ -119,14 +140,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_communication_menu" android:id="@+id/btn_communication_menu"
android:layout_width="wrap_content" android:layout_width="27dp"
android:layout_height="wrap_content" android:layout_height="27dp"
android:layout_centerVertical="true" android:scaleType="fitCenter"
android:background="@drawable/ic_communication_menu" /> android:background="@drawable/ic_communication_menu" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_communication"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -135,14 +165,22 @@ ...@@ -135,14 +165,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_operation_print" android:id="@+id/btn_operation_print"
android:layout_width="wrap_content" android:layout_width="27dp"
android:layout_height="wrap_content" android:layout_height="27dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@drawable/btn_operation_print" /> android:background="@drawable/btn_operation_print" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_print"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -150,15 +188,24 @@ ...@@ -150,15 +188,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<ImageButton <ImageButton
android:id="@+id/btn_setting" android:id="@+id/btn_setting"
android:layout_width="wrap_content" android:layout_width="27dp"
android:layout_height="wrap_content" android:layout_height="27dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@drawable/ic_operation_setting" android:background="@drawable/ic_operation_setting"
android:onClick="onClickSetting" /> android:onClick="onClickSetting" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_setting"
android:gravity="center"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
ABVJE_UI_Android/res/layout/ac_login.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:id="@+id/linear_main" android:id="@+id/linear_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/app_bg" android:background="@color/operation_color"
> >
<LinearLayout <LinearLayout
......
ABVJE_UI_Android/res/layout/ac_setting_main.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/setting_bg" android:background="@color/operation_color"
android:orientation="vertical" android:orientation="vertical"
android:padding="20dp" > android:padding="20dp" >
......
ABVJE_UI_Android/res/layout/ac_splash1.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/app_bg" > android:background="@color/operation_color" >
<ImageView <ImageView
android:id="@+id/img_logo" android:id="@+id/img_logo"
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
...@@ -1284,7 +1284,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co ...@@ -1284,7 +1284,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
protected void setCommunicationImageButton() { protected void setCommunicationImageButton() {
List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList(); List<PushMessageDto> pushMessageDtoList = pushMessageLogic.getAllPushMessageList();
boolean existUnreadFlg = checkUnReadCommunication(pushMessageDtoList); boolean existUnreadFlg = checkUnReadCommunication(pushMessageDtoList);
communicationButton.setImageResource(existUnreadFlg ? R.drawable.ic_communication_menu_with_badge : R.drawable.ic_communication_menu); communicationButton.setImageResource(R.drawable.ic_communication_menu);
} }
/** /**
......
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