Skip to content

A
abook_check
Commit 471da81d by Kim Jinsung
Options

Merge branch 'features/1.0.500_#33721' into 'features/1.0.500' 

#33721 絞り検索のAPIとの連携

See merge request !14
parents 7175fb10 328e905d
Showing with 23 additions and 11 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/ABVEnvironment.java
...@@ -180,7 +180,7 @@ public class ABVEnvironment { ...@@ -180,7 +180,7 @@ public class ABVEnvironment {
// 絞り検索マスタ参照パス // 絞り検索マスタ参照パス
public static final String OperationMasterDataDirFormat = "%s/ABook/operation/master"; public static final String ApertureMasterDataDirFormat = "%s/ABook/operation/apertureMaster";
// 絞り検索マスタファイル名 // 絞り検索マスタファイル名
public static final String ApertureMasterDataFileName = "apertureMaster.json"; public static final String ApertureMasterDataFileName = "apertureMaster.json";
...@@ -776,8 +776,8 @@ public class ABVEnvironment { ...@@ -776,8 +776,8 @@ public class ABVEnvironment {
// MasterDataに対したJSONファイルの位置 // MasterDataに対したJSONファイルの位置
// 経路：root/files/operation/master // 経路：root/files/operation/apertureMaster
public String getMasterFilePath() { public String getMasterFilePath() {
return String.format(OperationMasterDataDirFormat, rootDirectory); return String.format(ApertureMasterDataDirFormat, rootDirectory);
} }
} }
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/ApertureMasterDataLogic.java
...@@ -44,7 +44,6 @@ public class ApertureMasterDataLogic extends AbstractLogic { ...@@ -44,7 +44,6 @@ public class ApertureMasterDataLogic extends AbstractLogic {
createApertureMasterDataJson(masterDataJson.apertureData); createApertureMasterDataJson(masterDataJson.apertureData);
cache.setTempApertureMasterDataFetchDate(lastEditDateString); cache.setTempApertureMasterDataFetchDate(lastEditDateString);
} }
Logger.i(masterDataJson.toString());
} catch (Exception e) { } catch (Exception e) {
Logger.e(TAG, "apertureMasterDataSend error : ", e); Logger.e(TAG, "apertureMasterDataSend error : ", e);
} }
......
ABVJE_Launcher_Android/assets/Drawing/css/drawingboard.css 100644 → 100755
...@@ -60,10 +60,10 @@ ...@@ -60,10 +60,10 @@
.drawing-board-control-drawingmode > button { margin-right: 2px; } .drawing-board-control-drawingmode > button { margin-right: 2px; }
.drawing-board-control-drawingmode > button:last-child { margin-right: 0; } .drawing-board-control-drawingmode > button:last-child { margin-right: 0; }
.drawing-board-control-drawingmode-pencil-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAe9JREFUeNpiZAACVlFRBhYREQZcQPnbNwa3N28YlL5+ZfgLFfvPwGD9m4FhIgsDHuAO0gTUDNKIBvyBmqt/MTDMY8Gl0f31azD7L6oUIxCnAzWmAPHBfwwM01AMUAV6JfPQIVwOYgVqqPnFyOjz6///O38YGKpAgmAD1OXlGdTk5PD5hgeouZudj8/uy9evP/78/dsFFPsJNiAoKIiBABAHap4oLi9v8fTNm48//v7NBwbgWZgkE7rqt8DY+A8JZRBW+cfIuEDT0NDlzadP3z98/doPFDuCrB7TAGFhBqCNIGwM9OcKUzs7+xdv3355+f79VqDYAiTDwZgJh7ONgYpnOvn4GL949erT7UePdgL5JVCD4fgBLBBxaX74+PG789evnwby0/8jKXgExIeB+CG6Af///1e9Ki9vFSAkZPzoyZPPJy9evA9MB77/sWiEARZkzV+/fvXYtGnTpG3btj28EBT0BqjZ5D8OjXCwPksUhA1Wpggf/PHjx/9169Y9EBERaUlgZmaIAcrLE4rk5sIqBqDmlefnRPzfWGX5EaSZm5ubgRloADGA5QZ3RgK7gESY4PMNn9ZtObPpzZvfU4DiYkiB/RcHG+S7fyxAMH/lFU2GOZd2bLx18/cEUMoD4j9I+DcS/RtJHGTYf4AAAwAxaOMYHjxKFwAAAABJRU5ErkJggg=='); background-position: 50% 50%; background-repeat: no-repeat; } .drawing-board-control-drawingmode-pencil-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAK5JREFUeNpiZCADREREOAApEN7AQobmBCA1H8ZnokQzEBxgokBz4ooVKw4wUqB5AYjBSIRmkMYEbJoJGkBIMwiw4NAoAHVyAJLwAnTNWF0A1bwfiA3QNCdis4yRCM0bgJoDcXkTPRrRNV8A+RtfODEi2ayAZIgAVLMj0PYP+AyAuaAAqhEEHInVjBwL8VBb90M1GhKbQlmgqQzk/AdAvBBKEw1YoBoSscUxMQAgwACOZ0Ns854p+gAAAABJRU5ErkJggg=='); background-position: 50% 50%; background-repeat: no-repeat; }
.drawing-board-control-drawingmode-pencil-button:before { content: ""; display: block; width: 0; height: 100%; } .drawing-board-control-drawingmode-pencil-button:before { content: ""; display: block; width: 0; height: 100%; }
.drawing-board-control-drawingmode-eraser-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAkpJREFUeNp0kk+IElEcx39vFBc9+OfQRTAwzFt4CaYOKStj6MoeculStzoIQSB4kCVckmDx4iGCXWYJIqjoVOzO1l4qT1F7WfBWHvxzDPyTB3XUmXn93suRybUffHmP997n9/cRsFgwGARJkiAcDsPlwgEIeEZQAhCRAkgAlOD6SQP4rgMFDWVnYCAQgFgsBqFQCBwOByzZNQOotPHx1RNCCCipu6bfb+zSnslkeOQVILPrBkAirbws9btdTEWAzZPXpfepOzaeGMBXwe/3w3+MwTc3Dl+UeghTiskbBvR6Pbh18mZHB0jjmxvCKhIfR37s3r+Sevf8ca/T4TBF2HTSODuDxP7uNjrZFFbBk8lEzOVyspa4ykGYw2zfbTb/7ilvok1YhlVVFfP5vDydTkHXdXDdlhZOOnPY4/HA0YPtp3h6LFjh8XgsFgoFGTPgsKm1zDr8ajTQh8Fh5eGjZzjGI8yjKlgjF4tFGdd/YKYmRja24hw+zu3sYe2HiH3hYzQjl8tleTQanWtou93G6Qngdrth6+1+9h6hTULJZ/PeziJXKhV5OByeg1ut1gJOp9NZTdNOcQ419ot+ggp1qoLdBFmqVmNpm3A8Huewy+Wq1RH8QH9zmBlJJpMRdCIqiiIPBgN+2MCGsW/r8/kgGo1m0fmpzWarseayHlmNeL1eFiWC0cRqtSr3+/3FpSiKHMZtjU1glbFyfKgLTqfzEka9OJvNeDnzz1JnCaFmqOl8ZdJY1SiDOXCiXKg1NtG5DIt0y6ov3dE/AgwAENFWYYLj4mYAAAAASUVORK5CYII='); background-position: 50% 50%; background-repeat: no-repeat; } .drawing-board-control-drawingmode-eraser-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAMtJREFUeNqck8ENgzAMRZN0gQwSqYwAW+TWMlHVCaC3bMEKrZQFeuuREfpTxciEACmWvowcvQ92zEkUhLX2aowR3vtPeqZKYKQOGvBcpeeyEKYYocY599w1yMBZE/knvDCRB+CZiToIh9BQJRlch0mL8mjRQi8jrCMcPqsuhX97wOA7ig1yXwrTIt2gBxWR2w2TGUwGb+jMiysmC3jaA7TRMZDfyhBnkoWnf4FAMmJXquPCrM5FJm8kgxd0ifC4NVGV6Z1msguH+AowAL10YsD/SG0CAAAAAElFTkSuQmCC'); background-position: 50% 50%; background-repeat: no-repeat; }
.drawing-board-control-drawingmode-eraser-button:before { content: ""; display: block; width: 0; height: 100%; } .drawing-board-control-drawingmode-eraser-button:before { content: ""; display: block; width: 0; height: 100%; }
.drawing-board-control-drawingmode-filler-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnNJREFUeNp0k0trE1EUx89MJpNJooYYXBgDNtCKdRPwlbqoCKUtaNVNA0Uo7UbMxoVPEARTXEi+QWfnwn6DEAlEkrSLttTGRiULEQlJ8yChmbzI++E50yTUJA78uMy953/u/557LmOz2WDEZ2m1WrckSRJSqdR2tVrdHQyYebwHtVoNuFHqTqczhQnWKaBYLDoKhcIuzgHDMKBSqeD20qd+LNdsNocSoFhRr9ctpVLJigl4xIIJQizLAmG4cAPa7bYcy9Iug5TL5UYikbD6/X7Rbre/IUcYe3WUW5ZsnQQzW9LpNOPz+UQc5aBM5mgdh7vI9FCCAesW2tnr9YqZTAby+bw8f3AQRP6853n+Ph5hemSCntjj8YjZbFYWx2IxeS2RSEMwuA87O79eqdXquVolK+GxnP0EPbHb7RZJSGABIR6PA11zJHKIR2MhHA5DIPDj7eH3j95KpfK60Wg8Yntil8slkqgnpioLghacTidoNDpEC3q9HnheCc3s1jZeLcW943pirPw/4lKpBkqlDubnl/riycnLsLy88EKj0fhzuRyZv8RFo1E6wpBYkiqy7Z54YmIcVlYeyOKC4mYwJ0nHRaQuM5vNT6hB/iceG7sIq6sPnwmC4MerDkby40AOCCoiddie1Wp92W7zQ2KTyQSLizNP8T0EsPLBbxEDnCj0GkM2qIEwyZRCobizsfH5A1ZXFhuN52F29vpz3HkL574mk8lj24Y5wsHkvjjoX0BOIWc5jruHzbK2ufmzEwpFO3jnDhQv4JoROYdoERVyGjEgZ8iBDlF3FzXo4go6utZ9lftY4N/dXisjR0i1G0ublv8KMAA0ZoUlicxrhwAAAABJRU5ErkJggg=='); background-position: 50% 50%; background-repeat: no-repeat; } .drawing-board-control-drawingmode-filler-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAnNJREFUeNp0k0trE1EUx89MJpNJooYYXBgDNtCKdRPwlbqoCKUtaNVNA0Uo7UbMxoVPEARTXEi+QWfnwn6DEAlEkrSLttTGRiULEQlJ8yChmbzI++E50yTUJA78uMy953/u/557LmOz2WDEZ2m1WrckSRJSqdR2tVrdHQyYebwHtVoNuFHqTqczhQnWKaBYLDoKhcIuzgHDMKBSqeD20qd+LNdsNocSoFhRr9ctpVLJigl4xIIJQizLAmG4cAPa7bYcy9Iug5TL5UYikbD6/X7Rbre/IUcYe3WUW5ZsnQQzW9LpNOPz+UQc5aBM5mgdh7vI9FCCAesW2tnr9YqZTAby+bw8f3AQRP6853n+Ph5hemSCntjj8YjZbFYWx2IxeS2RSEMwuA87O79eqdXquVolK+GxnP0EPbHb7RZJSGABIR6PA11zJHKIR2MhHA5DIPDj7eH3j95KpfK60Wg8Yntil8slkqgnpioLghacTidoNDpEC3q9HnheCc3s1jZeLcW943pirPw/4lKpBkqlDubnl/riycnLsLy88EKj0fhzuRyZv8RFo1E6wpBYkiqy7Z54YmIcVlYeyOKC4mYwJ0nHRaQuM5vNT6hB/iceG7sIq6sPnwmC4MerDkby40AOCCoiddie1Wp92W7zQ2KTyQSLizNP8T0EsPLBbxEDnCj0GkM2qIEwyZRCobizsfH5A1ZXFhuN52F29vpz3HkL574mk8lj24Y5wsHkvjjoX0BOIWc5jruHzbK2ufmzEwpFO3jnDhQv4JoROYdoERVyGjEgZ8iBDlF3FzXo4go6utZ9lftY4N/dXisjR0i1G0ublv8KMAA0ZoUlicxrhwAAAABJRU5ErkJggg=='); background-position: 50% 50%; background-repeat: no-repeat; }
...@@ -90,5 +90,5 @@ ...@@ -90,5 +90,5 @@
.drawing-board-control-size-dropdown li:hover { background: #ccc; } .drawing-board-control-size-dropdown li:hover { background: #ccc; }
.drawing-board-control-size-dropdown span { margin: auto; display: inline-block; vertical-align: middle;} .drawing-board-control-size-dropdown span { margin: auto; display: inline-block; vertical-align: middle;}
.drawing-board-control-download-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAoBJREFUeNqMkr9PU1EUx7/vR1tQ3yu10hAmTawtBSYSy2YccFOcnDQm/gewOLnj5GYMg4sdXFxkMca4OBAwdUBe/ZkIGFp+9tHXvh/3/fTcAm01aLzJybnn3nM+95tzrnDl6Tb+sibuTmWUWj3C6/Juk+LySUmyvt0FCKKA02ryOCy6LBiu15ngMbZ5DDCNBqIw6gKM+n4nECUJru3glKry8CpjQaHVYmC2rVH82DIMMMdGGARdwJ+SPNdFS9chx+MXDNMp/NzagWNatk/nQU/hiYAoih6FYTBCBs9zUXMCbAhx2OYOv351lPOJ3EwH4LteL6Dcp/Rfu3FrstDyIizt+agpaYxNDU0M9gl4v7Ck+TYrCYLQqZHUyTtdQBiutPSGUflczSXHs5lVKwZdSOBMvwztxVvN0RtzsiyXBFHsAvL5PBSnCpXV2getILFiE2SjspYbuZzPiDSZ2vOXmlvX5yQqTmMfg9ZXqtls1wnT09OHEyAq0aFLg/gSXsSWq9wWk+p9PrCoYTwcijdLOfE7UsEufN9HGIYnT4EnTGIXe1KqtNNIvuNnGamxfi7SgQD/nIJCTbzOPQ/SQh1pud7T4M6W/8qFIw/5WAr5m7Ozsw9UVc069Fls2yJzSC5/lnc9RhaHZVnfSqUnEgXP2oBqtYqBgYG2+mKxmOVADnAcB4yxHgD1RzehKKns/LyV4gUHBweQy+UyRkdH6UKJ6fQDFxcXoWkaXJeRuTgUGCdLQJ9bx72lGZimGWs2m+083oN+2iiFQiGxvLy8RrDzudyltgrG3N8U2G8CrPz4sGYYRqJSqWR4H/jNWbJhUjAWi8XG8R/L87yPpGCVttVfAgwAVpZR+8tZC08AAAAASUVORK5CYII='); background-position: 50% 50%; background-repeat: no-repeat; } .drawing-board-control-download-button { overflow: hidden; *text-indent: -9999px; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJ1JREFUeNpiYMADIiIiGkAYnxomBvygHorJNoAgGI4GAEM9AYSJFWdEU2QApM5DuYlAPB8L23DFihUX4AZA4xkUVY5AiQNAPkhhAg4XLwCqSQSqcQCy9wNxI4YXQApACnFpJioQsRiCVTPeWIBqmADCuDSDAAu+KAJqLCQUjcgGGAADh9joN0A24AOU3U9GOvrAghRYAqRqBukFCDAAdsY3kbu0QI0AAAAASUVORK5CYII='); background-position: 50% 50%; background-repeat: no-repeat; }
.drawing-board-control-download-button:before { content: ""; display: block; width: 0; height: 100%; } .drawing-board-control-download-button:before { content: ""; display: block; width: 0; height: 100%; }
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
...@@ -141,7 +141,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -141,7 +141,9 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// 編集 // 編集
protected String mEditFilePath; //再編集する時、Webからもらうクリックしたイメージファイルのパス protected String mEditFilePath; //再編集する時、Webからもらうクリックしたイメージファイルのパス
protected int mEnablePhotoEdit; //最初ファイルをアップロードする時、Webからもらう編集可能可否のパラメタ 0:編集する。 1:編集しない。 protected String mEnablePhotoEdit; //最初ファイルをアップロードする時、Webからもらう編集可能可否のパラメタ 0:編集する。 1:編集しない。
protected PhotoEditActivity mPhotoEditDialog;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -1006,7 +1008,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1006,7 +1008,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} else if (mCmd.equals(ABookKeys.CMD_SAVE_ATTACHED)) { } else if (mCmd.equals(ABookKeys.CMD_SAVE_ATTACHED)) {
mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME); mAttachedFileName = abookCheckParam.get(ABookKeys.FILE_NAME);
//編集可否を判別 //編集可否を判別
mEnablePhotoEdit = Integer.valueOf(abookCheckParam.get(ABookKeys.EDITABLE)); //添付したファイルの編集可否のパラメタ mEnablePhotoEdit = abookCheckParam.get(ABookKeys.EDITABLE) == null ? "0" : abookCheckParam.get(ABookKeys.EDITABLE); //添付したファイルの編集可否のパラメタ
getAttachedDataUrl(); getAttachedDataUrl();
} else if (mCmd.equals(ABookKeys.CMD_EDIT_ATTACHED)){ } else if (mCmd.equals(ABookKeys.CMD_EDIT_ATTACHED)){
//編集パラメタ( //編集パラメタ(
...@@ -1097,7 +1099,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1097,7 +1099,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} }
mLocalFile = null; mLocalFile = null;
//編集可能可否をチェックする。 //編集可能可否をチェックする。
if (mEnablePhotoEdit == 0) { //編集の場合、編集画面を開ける。 if (mEnablePhotoEdit.equals("1")) { //編集の場合、編集画面を開ける。
commonOpenEditPage(); commonOpenEditPage();
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -1355,13 +1357,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1355,13 +1357,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
if(FileUtil.exists(tempImagePath)){ //Tempパスにファイルがある場合、編集を実行 if(FileUtil.exists(tempImagePath)){ //Tempパスにファイルがある場合、編集を実行
//編集画面をコール //編集画面をコール
PhotoEditActivity dialog = new PhotoEditActivity(ABVContentViewActivity.this, tempImagePath); //ロードして編集するイメージのパスを設定 PhotoEditActivity dialog = new PhotoEditActivity(ABVContentViewActivity.this, tempImagePath); //ロードして編集するイメージのパスを設定
dialog.show(); showPhotoEditDialog(dialog);
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override @Override
public void onDismiss(DialogInterface dialogInterface) { public void onDismiss(DialogInterface dialogInterface) {
//Web Cacheが更新されて編集画面のダイアローグ閉じた後、JavascriptにてImgタグを再生成してThumbnailを更新 //Web Cacheが更新されて編集画面のダイアローグ閉じた後、JavascriptにてImgタグを再生成してThumbnailを更新
webViewLoadUrl(String.format("javascript:document.getElementById('reportForm').contentWindow.changeThumbnailTagForAnd('%s','%s')", mAttachedFileName, tempImagePath)); webViewLoadUrl(String.format("javascript:document.getElementById('reportForm').contentWindow.changeThumbnailTagForAnd('%s','%s')", mAttachedFileName, tempImagePath));
afterABookCheckApi(mCmd, mTaskKey, 0, "", null); afterABookCheckApi(mCmd, mTaskKey, 0, "", null);
mPhotoEditDialog = null;
} }
}); });
} }
...@@ -1372,4 +1375,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -1372,4 +1375,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
} }
}); });
} }
protected void showPhotoEditDialog(PhotoEditActivity photoEditDialog) {
if (this.mPhotoEditDialog != null) {
this.mPhotoEditDialog.dismiss();
}
else {
this.mPhotoEditDialog = photoEditDialog;
this.mPhotoEditDialog.show();
}
}
} }
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