一键连新增日志采集校验谷歌邮箱

app/src/main/java/com/yingmao/clash/act/MainActivity.kt

@@ -810,9 +810,12 @@ class MainActivity : BaseActivity() {
         if(behaviorLogSwitch){
             launch(Dispatchers.IO) {
                 val isVPN =Utils.isVpnActive(this@MainActivity)
-                AppLog.i("NewMainActivity", "BroadcastReceiver::isVPN::${isVPN}")
+                AppLog.i("NewMainActivity", "VPN是否打开::::${isVPN}")
                 val vpnCheChek =Utils.checkHttpOk("https://www.youtube.com")
-                AppLog.i("NewMainActivity", "BroadcastReceiver::vpnCheChek::${vpnCheChek}")
+                AppLog.i("NewMainActivity", "校验访问https://www.youtube.com::${vpnCheChek}")
+
+                val vpnCheChekGoogle =Utils.checkHttpOk("https://www.google.com")
+                AppLog.i("NewMainActivity", "校验访问https://www.google.com::${vpnCheChekGoogle}")
             }
         }
 

app/src/main/java/com/yingmao/clash/levellog/AppLog.kt

@@ -29,7 +29,6 @@ object AppLog {
     ) {
         val behaviorLogSwitch =
             MMKV.defaultMMKV().decodeBool(BZYConstants.BehaviorLogSwitch, false)
-        Log.i("AAAAAAAAAAAA behaviorLogSwitch ${behaviorLogSwitch}")
         if(behaviorLogSwitch){
             LogDispatcher.enqueue(
                 LogEvent(

app/src/main/java/com/yingmao/clash/levellog/LogcatService.kt

@@ -25,6 +25,7 @@ import com.cncat.vpn.service.remote.IRemoteService
 import com.cncat.vpn.service.remote.unwrap
 import com.tencent.mmkv.MMKV
 import com.yingmao.clash.R
+import com.yingmao.clash.act.MainActivity
 import com.yingmao.clash.act.SettingActivity
 import com.yingmao.clash.app.MainApplication
 import com.yingmao.clash.conf.BZYConstants
@@ -151,7 +152,7 @@ class LogcatService : Service(), CoroutineScope by CoroutineScope(Dispatchers.De
                 PendingIntent.getActivity(
                     this,
                     R.id.nf_logcat_status,
-                    SettingActivity::class.intent
+                    MainActivity::class.intent
                         .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP),
                     pendingIntentFlags(PendingIntent.FLAG_UPDATE_CURRENT)
                 )

app/src/main/java/com/yingmao/clash/util/Utils.kt

@@ -14,6 +14,7 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.RequiresApi
+import com.yingmao.clash.levellog.AppLog
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.net.NetworkInterface
@@ -362,6 +363,7 @@ object Utils {
             response.isSuccessful || response.code in 300..399
         } catch (e: Exception) {
             Log.e("NET_CHECK", "checkHttp failed", e)
+            AppLog.e("checkHttpOk", "校验访问${url}::失败",e)
             false
         }
     }

app/src/main/res/values/strings.xml

@@ -485,8 +485,8 @@
     <string name="SubscriptionlinkTop">获取节点信息出错,请手动点击 [源切换] 或联系客服处理!</string>
     <string name="bindingShowTxt">当前账号尚未绑定,直接退出可能会造成账号丢失,推荐前往绑定账号或保存临时账号后在进行退出</string>
     <string name="LogingUseing">
-          1.点击「开始采集行为日志」后,请复现无法使用的问题或正常使用App.
-        \n2.在行为日志采集完成后请再次点击「上传采集行为日志」,提示「行为日志上传成功」后可联系客服人员.
+          1.点击「采集日志」后,请复现无法使用的问题或正常使用App.
+        \n2.在行为日志采集完成后请再次点击「上传日志」,提示「日志上传成功」后可联系客服人员.
         \n3.若上传中出现失败等相关问题请联系「客服」
         \n4.感谢您的支持与信任
     </string>