v3.4.0

Author: s1204IT

app/build.gradle

@@ -5,14 +5,14 @@ plugins {
 android {
     namespace = 'com.saradabar.easyblu'
     //namespace = 'jp.co.benesse.touch.setuplogin'
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 24
         //noinspection ExpiredTargetSdkVersion
         targetSdk = 22
-        versionCode = 10
-        versionName = "3.3.0"
+        versionCode = 11
+        versionName = "3.4.0"
         proguardFiles += 'proguard-rules.pro'
         multiDexEnabled = false
     }
@@ -49,5 +49,6 @@ android {
 
 dependencies {
     implementation 'me.s1204:DchaService:1.0.0'
+    compileOnly 'me.s1204:BenesseExtension:1.0.0'
     implementation 'com.google.android.material:material:1.12.0'
 }

app/src/main/assets/FT8205_HSD_10P1_V8E_D01_20221227_all.bin

@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.BenesseExtension;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
@@ -58,6 +59,10 @@ public class MainActivity extends Activity {
     private static final boolean CTX = Build.MODEL.equals(MODEL_CTX); // CTX で同上
     private static final boolean CTZ = Build.MODEL.equals(MODEL_CTZ); // CTZ で同上
 
+    private static final String BC_NVT_TP_FW_UPDATE = "bc:touchpanel:nvt:fw_update";
+    private static final String NVT_TP_FW = "NT36523_AUO1010_G101_PID7501_V0x12.bin"; // タッチパネルファームウェア
+    private static final String NVT_TP_FW_UPDATE = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/" + NVT_TP_FW;
+
     private static final String LAUNCHER3 = "com.android.launcher3";
     private static final String APP_PACKAGE = "com.saradabar.easyblu";
 
@@ -415,12 +420,23 @@ private void setDchaStateCompleted() {
     }
 
     private void setEnvWithDcha(boolean completed) {
-        hideNavigationBar(completed ? false : true);
+        hideNavigationBar(!completed);
         setSetupStatus(completed ? DIGICHALIZE_STATUS_UNDIGICHALIZE : DIGICHALIZE_STATUS_DIGICHARIZING_DL_COMPLETE);
         clearDefaultPreferredApp(completed ? APP_PACKAGE : LAUNCHER3);
         setDefaultPreferredHomeApp(completed ? LAUNCHER3 : APP_PACKAGE);
     }
 
+    private void updateTouchpanelFw() {
+        notify("タッチパネルのファームウェアを更新しています");
+        copyAssets(NVT_TP_FW);
+        try {
+            BenesseExtension.putString(BC_NVT_TP_FW_UPDATE, NVT_TP_FW_UPDATE);
+        } catch (Exception e) {
+            error(e);
+        }
+        callFunc(this::openSettings);
+    }
+
     /**
      * CTX/CTZ にて、FRP を上書き
      * @see #copyAssets(String)
@@ -436,7 +452,7 @@ private void overwriteFrp() {
         } catch (Exception e) {
             error(e);
         }
-        callFunc(this::openSettings);
+        callFunc(CTZ ? this::updateTouchpanelFw : this::openSettings);
     }
 
     /**

app/src/main/assets/NT36523_AUO1010_G101_PID7501_V0x12.bin

@@ -4,7 +4,7 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'com.android.application' version '8.10.0' apply false
+        id 'com.android.application' version '8.12.1' apply false
     }
 }