From: kfl_614 <kfl_614@163.com>
Date: Wed, 8 Apr 2020 02:24:00 +0000 (+0800)
Subject: 1.二维码home按键不退出的问题
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6365837a1bd852edd3e8627ec3094216ab484306;p=launcher4.git

1.二维码home按键不退出的问题

Signed-off-by: kfl_614 <kfl_614@163.com>
---

diff --git a/app/src/main/java/com/ic/launcher/QrCodeActivity.java b/app/src/main/java/com/ic/launcher/QrCodeActivity.java
index 03ff516..ce50ff4 100644
--- a/app/src/main/java/com/ic/launcher/QrCodeActivity.java
+++ b/app/src/main/java/com/ic/launcher/QrCodeActivity.java
@@ -7,7 +7,10 @@ import androidx.core.view.GestureDetectorCompat;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -21,6 +24,7 @@ import android.view.MotionEvent;
 
 import com.ic.launcher.databinding.ActivityQrCodeBinding;
 import com.ic.launcher.listener.MainClockGestureDetectorImpl;
+import com.ic.launcher.util.IcLog;
 import com.ic.launcher.util.QRCodeUtil;
 
 public class QrCodeActivity extends AppCompatActivity implements
@@ -49,6 +53,14 @@ public class QrCodeActivity extends AppCompatActivity implements
         }
 
         gesture = new GestureDetectorCompat(this, new MainClockGestureDetectorImpl(this));
+
+        registerCloseSystemReceiver();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(systemReceiver);
     }
 
     @SuppressLint("WorldReadableFiles")
@@ -82,6 +94,27 @@ public class QrCodeActivity extends AppCompatActivity implements
 
     }
 
+    private void registerCloseSystemReceiver(){
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        registerReceiver(systemReceiver, filter);
+    }
+
+    private  final  BroadcastReceiver  systemReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
+                String reason = intent.getStringExtra("reason");
+                if ("homekey".equals(reason)) {
+                    // 按下HOME健
+                    IcLog.i("QrCodeActivity","Home");
+                    finish();
+                }
+            }
+        }
+    };
+
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         if (gesture.onTouchEvent(event)) {
@@ -95,9 +128,8 @@ public class QrCodeActivity extends AppCompatActivity implements
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             // 禁用 KEYCODE_BACK 退出功能
             finish();
-
         }
-        return false;
+        return true;
     }
 
 }
diff --git a/app/version_code.properties b/app/version_code.properties
index 882c2db..b4e6234 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Apr 06 10:46:59 CST 2020
-VERSION_CODE=30
+#Wed Apr 08 10:21:39 CST 2020
+VERSION_CODE=32