Merge branch 'feature/1.4.100_kim-ec' into 'features/1.4.100'

Feature/1.4.100 kim ec

See merge request !207

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java

@@ -158,8 +158,6 @@ public class AcmsApis {
 	public static final String ApiGetApertureMasterData = "getApertureMasterData";
 	public static final String ApiGetApertureMasterData = "getApertureMasterData";
 	// 簡易帳票一覧取得
 	// 簡易帳票一覧取得
 	public static final String ApiQuickReportSearch = "quickReportSearch";
 	public static final String ApiQuickReportSearch = "quickReportSearch";
-	
-	public static final String ApiQuickReportPrint = "quickReportRevisionByOperation/revisionByOperationSearch/";
 	// 簡易帳票リビジョン一覧取得
 	// 簡易帳票リビジョン一覧取得
 	public static final String ApiQuickReportRevision = "quickReportRevision";
 	public static final String ApiQuickReportRevision = "quickReportRevision";
 
 

ABVJE_UI_Android/res/layout/content_view_toolbar.xml

@@ -145,7 +145,7 @@
             android:id="@+id/btn_operation_print"
             android:id="@+id/btn_operation_print"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/btn_operation_print"
+            android:background="@drawable/btn_operation_print_white"
             android:layout_centerVertical="true"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentRight="true"
             android:scaleX="0.6"
             android:scaleX="0.6"

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -693,7 +693,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 				}
 				}
 			});
 			});
 
 
-			if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
+			if (ABVDataCache.getInstance().serviceOption.isUnableIOReport() && operationDto.quickReport == 1) {
 				quickReportPrintButton.setVisibility(View.VISIBLE);
 				quickReportPrintButton.setVisibility(View.VISIBLE);
 			} else {
 			} else {
 				findViewById(R.id.print_layout).setVisibility(View.GONE);
 				findViewById(R.id.print_layout).setVisibility(View.GONE);
@@ -747,17 +747,10 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
      */
      */
     private void showPrintTargetSelect(OperationDto operationDto) {
     private void showPrintTargetSelect(OperationDto operationDto) {
         Intent intent = new Intent();
         Intent intent = new Intent();
-		StringBuffer path = new StringBuffer();
-		path.append(ABVEnvironment.getInstance().acmsAddress);
-		path.append(ABVDataCache.getInstance().getUrlPath()+ "/checkapi/");
-		path.append(AcmsApis.ApiQuickReportPrint);
-		path.append(operationDto.operationId + "/");
-		path.append(ABVDataCache.getInstance().getMemberInfo().sid);
-		path.append("?operationId=" + operationDto.operationId);
-		path.append("&sid=" + ABVDataCache.getInstance().getMemberInfo().sid);
         intent.setClass(ABVContentViewActivity.this, OnlineHTMLWebViewActivity.class);
         intent.setClass(ABVContentViewActivity.this, OnlineHTMLWebViewActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.putExtra("LINKURL", "" + path);
+        intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision) + "?isNative=1");
+        intent.putExtra("operationId", mOperationId);
         startActivity(intent, NaviConsts.Right);
         startActivity(intent, NaviConsts.Right);
     }
     }
 
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java

@@ -713,7 +713,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
         Intent intent = new Intent();
         Intent intent = new Intent();
         intent.setClass(HTMLWebViewActivity.this, OnlineHTMLWebViewActivity.class);
         intent.setClass(HTMLWebViewActivity.this, OnlineHTMLWebViewActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision));
+        intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision) + "?isNative=1");
         intent.putExtra("operationId", mOperationId);
         intent.putExtra("operationId", mOperationId);
         startActivity(intent, NaviConsts.Right);
         startActivity(intent, NaviConsts.Right);
     }
     }