Commit e1204f2a by Kim Jinsung

Task #55385 API33対応(ターゲットバージョンのみ)

parent 20fba104
......@@ -31,6 +31,7 @@
<!-- BLE -->
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
<permission
android:name="${applicationId}.permission.C2D_MESSAGE"
......
......@@ -17,12 +17,11 @@ dependencies {
}
android {
compileSdkVersion 31
buildToolsVersion '30.0.2'
compileSdkVersion 33
defaultConfig {
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
multiDexEnabled true
// from gradle.properties
......
......@@ -6,12 +6,11 @@ buildscript {
apply plugin: 'com.android.library'
android {
compileSdkVersion 31
buildToolsVersion '30.0.2'
compileSdkVersion 33
defaultConfig {
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
//abvEnvironments
resValue("string", "acms_address", "${acms_address}")
resValue("string", "download_server_address", "${download_server_address}")
......
......@@ -25,12 +25,11 @@ dependencies {
}
android {
compileSdkVersion 31
buildToolsVersion '30.0.2'
compileSdkVersion 33
defaultConfig {
minSdkVersion 23
targetSdkVersion 31
targetSdkVersion 33
multiDexEnabled true
}
sourceSets {
......
......@@ -96,10 +96,7 @@ public class ABVCachedWebView extends WebView {
@SuppressLint("JavascriptInterface")
public void initSetting() {
Logger.d(TAG, "[initSetting]");
getSettings().setAppCacheEnabled(true);
getSettings().setAllowFileAccess(true);
getSettings().setAppCacheMaxSize(8 * 1024 * 1024);
//jacascriptを許可する
getSettings().setJavaScriptEnabled(true);
addJavascriptInterface(new _JavascriptInterface(), "ABVCachedWebView");
......
......@@ -224,7 +224,6 @@ public class DashboardActivity extends OperationActivity {
//noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応(あまり効果ない?)
settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false);
settings.setDisplayZoomControls(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
......
......@@ -135,7 +135,6 @@ public class EnqueteWebViewActivity extends ABVContentViewActivity {
//noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応(あまり効果ない?)
settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
// webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
......
......@@ -129,7 +129,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
//noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応(あまり効果ない?)
settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
// webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
......
......@@ -111,7 +111,6 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
settings.setUseWideViewPort(true); // 画面の横幅にページの横幅を合わせる
settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応(あまり効果ない?)
settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
......
......@@ -90,7 +90,6 @@ public class OperationTaskLayout extends RelativeLayout {
//noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応(あまり効果ない?)
settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
// mWebView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
......
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