From 71cad5c33ef1ea66dd4ef14a111d24b9db4ba508 Mon Sep 17 00:00:00 2001
From: free will <2647778488@qq.com>
Date: Wed, 11 Aug 2021 22:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=9B=B4=E5=9C=A8=E8=AF=95=E5=9B=BE?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=9E=E6=8E=A5VPN=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/main/MainActivity.java               | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/pkusz/min_vpn_client/activity/main/MainActivity.java b/app/src/main/java/com/pkusz/min_vpn_client/activity/main/MainActivity.java
index 375db5b..3ae06b5 100644
--- a/app/src/main/java/com/pkusz/min_vpn_client/activity/main/MainActivity.java
+++ b/app/src/main/java/com/pkusz/min_vpn_client/activity/main/MainActivity.java
@@ -227,37 +227,50 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
         EventBus.getDefault().removeStickyEvent(connectEvent);
         // 接收VPN service状态，展示到界面
         if(connectEvent.getSuccess()){
-            isConnected=connectEvent.getSuccess();
+            System.out.println("@@@@ 1");
+            isConnected=connectEvent.getConnected();
             if(connectEvent.getConnected()){
+                System.out.println("@@@@ 1.1");
                 showSuccess("连接成功");
                 VPNstatus.setText("VPN正在运行中");
                 VPNstatus.setTextColor(getColor(R.color.colorPrimary));
             }else{
+                System.out.println("@@@@ 1.2");
                 showSuccess("断开连接成功");
                 VPNstatus.setText("VPN已经停止运行");
                 VPNstatus.setTextColor(getColor(R.color.colorPrimaryYellow));
             }
         }else{
+            System.out.println("@@@@ 2");
             if (connectEvent.getConnected()) {
+                System.out.println("@@@@ 2.1");
                 showError("断开连接失败");
                 VPNstatus.setText("断开连接失败");
                 VPNstatus.setTextColor(getColor(R.color.colorPrimaryYellow));
             } else {
+                System.out.println("@@@@ 2.2");
                 showError("连接失败");
                 VPNstatus.setText("连接失败");
                 VPNstatus.setTextColor(getColor(R.color.colorPrimaryYellow));
             }
         }
 
+        System.out.println("fuck 1");
         // 修改按钮状态
         btnConnect.setClickable(true);
+        System.out.println("fuck 2");
+        System.out.println("目前连接状态: "+isConnected);
         if (isConnected) {
+            System.out.println("fuck 2.1");
             btnConnect.setImageResource(R.drawable.security);
         } else {
+            System.out.println("fuck 2.2");
             btnConnect.setImageResource(R.drawable.launch);
         }
+        System.out.println("fuck 3");
         ViewExtensionKt.animer2(btnConnect,ViewExtensionKt.alphaAnimation(btnConnect,
                 0.3f,0.1f));
+        System.out.println("fuck 4");
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)