Commit f151b2f6 by Kim Jinsung

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

Feature/1.1.0 34413

See merge request !20
parents db684b42 995d811f
...@@ -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>
......
...@@ -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", ""
}
}
} }
} }
} }
......
...@@ -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}")
......
...@@ -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
} }
......
...@@ -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 {
// アーキテクチャがx86以外の場合のみ、以下のライブラリをロードする。
if (!Build.CPU_ABI.contains("x86")) {
System.loadLibrary("skia_android"); System.loadLibrary("skia_android");
System.loadLibrary("ozrv"); System.loadLibrary("ozrv");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
...@@ -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();
......
...@@ -179,7 +179,7 @@ public class ZoomRelativeLayout extends RelativeLayout { ...@@ -179,7 +179,7 @@ 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);
} }
......
configurations.maybeCreate("default")
artifacts.add("default", file('FoxitRDK.aar'))
\ No newline at end of file
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