From 09a032aa97a5a9cf26edda45c8e4b6b097c74fda Mon Sep 17 00:00:00 2001
From: Ahmed Al-Omairi <alomairi@mail.ru>
Date: Fri, 29 Aug 2025 13:02:12 +0300
Subject: [PATCH] disable bugly, add onDestroy on WaitingForCardViewModel,
 always show handle print in PaymentActivity

---
 .../com/dspread/pos/TerminalApplication.java  | 45 ++++++++++---------
 .../pos/ui/payment/PaymentActivity.java       |  3 +-
 .../ui/payment/WaitingForCardViewModel.java   | 13 ++++++
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/pos_android_app/src/main/java/com/dspread/pos/TerminalApplication.java b/pos_android_app/src/main/java/com/dspread/pos/TerminalApplication.java
index 0284a0e..efd035a 100644
--- a/pos_android_app/src/main/java/com/dspread/pos/TerminalApplication.java
+++ b/pos_android_app/src/main/java/com/dspread/pos/TerminalApplication.java
@@ -54,28 +54,31 @@ public class TerminalApplication extends BaseApplication {
 
     private void initBugly() {
         Context context = getApplicationContext();
+
+        CrashReport.enableBugly(false);
+        return;
         // Get the current package name
-        String packageName = context.getPackageName();
-        // Get the current process name
-        String processName = DevUtils.getProcessName(android.os.Process.myPid());
-        // Set whether it is a reporting process
-        CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
-        strategy.setUploadProcess(processName == null || processName.equals(packageName));
-        strategy.setAppVersion(DevUtils.getPackageVersionName(this, packageName));
-        strategy.setAppPackageName(packageName);
-
-        // Initialize Bugly
-        CrashReport.initCrashReport(context, "b2d80aa171", BuildConfig.DEBUG, strategy);
-        BuglyLog.setCache(1024 * 10); // 设置本地缓存大小(10KB)
-
-        // Set user data
-        CrashReport.setUserId(DevUtils.getDeviceId(this));
-        CrashReport.setDeviceModel(this,Build.MODEL);
-
-        // Add custom logs
-        CrashReport.setUserSceneTag(context, 9527); // Set label
-        CrashReport.putUserData(context, "deviceModel", Build.MODEL);
-        CrashReport.putUserData(context, "deviceManufacturer", Build.MANUFACTURER);
+//        String packageName = context.getPackageName();
+//        // Get the current process name
+//        String processName = DevUtils.getProcessName(android.os.Process.myPid());
+//        // Set whether it is a reporting process
+//        CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
+//        strategy.setUploadProcess(processName == null || processName.equals(packageName));
+//        strategy.setAppVersion(DevUtils.getPackageVersionName(this, packageName));
+//        strategy.setAppPackageName(packageName);
+//
+//        // Initialize Bugly
+//        CrashReport.initCrashReport(context, "b2d80aa171", BuildConfig.DEBUG, strategy);
+//        BuglyLog.setCache(1024 * 10); // 设置本地缓存大小(10KB)
+//
+//        // Set user data
+//        CrashReport.setUserId(DevUtils.getDeviceId(this));
+//        CrashReport.setDeviceModel(this,Build.MODEL);
+//
+//        // Add custom logs
+//        CrashReport.setUserSceneTag(context, 9527); // Set label
+//        CrashReport.putUserData(context, "deviceModel", Build.MODEL);
+//        CrashReport.putUserData(context, "deviceManufacturer", Build.MANUFACTURER);
     }
 
     private void initShiply(){
diff --git a/pos_android_app/src/main/java/com/dspread/pos/ui/payment/PaymentActivity.java b/pos_android_app/src/main/java/com/dspread/pos/ui/payment/PaymentActivity.java
index 82e80d1..3ec23d9 100644
--- a/pos_android_app/src/main/java/com/dspread/pos/ui/payment/PaymentActivity.java
+++ b/pos_android_app/src/main/java/com/dspread/pos/ui/payment/PaymentActivity.java
@@ -245,8 +245,9 @@ public class PaymentActivity extends BaseActivity<ActivityPaymentBinding, Paymen
                     POS.getInstance().sendOnlineProcessResult("8A023030");
                 } else {
                     if (DeviceUtils.isPrinterDevices()) {
-                        handleSendReceipt();
+//                        handleSendReceipt();
                     }
+                    handleSendReceipt();
                     viewModel.setTransactionSuccess();
                 }
             } else {
diff --git a/pos_android_app/src/main/java/com/dspread/pos/ui/payment/WaitingForCardViewModel.java b/pos_android_app/src/main/java/com/dspread/pos/ui/payment/WaitingForCardViewModel.java
index f9d4f3e..bf23cf6 100644
--- a/pos_android_app/src/main/java/com/dspread/pos/ui/payment/WaitingForCardViewModel.java
+++ b/pos_android_app/src/main/java/com/dspread/pos/ui/payment/WaitingForCardViewModel.java
@@ -8,6 +8,9 @@ import androidx.annotation.NonNull;
 import androidx.databinding.ObservableBoolean;
 import androidx.databinding.ObservableField;
 
+import com.dspread.pos.common.manager.QPOSCallbackManager;
+import com.dspread.pos.printerAPI.PrinterHelper;
+import com.dspread.pos.utils.LogFileConfig;
 import com.dspread.pos.utils.QRCodeGenerator;
 
 import me.goldze.mvvmhabit.base.BaseViewModel;
@@ -61,4 +64,14 @@ public class WaitingForCardViewModel extends BaseViewModel {
         // Handle cancel action
         Log.d("WaitingForCardViewModel", "onCancel: ");
     }
+
+    @Override
+    public void onDestroy() {
+        Log.d("WaitingCardVM", "onDestroy: ");
+//        super.onDestroy();
+//        LogFileConfig.getInstance(this).readLog();
+//        QPOSCallbackManager.getInstance().unregisterPaymentCallback();
+//        PrinterHelper.getInstance().close();
+    }
+
 }
\ No newline at end of file