Skip to content

A
abook_check
Commit 995d811f by Lee Jaebin
Options

Merge branch 'feature/1.1.0' into feature/1.1.0_34413

parents 5c58b0f4 db684b42
Showing with 78 additions and 28 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
...@@ -542,7 +542,6 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -542,7 +542,6 @@ public class AcmsClient implements AcmsClientResponseListener {
HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_HOT_SPOT_INFO, taskReportDto.taskHotSpotInfo)); HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_HOT_SPOT_INFO, taskReportDto.taskHotSpotInfo));
HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_REPORT_INFO, taskReportDto.jsonData)); HttpMultipartList.add(new HttpMultipart(ABookKeys.TASK_REPORT_INFO, taskReportDto.jsonData));
HttpMultipartList.add(new HttpMultipart(ABookKeys.ATTACHED_CHANGE_FLAG, taskReportDto.attachedFileSendFlg ? "1" : "0")); HttpMultipartList.add(new HttpMultipart(ABookKeys.ATTACHED_CHANGE_FLAG, taskReportDto.attachedFileSendFlg ? "1" : "0"));
HttpMultipartList.add(new HttpMultipart(ABookKeys.ROUTINE_TASK_FLAG, reportType == Constant.ReportType.RoutineTask ? "1" : "0"));
HttpMultipartList.add(new HttpMultipart(ABookKeys.UPDATE_HOTSPOT_ONLY_FLAG, hotspotChangeFlg ? "1" : "0")); HttpMultipartList.add(new HttpMultipart(ABookKeys.UPDATE_HOTSPOT_ONLY_FLAG, hotspotChangeFlg ? "1" : "0"));
// 定期点検用 // 定期点検用
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/MOperationGroupMaster.java
...@@ -4,6 +4,7 @@ import java.util.ArrayList; ...@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase; import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
import jp.agentec.abook.abv.bl.data.DatabaseVersions;
import jp.agentec.adf.util.StringUtil; import jp.agentec.adf.util.StringUtil;
/** /**
...@@ -43,7 +44,11 @@ public class MOperationGroupMaster extends SQLiteTableScript { ...@@ -43,7 +44,11 @@ public class MOperationGroupMaster extends SQLiteTableScript {
@Override @Override
public List<String> getUpgradeScript(int oldVersion, int newVersion) { public List<String> getUpgradeScript(int oldVersion, int newVersion) {
return null; List<String> ddl = new ArrayList<String>();
if (oldVersion < DatabaseVersions.Ver1_1_0) {
ddl.addAll(getCreateScript(newVersion));
}
return ddl;
} }
@Override @Override
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/ROperationGroupMasterOperation.java
...@@ -4,6 +4,7 @@ import java.util.ArrayList; ...@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase; import jp.agentec.abook.abv.bl.common.db.SQLiteDatabase;
import jp.agentec.abook.abv.bl.data.DatabaseVersions;
/** /**
* Created by leej on 2019/06/25. * Created by leej on 2019/06/25.
...@@ -35,7 +36,11 @@ public class ROperationGroupMasterOperation extends SQLiteTableScript { ...@@ -35,7 +36,11 @@ public class ROperationGroupMasterOperation extends SQLiteTableScript {
@Override @Override
public List<String> getUpgradeScript(int oldVersion, int newVersion) { public List<String> getUpgradeScript(int oldVersion, int newVersion) {
return null; List<String> ddl = new ArrayList<String>();
if (oldVersion < DatabaseVersions.Ver1_1_0) {
ddl.addAll(getCreateScript(newVersion));
}
return ddl;
} }
@Override @Override
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/ApertureMasterDataLogic.java
...@@ -38,31 +38,20 @@ public class ApertureMasterDataLogic extends AbstractLogic { ...@@ -38,31 +38,20 @@ public class ApertureMasterDataLogic extends AbstractLogic {
//端末機の日付 //端末機の日付
String lastFetchDateString = cache.getTempApertureMasterDataFetchDate(); String lastFetchDateString = cache.getTempApertureMasterDataFetchDate();
GetApertureMasterDataParameters param = new GetApertureMasterDataParameters(cache.getMemberInfo().sid, lastFetchDateString);
//サーバーから絞り検索マスタデータを取得 //サーバーから絞り検索マスタデータを取得
GetApertureMasterDataParameters param = new GetApertureMasterDataParameters(cache.getMemberInfo().sid, lastFetchDateString);
ApertureMasterDataJSON masterDataJson = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getApertureMasterData(param); ApertureMasterDataJSON masterDataJson = AcmsClient.getInstance(cache.getUrlPath(), networkAdapter).getApertureMasterData(param);
//サーバーデータの日付 //サーバーデータの日付
String lastEditDateString = masterDataJson.lastEditDate; String lastEditDateString = masterDataJson.lastEditDate;
if (lastFetchDateString == null){ //サーバから取得した情報がある場合、端末に保存
//最初のマスタデータダウンロードの場合 if(lastEditDateString != null) {
if (masterDataJson.apertureData != null && masterDataJson.apertureData.keys().hasNext()) { //サーバーから取得した日付をキャッシュメモリに保存
createApertureMasterDataJson(masterDataJson.apertureData);
cache.setTempApertureMasterDataFetchDate(lastEditDateString); cache.setTempApertureMasterDataFetchDate(lastEditDateString);
}
}
else if(lastEditDateString != null){
//マスタデータがある場合、サーバーから修正事項があるセットだけ上書きする
Date lastFetchDate = DateTimeUtil.toDate(lastFetchDateString, "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
Date lastEditDate = DateTimeUtil.toDate(lastEditDateString, "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
if (lastEditDate != null && lastEditDate.after(lastFetchDate)) {
if (masterDataJson.apertureData != null && masterDataJson.apertureData.keys().hasNext()) { if (masterDataJson.apertureData != null && masterDataJson.apertureData.keys().hasNext()) {
createApertureMasterDataJson(masterDataJson.apertureData); createApertureMasterDataJson(masterDataJson.apertureData);
// updateApertureMasterDataJson(masterDataJson.apertureData); // updateApertureMasterDataJson(masterDataJson.apertureData);
cache.setTempApertureMasterDataFetchDate(lastEditDateString);
}
} }
} }
} catch (Exception e) { } catch (Exception e) {
......
ABVJE_Launcher_Android/AndroidManifest.xml
...@@ -193,7 +193,10 @@ ...@@ -193,7 +193,10 @@
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
<activity android:name="jp.agentec.abook.abv.ui.common.activity.ShowPushMessageDailogActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"> <activity android:name="jp.agentec.abook.abv.ui.common.activity.ShowPushMessageDailogActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|screenSize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
...@@ -259,9 +259,22 @@ public class CheckOZDViewActivity extends ABVContentViewActivity { ...@@ -259,9 +259,22 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
strParam += "viewer.exportcommand=true#"; strParam += "viewer.exportcommand=true#";
strParam += "toolbar.etc=false#"; strParam += "toolbar.etc=false#";
strParam += "eform.inputeventcommand=true#";
strParam += "eform.imagepicker_camera_show_choose_button=true#";
return strParam; return strParam;
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if(mOzReportViewer != null) {
//requestCode: 呼び出されたActivityに対する識別コード
//resultCode: ユーザーの操作の結果コード
//data: ギャラリーで選択したイメージ情報のIntent
mOzReportViewer.onActivityResult(this, requestCode, resultCode, data);
}
}
private boolean openViewer(String param) { private boolean openViewer(String param) {
if (!(mIsSkiaLoad && mIsViewerLoad)) { if (!(mIsSkiaLoad && mIsViewerLoad)) {
if (!loadLibrary()) { if (!loadLibrary()) {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionOperationTaskCode.java
package jp.agentec.abook.abv.ui.viewer.view; package jp.agentec.abook.abv.ui.viewer.view;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -62,4 +63,13 @@ public class ActionOperationTaskCode extends TextView { ...@@ -62,4 +63,13 @@ public class ActionOperationTaskCode extends TextView {
this.startAnimation(animation); this.startAnimation(animation);
this.isAnimated = true; this.isAnimated = true;
} }
@Override
protected void dispatchDraw(Canvas canvas) {
// アニメーション開始時、viewを描く
if (this.isAnimated) {
invalidate();
}
super.dispatchDraw(canvas);
}
} }
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionOperationTaskIcon.java
package jp.agentec.abook.abv.ui.viewer.view; package jp.agentec.abook.abv.ui.viewer.view;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.view.animation.AlphaAnimation; import android.view.animation.AlphaAnimation;
import android.view.animation.Animation; import android.view.animation.Animation;
...@@ -46,4 +47,13 @@ public class ActionOperationTaskIcon extends ImageView { ...@@ -46,4 +47,13 @@ public class ActionOperationTaskIcon extends ImageView {
this.startAnimation(animation); this.startAnimation(animation);
this.isAnimated = true; this.isAnimated = true;
} }
@Override
protected void dispatchDraw(Canvas canvas) {
// アニメーション開始時、viewを描く
if (this.isAnimated) {
invalidate();
}
super.dispatchDraw(canvas);
}
} }
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionOperationTaskPin.java
package jp.agentec.abook.abv.ui.viewer.view; package jp.agentec.abook.abv.ui.viewer.view;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -58,4 +59,13 @@ public class ActionOperationTaskPin extends ImageView { ...@@ -58,4 +59,13 @@ public class ActionOperationTaskPin extends ImageView {
this.startAnimation(animation); this.startAnimation(animation);
this.isAnimated = true; this.isAnimated = true;
} }
@Override
protected void dispatchDraw(Canvas canvas) {
// アニメーション開始時、viewを描く
if (this.isAnimated) {
invalidate();
}
super.dispatchDraw(canvas);
}
} }
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -52,7 +52,7 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -52,7 +52,7 @@ public class OperationTaskLayout extends RelativeLayout {
private static final int CODE_WIDTH = 46; private static final int CODE_WIDTH = 46;
private static final int CODE_HEIGHT = 26; private static final int CODE_HEIGHT = 26;
public static final int HALF_WIDTH = 340; public static final int HALF_WIDTH = 400;
public static final int COLOR_ORANGE = Color.rgb(255, 119, 0); public static final int COLOR_ORANGE = Color.rgb(255, 119, 0);
public static final int COLOR_BLUE = Color.rgb(27, 27, 210); public static final int COLOR_BLUE = Color.rgb(27, 27, 210);
...@@ -99,7 +99,14 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -99,7 +99,14 @@ public class OperationTaskLayout extends RelativeLayout {
mWebView.loadUrl(linkUrl); mWebView.loadUrl(linkUrl);
RelativeLayout.LayoutParams params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); RelativeLayout.LayoutParams params;
if (isNormalSize) {
params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
} else {
DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH);
params = createParam(halfWidth, ViewGroup.LayoutParams.MATCH_PARENT);
}
params.addRule(RelativeLayout.ALIGN_PARENT_TOP); params.addRule(RelativeLayout.ALIGN_PARENT_TOP);
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
addView(mWebView, params); addView(mWebView, params);
...@@ -283,12 +290,12 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -283,12 +290,12 @@ public class OperationTaskLayout extends RelativeLayout {
RelativeLayout.LayoutParams params; RelativeLayout.LayoutParams params;
if (isNormalSize) { if (isNormalSize) {
params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
} else { } else {
DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH); int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH);
int screenWidth = displayMetrics.widthPixels; int screenWidth = displayMetrics.widthPixels;
params = createParam(halfWidth, ViewGroup.LayoutParams.WRAP_CONTENT); params = createParam(halfWidth, ViewGroup.LayoutParams.MATCH_PARENT);
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
} }
...@@ -340,12 +347,12 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -340,12 +347,12 @@ public class OperationTaskLayout extends RelativeLayout {
public void setTaskFormPosition(float screenX, boolean isNormalSize) { public void setTaskFormPosition(float screenX, boolean isNormalSize) {
RelativeLayout.LayoutParams params; RelativeLayout.LayoutParams params;
if (isNormalSize) { if (isNormalSize) {
params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
} else { } else {
DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH); int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH);
int screenWidth = displayMetrics.widthPixels; int screenWidth = displayMetrics.widthPixels;
params = createParam(halfWidth, ViewGroup.LayoutParams.WRAP_CONTENT); params = createParam(halfWidth, ViewGroup.LayoutParams.MATCH_PARENT);
if (screenX < screenWidth / 2) { if (screenX < screenWidth / 2) {
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
...@@ -360,14 +367,14 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -360,14 +367,14 @@ public class OperationTaskLayout extends RelativeLayout {
public void setTaskFormPosition(String taskKey, boolean isNormalSize) { public void setTaskFormPosition(String taskKey, boolean isNormalSize) {
RelativeLayout.LayoutParams params; RelativeLayout.LayoutParams params;
if (isNormalSize) { if (isNormalSize) {
params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); params = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
setLayoutParams(params); setLayoutParams(params);
} else { } else {
DisplayMetrics displayMetrics = getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH); int halfWidth = (int) (displayMetrics.density * OperationTaskLayout.HALF_WIDTH);
params = createParam(halfWidth, ViewGroup.LayoutParams.WRAP_CONTENT); params = createParam(halfWidth, ViewGroup.LayoutParams.MATCH_PARENT);
if (!StringUtil.isNullOrEmpty(taskKey)) { if (!StringUtil.isNullOrEmpty(taskKey)) {
TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey); TaskDto taskDto = mTaskDao.getTaskByTaskKey(taskKey);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ZoomRelativeLayout.java
...@@ -184,7 +184,6 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -184,7 +184,6 @@ public class ZoomRelativeLayout extends RelativeLayout {
canvas.concat(imgMatrix); canvas.concat(imgMatrix);
} }
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
invalidate();
canvas.restore(); canvas.restore();
} }
......
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