Skip to content

A
abook_check
Commit 1658176d by Jeong Gilmo
Options

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

parents 90cadb02 f151b2f6
Showing with 102 additions and 20 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_Launcher_Android/AndroidManifest.xml
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
android:icon="@drawable/app_icon" android:icon="@drawable/app_icon"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/ABook" android:theme="@style/ABook"
android:allowBackup="false"
android:largeHeap="true" > android:largeHeap="true" >
<service android:name="jp.agentec.abook.abv.cl.push.ABVFcmListenerService"> <service android:name="jp.agentec.abook.abv.cl.push.ABVFcmListenerService">
<intent-filter> <intent-filter>
...@@ -194,7 +193,10 @@ ...@@ -194,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_Launcher_Android/build.gradle
...@@ -92,12 +92,28 @@ android { ...@@ -92,12 +92,28 @@ android {
abiFilters "armeabi-v7a", "" abiFilters "armeabi-v7a", ""
} }
} }
x86 {
armv8 {
versionCode defaultConfig.versionCode + 1 versionCode defaultConfig.versionCode + 1
ndk { ndk {
abiFilters "arm64-v8a", ""
}
}
x86 {
versionCode defaultConfig.versionCode + 2
ndk {
abiFilters "x86", "" abiFilters "x86", ""
} }
} }
x86_64 {
versionCode defaultConfig.versionCode + 3
ndk {
abiFilters "x86_64", ""
}
}
// 容量が大きいため、コメントアウト // 容量が大きいため、コメントアウト
// x86_armv7 { // x86_armv7 {
// ndk { // ndk {
...@@ -111,6 +127,12 @@ android { ...@@ -111,6 +127,12 @@ android {
abiFilters "armeabi-v7a", "" abiFilters "armeabi-v7a", ""
} }
} }
armv8 {
versionCode defaultConfig.versionCode + 1
ndk {
abiFilters "arm64-v8a", ""
}
}
} }
} }
} }
......
ABVJE_Res_Default_Android/build.gradle
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
buildToolsVersion '27.0.3' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
//abvEnvironments //abvEnvironments
resValue("string", "acms_address", "${acms_address}") resValue("string", "acms_address", "${acms_address}")
......
ABVJE_UI_Android/build.gradle
...@@ -13,6 +13,7 @@ dependencies { ...@@ -13,6 +13,7 @@ dependencies {
implementation files('libs/ozrv_android.jar') implementation files('libs/ozrv_android.jar')
api 'com.google.firebase:firebase-core:11.4.0' api 'com.google.firebase:firebase-core:11.4.0'
api 'com.google.firebase:firebase-messaging:11.4.0' api 'com.google.firebase:firebase-messaging:11.4.0'
api 'com.android.support:appcompat-v7:21.0.+'
implementation 'commons-codec:commons-codec:1.10' implementation 'commons-codec:commons-codec:1.10'
implementation 'net.lingala.zip4j:zip4j:1.3.2' implementation 'net.lingala.zip4j:zip4j:1.3.2'
...@@ -20,7 +21,7 @@ dependencies { ...@@ -20,7 +21,7 @@ dependencies {
implementation 'com.google.zxing:core:3.2.1' implementation 'com.google.zxing:core:3.2.1'
implementation 'org.jsoup:jsoup:1.9.2' implementation 'org.jsoup:jsoup:1.9.2'
implementation project(':xwalk_core_library') implementation project(':xwalk_core_library')
implementation files('libs/FoxitRDK.jar') implementation project(':FoxitRDK')
} }
android { android {
...@@ -28,7 +29,7 @@ android { ...@@ -28,7 +29,7 @@ android {
buildToolsVersion '27.0.3' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
multiDexEnabled true multiDexEnabled true
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PreSplashActivity.java
...@@ -2,6 +2,7 @@ package jp.agentec.abook.abv.ui.home.activity; ...@@ -2,6 +2,7 @@ package jp.agentec.abook.abv.ui.home.activity;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import jp.agentec.abook.abv.launcher.android.R; import jp.agentec.abook.abv.launcher.android.R;
...@@ -14,8 +15,11 @@ public class PreSplashActivity extends Activity { ...@@ -14,8 +15,11 @@ public class PreSplashActivity extends Activity {
static { static {
try { try {
System.loadLibrary("skia_android"); // アーキテクチャがx86以外の場合のみ、以下のライブラリをロードする。
System.loadLibrary("ozrv"); if (!Build.CPU_ABI.contains("x86")) {
System.loadLibrary("skia_android");
System.loadLibrary("ozrv");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
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/ActionZoomLayout.java
...@@ -35,7 +35,7 @@ public class ActionZoomLayout extends RelativeLayout { ...@@ -35,7 +35,7 @@ public class ActionZoomLayout extends RelativeLayout {
@Override @Override
protected void dispatchDraw(Canvas canvas) { protected void dispatchDraw(Canvas canvas) {
canvas.save(Canvas.MATRIX_SAVE_FLAG); canvas.save(Canvas.ALL_SAVE_FLAG);
canvas.concat(imgMatrix); canvas.concat(imgMatrix);
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
canvas.restore(); canvas.restore();
......
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
...@@ -179,12 +179,11 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -179,12 +179,11 @@ public class ZoomRelativeLayout extends RelativeLayout {
@Override @Override
protected void dispatchDraw(Canvas canvas) { protected void dispatchDraw(Canvas canvas) {
canvas.save(Canvas.MATRIX_SAVE_FLAG); canvas.save(Canvas.ALL_SAVE_FLAG);
if (!isOperationPdf) { if (!isOperationPdf) {
canvas.concat(imgMatrix); canvas.concat(imgMatrix);
} }
super.dispatchDraw(canvas); super.dispatchDraw(canvas);
invalidate();
canvas.restore(); canvas.restore();
} }
......
FoxitRDK/build.gradle 0 → 100644
configurations.maybeCreate("default")
artifacts.add("default", file('FoxitRDK.aar'))
\ No newline at end of file
settings.gradle
include ':ABVJE_BL', ':ABVJE_Launcher_Android', ':ABVJE_Res_Default_Android', ':ABVJE_UI_Android' include ':ABVJE_BL', ':ABVJE_Launcher_Android', ':ABVJE_Res_Default_Android', ':ABVJE_UI_Android'
include ':xwalk_core_library' include ':xwalk_core_library'
include ':FoxitRDK'
\ No newline at end of file
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