解决冲突

app/src/main/AndroidManifest.xml

@@ -92,6 +92,7 @@
         <activity android:name=".main.home.HistoricalimageActivity" />
         <activity android:name=".main.my.BindMobileActivity" />
         <activity android:name=".splash.GuideActivity"/>
+        <activity android:name=".main.home.SearchMapActivity"/>
         <!-- ShareSDK start -->
         <activity
             android:name="com.mob.tools.MobUIShell"

app/src/main/java/com/mints/street/main/my/MyFragment.kt

@@ -62,13 +62,8 @@ class MyFragment : BaseFragment<FragmentMyBinding, MyViewModel>(), OnRefreshList
     override fun onResume() {
         super.onResume()
 
-        if (!TextUtils.isEmpty(userManager.getUserID())) {
-        //查询用户登录信息
-        viewModel.getmyInfo()
-//            refreshHighTask()
-        } else {
-        // 游客登录
-//            myPresenter.userLogin()
+        if (userManager.userIsLogin()) {
+            viewModel.getmyInfo()
         }
     }
 

app/src/main/java/com/mints/street/manager/UserManager.kt

@@ -112,8 +112,9 @@ class UserManager {
      * @return true为已登录   false 为未登录
      */
     fun userIsLogin(): Boolean {
-        val kv = MMKV.mmkvWithID(WX_OPENID).decodeString(WX_OPENID, "")
-        return !TextUtils.isEmpty(kv)
+        val wxId = MMKV.mmkvWithID(WX_OPENID).decodeString(WX_OPENID, "")
+        val mobile = MMKV.mmkvWithID(MOBILE).decodeString(MOBILE, "")
+        return !TextUtils.isEmpty(wxId)||!TextUtils.isEmpty(mobile)
     }
 
     /**