From bba729f5d01f7790ec62cfb6c5742b558017d372 Mon Sep 17 00:00:00 2001
From: yujiankang <15535958281@163.com>
Date: Fri, 26 Sep 2025 01:13:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9A=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/activity/BaseMvpActivity.java  | 50 +----------
 .../modulemain/activity/MainActivity.java     | 89 ++++++++++++++++---
 2 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
index ce73fc6..7d6872f 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/BaseMvpActivity.java
@@ -43,13 +43,13 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewDataBinding> extends BaseAppCompatActivity<VDB> implements
-        IView<Activity>, LocationProvider.LocationCallback {
+        IView<Activity> {
 
     protected P MvpPre;
 
     protected abstract P bindPresenter();
 
-    private String city1;
+
 
     @Override
     protected void initView() {
@@ -120,7 +120,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
                         // 错误处理
                     }
                 });
-                initLocation();
+                //initLocation();
             }
         });
         V2TIMManager.getInstance().addIMSDKListener(imSdkListener);
@@ -184,51 +184,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
                 }, false, 0).show();
     }
 
-    private SystemLocationProvider locationProvider;
 
-    private void initLocation() {
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-
-            // 请求定位权限
-            ActivityCompat.requestPermissions(
-                    (Activity) this,
-                    new String[]{
-                            android.Manifest.permission.ACCESS_FINE_LOCATION,
-                            Manifest.permission.ACCESS_COARSE_LOCATION
-                    },
-                    1001 // 自定义常量，比如 1001
-            );
-        }
-        locationProvider = new SystemLocationProvider();
-
-        // 请求一次性的位置信息
-        locationProvider.getLastKnownLocation(this, this);
-    }
-
-    @Override
-    public void onLocationReceived(double latitude, double longitude, String city) {
-        LogUtils.e("当前位置：" + city);
-        city1 = city;
-        EventBus.getDefault().post(city1);
-    }
-
-    @Override
-    public void onFailed(String errorMessage) {
-        LogUtils.e("定位失败");
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        if (requestCode == 1001) {
-            if (locationProvider == null) {
-                locationProvider = new SystemLocationProvider();
-            }
-            locationProvider.getLastKnownLocation(this, this);
-        }
-
-    }
 
     @Override
     public Resources getResources() {
diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
index 2a0e819..ee07798 100644
--- a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
@@ -1,5 +1,7 @@
 package com.xscm.modulemain.activity;
 
+import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -19,6 +21,8 @@ import android.view.animation.AnimationUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -56,6 +60,8 @@ import com.xscm.moduleutil.utils.BackgroundManager;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageLoader;
 import com.xscm.moduleutil.utils.SpUtil;
+import com.xscm.moduleutil.utils.location.LocationProvider;
+import com.xscm.moduleutil.utils.location.SystemLocationProvider;
 import com.xscm.moduleutil.utils.logger.Logger;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMValueCallback;
@@ -69,7 +75,8 @@ import java.util.List;
 import java.util.Map;
 
 @Route(path = ARouteConstants.ME)
-public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBinding> implements HomeContacts.View, View.OnClickListener {
+public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBinding>
+        implements HomeContacts.View, View.OnClickListener, LocationProvider.LocationCallback {
     private static int index = -1;
 
     public static boolean isShortsShowing() {
@@ -178,6 +185,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
             }
         });
 
+
     }
 
 
@@ -262,6 +270,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         }
         return super.onKeyDown(keyCode, event);
     }
+
     // 最推荐的方法
     private void clearAllOtherTasksAndRestart() {
 //        Intent intent = new Intent(this, MainActivity.class);
@@ -278,6 +287,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         // 可选：如果上面的方法不够彻底，可以配合使用
         Runtime.getRuntime().gc(); // 建议垃圾回收
     }
+
     /**
      * 优雅地退出应用，避免闪屏
      */
@@ -366,7 +376,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         } else if (id == R.id.riv) {
             String roomId = CommonAppContext.getInstance().playId;
             if (!TextUtils.isEmpty(roomId)) {
-                RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId,"");
+                RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "");
 
 //                MvpPre.getRoomOnline(roomId, "1", "100");
 //                AppStateManager stateManager = AppStateManager.getInstance();
@@ -540,24 +550,22 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         }
 
 
-
-
-
-
         MvpPre.getMyInfo(SpUtil.getUserId() + "");//获取首充是否需要展示
 
 //        mBinding.ivShouchl.setVisibility(View.VISIBLE);
+        LogUtils.e("@@@1","开始定位", "描述：", "");
+        initLocation();
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEvent(UnreadCountEvent event) {
         long aLong = event.getALong();
         long bLong = event.getBLong();
-        if (aLong==0 && bLong==0){
+        if (aLong == 0 && bLong == 0) {
             mBinding.tvMessage.setVisibility(View.GONE);
-        }else {
+        } else {
             mBinding.tvMessage.setVisibility(View.VISIBLE);
-            mBinding.tvMessage.setText(String.valueOf(event.getALong()+event.getBLong()));
+            mBinding.tvMessage.setText(String.valueOf(event.getALong() + event.getBLong()));
         }
 
 //        if (event.getALong() == 0) {
@@ -619,6 +627,24 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
         }
     }
 
+
+    private String city1;
+    @Override
+    public void onLocationReceived(double latitude, double longitude, String city) {
+        LogUtils.e("当前位置：" + city);
+        city1 = city;
+        EventBus.getDefault().post(city1);
+        LogUtils.e("@@@1","开始定位", "描述：","当前位置"+city);
+    }
+
+    @Override
+    public void onFailed(String errorMessage) {
+
+        LogUtils.e("@@@1","开始定位", "描述：","失败");
+
+    }
+
+
     public static int getCurrentVersionCode(Context context) {
         try {
             PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
@@ -737,13 +763,13 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
                 }
             }
 
-            if (!isPlaying){
-                RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId,"");
+            if (!isPlaying) {
+                RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "");
 //                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
 
-            }else {
+            } else {
 //                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
-                RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId,"");
+                RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "");
             }
 
         }
@@ -840,9 +866,44 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
     }
 
 
-//    @Override
+    //    @Override
 //    protected void onPause() {
 //        super.onPause();
 //        moveTaskToBack(true);
 //    }
+    private SystemLocationProvider locationProvider;
+
+    private void initLocation() {
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+
+            // 请求定位权限
+            ActivityCompat.requestPermissions(
+                    (Activity) this,
+                    new String[]{
+                            android.Manifest.permission.ACCESS_FINE_LOCATION,
+                            Manifest.permission.ACCESS_COARSE_LOCATION
+                    },
+                    1001 // 自定义常量，比如 1001
+            );
+        }
+        locationProvider = new SystemLocationProvider();
+
+        // 请求一次性的位置信息
+        locationProvider.getLastKnownLocation(this, this);
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 1001) {
+            if (locationProvider == null) {
+                locationProvider = new SystemLocationProvider();
+            }
+            locationProvider.getLastKnownLocation(this, this);
+        }
+
+
+    }
+
 }
\ No newline at end of file