Feature/offline plus

app/build.gradle

@@ -15,7 +15,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdk 29 // 超过29后，文件权限要大改
         versionCode 4
-        versionName '1.21.0-release'
+        versionName '1.21.3-release'
         manifestPlaceholders = [
                 JPUSH_PKGNAME : applicationId,
                 JPUSH_APPKEY : "599fe3f0f0f55d42155fae05", //JPush上注册的包名对应的Appkey，与包名相关，如果修改package name，需要自行注册极光推送账号，并修改这个选项
@@ -73,16 +73,22 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.activity:activity:1.9.3'
+    implementation 'androidx.biometric:biometric:1.2.0-alpha05' //生物识别
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
     // 其他类库
     implementation 'commons-io:commons-io:2.16.1' // 文件与路径处理
     implementation 'com.github.getActivity:XXPermissions:18.2' // 权限控制
     implementation files('libs/LPAPI-2024-10-21-R.jar') // 德佟打印机
     implementation 'com.github.REBOOTERS:Matisse:v0.6.0' // 图片选择
     implementation 'com.github.bumptech.glide:glide:4.16.0' // matisse依赖
+    implementation 'io.getstream:photoview:1.0.3' // 图片预览缩放
     implementation 'com.github.jenly1314:zxing-lite:3.1.1' // 二维码识别：扫描
     implementation 'com.github.jenly1314:camera-scan:1.1.1' // 二维码识别：识别
     implementation 'com.github.david-serrano:locationprovider:1.2' // 读取GPS
     implementation 'com.alibaba:fastjson:2.0.49' // JSON处理
+    compileOnly 'org.projectlombok:lombok:1.18.34' // 简化离线填报模型类模板代码
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
     implementation 'com.github.DImuthuUpe:AndroidPdfViewer:3.1.0-beta.1' // 预览PDF
     implementation 'cn.jiguang.sdk:jpush:5.3.1' // 极光推送
     implementation 'com.google.firebase:firebase-messaging:24.1.0' // 极光推送
@@ -93,5 +99,4 @@ dependencies {
     implementation 'com.vinaygaba:rubberstamp:1.0.0' // 图片水印
     implementation 'com.github.DantSu:ESCPOS-ThermalPrinter-Android:3.3.0' // ECS蓝牙打印机
     implementation 'com.github.zhaolewei:ZlwAudioRecorder:v1.08' // 录音机
-    implementation 'androidx.biometric:biometric:1.2.0-alpha05' //
-}
+}

app/release/output-metadata.json

@@ -12,8 +12,8 @@
       "filters": [],
       "attributes": [],
       "versionCode": 4,
-      "versionName": "1.20.2-release",
-      "outputFile": "hac-1.20.2-release.apk"
+      "versionName": "1.21.3-release",
+      "outputFile": "hac-1.21.3-release.apk"
     }
   ],
   "elementType": "File"

app/src/main/AndroidManifest.xml

@@ -142,6 +142,22 @@
         <activity
             android:name=".proxy.support.biometric.BiometricAuthActivity"
             android:exported="false" />
+        <activity android:name=".offlineform.CustomFormActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.OfflinePlusListActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.OfflinePlusExportListActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.OfflineProjectRecordActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.OfflineFormConfigDetailActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.OfflineFormRawConfigActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.OfflineExportedRecordDetailActivity"
+            android:exported="false" />
+        <activity android:name=".offlineform.formitem.image.OfflineImagePreviewActivity"
+            android:exported="false" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -191,4 +207,4 @@
 
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/huozige/lab/container/HACQRCodeScanActivity.java

