Merge branch 'contract/sato/1.0.1_34545' into 'contract/sato/1.0.1'

Contract/sato/1.0.1 34545 See merge request !27

Merge branch 'contract/sato/1.0.1_34545' into 'contract/sato/1.0.1'
Contract/sato/1.0.1 34545 See merge request !27
e766b592 · Kim Jinsung · cf4233a0 · 8bd35390 · e766b592 · e766b592
Commit e766b592 authored Aug 02, 2019 by Kim Jinsung
34 changed files
--- a/ABVJE_Launcher_Android/AndroidManifest.xml
+++ b/ABVJE_Launcher_Android/AndroidManifest.xml
@@ -44,7 +44,6 @@
        android:icon="@drawable/app_icon"
        android:label="@string/app_name"
        android:theme="@style/ABook"
-        android:allowBackup="false"
        android:largeHeap="true" >
        <!-- LinkingビーコンIFの使用宣言 -->

--- a/ABVJE_Launcher_Android/build.gradle
+++ b/ABVJE_Launcher_Android/build.gradle
@@ -92,18 +92,27 @@ android {
                    abiFilters "armeabi-v7a", ""
                }
            }
-            x86 {
+            armv8 {
                versionCode defaultConfig.versionCode + 1
                ndk {
+                    abiFilters "arm64-v8a", ""
+                }
+            }
+            x86 {
+                versionCode defaultConfig.versionCode + 2
+                ndk {
                    abiFilters "x86", ""
                }
            }
-            // 容量が大きいため、コメントアウト
-//            x86_armv7 {
+            x86_64 {
-//                ndk {
+                versionCode defaultConfig.versionCode + 3
-//                    abiFilters "x86", "armeabi-v7a", ""
+                ndk {
-//                }
+                    abiFilters "x86_64", ""
-//            }
+                }
+            }
        } else {
            armv7 {
                versionCode defaultConfig.versionCode
@@ -111,6 +120,13 @@ android {
                    abiFilters "armeabi-v7a", ""
                }
            }
+            armv8 {
+                versionCode defaultConfig.versionCode + 1
+                ndk {
+                    abiFilters "arm64-v8a", ""
+                }
+            }
        }
    }
 }

--- a/ABVJE_Res_Default_Android/build.gradle
+++ b/ABVJE_Res_Default_Android/build.gradle
@@ -11,7 +11,7 @@ android {
    defaultConfig {
        minSdkVersion 18
-        targetSdkVersion 26
+        targetSdkVersion 28
        //abvEnvironments
        resValue("string", "acms_address", "${acms_address}")
        resValue("string", "download_server_address", "${download_server_address}")

--- a/ABVJE_UI_Android/build.gradle
+++ b/ABVJE_UI_Android/build.gradle
@@ -19,7 +19,7 @@ dependencies {
    implementation 'com.google.zxing:core:3.2.1'
    implementation 'org.jsoup:jsoup:1.9.2'
    implementation project(':xwalk_core_library')
-    implementation files('libs/FoxitRDK.jar')
+    implementation project(':FoxitRDK')
    implementation project(':SwiftDecoderMobile')
    implementation files('libs/sdaiflib.jar')
 }
@@ -30,7 +30,7 @@ android {
  defaultConfig {
    minSdkVersion 18
-    targetSdkVersion 26
+    targetSdkVersion 28
    multiDexEnabled true
  }
  sourceSets {

--- a/ABVJE_UI_Android/libs/FoxitRDK.jar
+++ b/ABVJE_UI_Android/libs/FoxitRDK.jar
--- a/ABVJE_UI_Android/libs/arm64-v8a/libOZUSLClientDES128.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libOZUSLClientDES128.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libOZUSLClientSession.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libOZUSLClientSession.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrv.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrv.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_hwpwriter.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_hwpwriter.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_pdfwriter.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_pdfwriter.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_pptwriter.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_pptwriter.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_recognition.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_recognition.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_xlswriter.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_xlswriter.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_xlsxwriter.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libozrvpack_xlsxwriter.so
--- a/ABVJE_UI_Android/libs/arm64-v8a/libskia_android.so
+++ b/ABVJE_UI_Android/libs/arm64-v8a/libskia_android.so
--- a/ABVJE_UI_Android/libs/armeabi-v7a/librdk.so
+++ b/ABVJE_UI_Android/libs/armeabi-v7a/librdk.so
--- a/ABVJE_UI_Android/libs/x86/librdk.so
+++ b/ABVJE_UI_Android/libs/x86/librdk.so
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/ContentLogUtil.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/ContentLogUtil.java
@@ -2,6 +2,7 @@ package jp.agentec.abook.abv.cl.util;
 import jp.agentec.abook.abv.bl.acms.client.json.content.MediaInfoJSON;
 import jp.agentec.abook.abv.bl.acms.client.json.content.PageObjectJSON;
+import jp.agentec.abook.abv.bl.common.Constant;
 import jp.agentec.abook.abv.bl.common.log.Logger;
 import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
 import jp.agentec.abook.abv.bl.data.dao.ContentObjectLogDao;
@@ -13,6 +14,7 @@ import jp.agentec.abook.abv.bl.logic.ContentReadingLogLogic;
 import jp.agentec.abook.abv.bl.logic.ContractLogic;
 import jp.agentec.abook.abv.bl.websocket.MeetingManager;
 import jp.agentec.abook.abv.launcher.android.R;
+import jp.agentec.abook.abv.ui.home.helper.ABookPermissionHelper;
 import jp.agentec.adf.util.DateTimeUtil;
 import org.json.adf.JSONException;
@@ -51,7 +53,8 @@ public class ContentLogUtil {
 		int readingLogId = contentReadingLogLogic.startContentReadLog(contentId);
 		// 位置情報取得許可、サービスオプション、ビルドオプションチェック
-		if (checkUsableReadinglogGps(contentId)) { //20190529 アプリ側の位置情報許可チェックはしない
+		ABookPermissionHelper helper = new ABookPermissionHelper(context, Constant.ABookPermissionType.AccessFineLocation, null);
+		if (helper.checkMultiPermissions(false) && checkUsableReadinglogGps(contentId)) { //20190529 アプリ側の位置情報許可チェックはしない
 			// 位置情報取得
 			locationManagerUtil = new LocationManagerUtil(context, new LocationManagerUtil.LocationManagerUtilListener() {
 				@Override

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/PreSplashActivity.java
+++ b/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;
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import jp.agentec.abook.abv.launcher.android.R;
@@ -14,8 +15,11 @@ public class PreSplashActivity extends Activity {
    static {
        try {
+            // アーキテクチャがx86以外の場合のみ、以下のライブラリをロードする。
+            if (!Build.CPU_ABI.contains("x86")) {
                System.loadLibrary("skia_android");
                System.loadLibrary("ozrv");
+            }
        } catch (Exception e) {
            e.printStackTrace();
        }

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookPermissionHelper.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookPermissionHelper.java
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
@@ -259,9 +259,22 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
        strParam += "viewer.exportcommand=true#";
        strParam += "toolbar.etc=false#";
+        strParam += "eform.inputeventcommand=true#";
+        strParam += "eform.imagepicker_camera_show_choose_button=true#";
        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) {
        if (!(mIsSkiaLoad && mIsViewerLoad)) {
            if (!loadLibrary()) {

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
@@ -103,7 +103,9 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
        webView = (WebView) findViewById(R.id.webView2);
        webView.setVisibility(View.VISIBLE);
        webView.setVerticalScrollbarOverlay(true); // スクロールバー部分の隙間を消す
+        if (Logger.isDebugEnabled()) {
            webView.setWebContentsDebuggingEnabled(true); //デバッグモード（chromeからinspect可)
+        }
        // webView.setWebViewClient(new WebViewClient());
        // //ブラウザの描画領域を対象としたイベントをフック
        WebSettings settings = webView.getSettings();

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLXWalkWebViewActivity.java
@@ -119,9 +119,9 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
        settings.setUseWideViewPort(true); // 画面の横幅にページの横幅を合わせる
        settings.setDomStorageEnabled(true); // WebStorage有効化
        settings.setCacheMode(XWalkSettings.LOAD_NO_CACHE);
+        if (Logger.isDebugEnabled()) {
            XWalkPreferences.setValue(XWalkPreferences.REMOTE_DEBUGGING, true); //デバッグモード（chromeからinspect可)
+        }
        final RelativeLayout fl = (RelativeLayout) findViewById(R.id.frameTopbar);
        // ***** 戻るボタン

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionZoomLayout.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionZoomLayout.java
@@ -35,7 +35,7 @@ public class ActionZoomLayout extends RelativeLayout {
 	@Override
 	protected void dispatchDraw(Canvas canvas) {
-		canvas.save(Canvas.MATRIX_SAVE_FLAG);
+		canvas.save(Canvas.ALL_SAVE_FLAG);
 		canvas.concat(imgMatrix);
 		super.dispatchDraw(canvas);
 		canvas.restore();

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/EnqueteWebView.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/EnqueteWebView.java
@@ -14,7 +14,7 @@ public class EnqueteWebView extends WebView {
 	@Override
 	protected void onDraw(android.graphics.Canvas canvas) {	
-		canvas.saveLayerAlpha(0, 0, Float.MAX_VALUE, Float.MAX_VALUE, alpha, Canvas.HAS_ALPHA_LAYER_SAVE_FLAG);		
+		canvas.saveLayerAlpha(0, 0, Float.MAX_VALUE, Float.MAX_VALUE, alpha, Canvas.ALL_SAVE_FLAG);
 		super.onDraw(canvas);
 	}

--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ZoomRelativeLayout.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ZoomRelativeLayout.java
@@ -179,7 +179,7 @@ public class ZoomRelativeLayout extends RelativeLayout {
 	@Override
 	protected void dispatchDraw(Canvas canvas) {
-		canvas.save(Canvas.MATRIX_SAVE_FLAG);
+		canvas.save(Canvas.ALL_SAVE_FLAG);
 		if (!isOperationPdf) {
 			canvas.concat(imgMatrix);
 		}

--- a/FoxitRDK/FoxitRDK.aar
+++ b/FoxitRDK/FoxitRDK.aar
--- a/FoxitRDK/build.gradle
+++ b/FoxitRDK/build.gradle
+configurations.maybeCreate("default")
+artifacts.add("default", file('FoxitRDK.aar'))
\ No newline at end of file
--- a/settings.gradle
+++ b/settings.gradle
 include ':ABVJE_BL', ':ABVJE_Launcher_Android', ':ABVJE_Res_Default_Android', ':ABVJE_UI_Android', ':SwiftDecoderMobile'
 include ':xwalk_core_library'
+include ':FoxitRDK'
\ No newline at end of file
--- a/xwalk_core_library/build.gradle
+++ b/xwalk_core_library/build.gradle
@@ -6,7 +6,7 @@ android {
    defaultConfig {
        minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
    }
    buildTypes {

--- a/xwalk_core_library/src/main/jniLibs/arm64-v8a/libxwalkcore.so
+++ b/xwalk_core_library/src/main/jniLibs/arm64-v8a/libxwalkcore.so
--- a/xwalk_core_library/src/main/jniLibs/arm64-v8a/libxwalkdummy.so
+++ b/xwalk_core_library/src/main/jniLibs/arm64-v8a/libxwalkdummy.so
--- a/xwalk_core_library/src/main/jniLibs/x86_64/libxwalkcore.so
+++ b/xwalk_core_library/src/main/jniLibs/x86_64/libxwalkcore.so
--- a/xwalk_core_library/src/main/jniLibs/x86_64/libxwalkdummy.so
+++ b/xwalk_core_library/src/main/jniLibs/x86_64/libxwalkdummy.so