@@ -26,6 +26,8 @@ public class HACQRCodeScanActivity extends BarcodeCameraScanActivity {
      * 存放条码类型的Extra名称
      */
     public static final String EXTRA_KEY_SCAN_HINTS = "hints";
+    // 允许不同扫码入口单独控制是否播放扫码提示音，默认保持原有的播放行为。
+    public static final String EXTRA_KEY_PLAY_BEEP = "playBeep";
     /**
      * 仅处理QR码，速度更快
      */
@@ -43,8 +45,8 @@ protected void onResume(){
     @Override
     public void initCameraScan(@NonNull CameraScan<Result> cameraScan) {
         super.initCameraScan(cameraScan);
-        // 根据需要设置CameraScan相关配置
-        cameraScan.setPlayBeep(true);
+        // 根据调用入口传入的参数决定是否播放提示音；未传时默认播放。
+        cameraScan.setPlayBeep(getIntent().getBooleanExtra(EXTRA_KEY_PLAY_BEEP, true));
     }
 
     @Nullable

app/src/main/java/com/huozige/lab/container/MainActivity.java

@@ -18,6 +18,7 @@
 
 import com.elvishew.xlog.XLog;
 import com.hjq.permissions.Permission;
+import com.huozige.lab.container.offlineform.OfflinePlusListActivity;
 import com.huozige.lab.container.platform.AbstractStaticFilesCacheFilter;
 import com.huozige.lab.container.platform.AbstractWebInterop;
 import com.huozige.lab.container.platform.hzg.HZGCacheFilter;
@@ -61,6 +62,7 @@ public class MainActivity extends BaseActivity {
     static final int MENU_ID_SETTINGS = 2;
     static final int MENU_ID_HELP = 3;
     static final int MENU_ID_ABOUT = 4;
+    static final int MENU_ID_OFFLINE_PLUS = 5;
 
     @SuppressLint({"JavascriptInterface", "SetJavaScriptEnabled"})
     @Override
@@ -250,6 +252,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
             menu.add(0, MENU_ID_SETTINGS, MENU_ID_SETTINGS, getString(R.string.ui_menu_settings));
         }
 
+        // 超级离线模式
+        if (ConfigManager.getInstance().getOfflinePlusMenuVisible()) {
+            menu.add(0, MENU_ID_OFFLINE_PLUS, MENU_ID_OFFLINE_PLUS, getString(R.string.ui_menu_offlineplus));
+        }
+
         // 帮助
         if (!ConfigManager.getInstance().getHelpUrl().isEmpty()) {
             menu.add(0, MENU_ID_HELP, MENU_ID_HELP, getString(R.string.ui_menu_help));
@@ -332,6 +339,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     _webView.loadUrl(ConfigManager.getInstance().getAboutUrl());
                 }
                 break;
+            case MENU_ID_OFFLINE_PLUS:
+                if (DeviceUtility.isOfflineMode()) {
+                    // 普通离线模式不允许执行后退操作
+                    Toast.makeText(this, "应用处于普通离线模式，无法打开【离线填报入口】页面。", Toast.LENGTH_LONG).show();
+                } else {
+                    startActivity(new Intent(this, OfflinePlusListActivity.class));
+                }
+                break;
             // 你可以在这里处理新创建菜单的点击事件
         }
 
@@ -361,4 +376,4 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
         }
     }
-}
+}

app/src/main/java/com/huozige/lab/container/OptionSettingsActivity.java

@@ -12,15 +12,21 @@
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.preference.PreferenceDataStore;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import com.elvishew.xlog.XLog;
+import com.hjq.permissions.Permission;
 import com.huozige.lab.container.utilities.ConfigManager;
 import com.huozige.lab.container.utilities.DeviceUtility;
 import com.huozige.lab.container.utilities.LifecycleUtility;
+import com.huozige.lab.container.utilities.PermissionsUtility;
 import com.huozige.lab.container.utilities.UiUtility;
+import com.huozige.lab.container.preferences.ScanEditTextPreference;
+import com.king.camera.scan.CameraScan;
 
 import javax.annotation.Nullable;
 
@@ -143,6 +149,26 @@ public boolean onOptionsItemSelected(MenuItem item) {
      */
     public static class SettingsFragment extends PreferenceFragmentCompat {
 
+        private ScanEditTextPreference _entryPreference;
+
+        // 首页地址扫码页返回后先让用户确认，确认后才写入设置项。
+        private final ActivityResultLauncher<Intent> _arcZxingLite = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent data = result.getData();
+            if (data == null || _entryPreference == null) {
+                return;
+            }
+
+            String url = CameraScan.parseScanResult(data);
+            new AlertDialog.Builder(requireActivity())
+                    .setTitle(R.string.url_title)
+                    .setMessage(url)
+                    .setPositiveButton(R.string.ui_button_ok, (dialogInterface, i) -> _entryPreference.setText(url))
+                    .setNegativeButton(R.string.ui_button_cancel, (dialogInterface, i) -> {
+                        // 什么都不干
+                    })
+                    .show();
+        });
+
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             // 对接ConfigManager实现数据存取
@@ -151,6 +177,23 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
             // 默认逻辑
             setPreferencesFromResource(R.xml.root_preferences, rootKey);
+
+            // 只给首页地址（key=E）绑定扫码按钮，其他设置项仍保持普通输入行为。
+            _entryPreference = findPreference(ConfigManager.PREFERENCE_KEY_APP_ENTRY_URL);
+            if (_entryPreference != null) {
+                _entryPreference.setScanClickListener(view -> {
+                    PermissionsUtility.asyncRequirePermissions(requireActivity(), new String[]{
+                            Permission.CAMERA,
+                            Permission.NOTIFICATION_SERVICE
+                    }, () -> {
+                        Intent intent = new Intent(requireActivity(), HACQRCodeScanActivity.class);
+                        intent.putExtra(HACQRCodeScanActivity.EXTRA_KEY_SCAN_HINTS, HACQRCodeScanActivity.EXTRA_QR_CODE_HINTS);
+                        // 这里是手动录入首页地址的辅助扫码入口，不播放提示音，避免设置页里突然响一声。
+                        intent.putExtra(HACQRCodeScanActivity.EXTRA_KEY_PLAY_BEEP, false);
+                        _arcZxingLite.launch(intent);
+                    });
+                });
+            }
         }
     }
 
@@ -183,4 +226,4 @@ public String getString(String key, @Nullable String defValue) {
             return ConfigManager.getInstance().getStringValue(key, defValue);
         }
     }
-}
+}