Merge branch 'dev_1.0.0' of http://gitlab.mints-id.com/android/android_street into branche_zsf

app/build.gradle

@@ -168,10 +168,7 @@ dependencies {
     implementation project(':shareSdkLib')
     // 应用管理中心分包
     implementation(name: 'humesdk-1.0.0', ext: 'aar')
-    // umeng
-    implementation  'com.umeng.umsdk:common:9.3.8'// 必选
-    implementation  'com.umeng.umsdk:asms:1.2.3'// 必选
-    implementation 'com.umeng.umsdk:apm:1.3.1'
+
     // 穿山甲 GroMore
     // mediation_ad_sdk
     implementation(name: 'mediation_ad_sdk_2.8.1.0', ext: 'aar')

app/src/main/java/com/mints/street/main/MainActivity.kt

@@ -78,19 +78,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     }
 
 
-    override fun onResume() {
-        super.onResume()
 
-        // 友盟
-        MobclickAgent.onResume(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-
-        // 友盟
-        MobclickAgent.onPause(this)
-    }
 
     var oldTime: Long = 0
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {

app/src/main/java/com/mints/street/main/home/HomeFragment.kt

@@ -133,7 +133,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE
         val center = LatLng(39.915071, 116.403907)
         // 默认 11级
         val zoom = 11.0f
-        builder.target(center).zoom(zoom)
+       builder.target(center).zoom(zoom)
         val mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(builder.build())
 
         // 设置地图状态
@@ -160,14 +160,14 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE
                 currentLon = status?.target?.longitude?:0.0
                 mRecommendStopSearch?.requestRecommendStop(
                     RecommendStopSearchOption().location(
-                        center
+                        LatLng(currentLat,currentLat)
                     )
                 )
 
             }
         })
         mBaiduMap?.setOnMapLoadedCallback {
-            mRecommendStopSearch?.requestRecommendStop(RecommendStopSearchOption().location(center))
+            mRecommendStopSearch?.requestRecommendStop(RecommendStopSearchOption().location(  LatLng(currentLat,currentLat)))
         }
         //使地图缩放级别增大一级
         binding.imageIn.setOnClickListener {
@@ -183,7 +183,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE
         }
         mRecommendStopSearch = RecommendStopSearch.newInstance()
         mRecommendStopSearch?.setOnGetRecommendStopResultListener { result ->
-            result
             if (result != null) {
                 addMarkerToMap(result.recommendStopInfoList)
             }

library_base/build.gradle

@@ -71,4 +71,9 @@ dependencies {
 
     //万能布局管理器VirtualLayout
     api 'com.alibaba.android:vlayout:1.0.9'
+
+    // umeng
+    api  'com.umeng.umsdk:common:9.3.8'// 必选
+    api  'com.umeng.umsdk:asms:1.2.3'// 必选
+    api 'com.umeng.umsdk:apm:1.3.1'
 }

library_base/src/main/java/com/fry/base/base/BaseActivity.java

@@ -19,6 +19,7 @@ import androidx.lifecycle.Observer;
 
 import com.fry.base.R;
 import com.fry.base.ui.widget.ViewStatusLayout;
+import com.umeng.analytics.MobclickAgent;
 
 import me.goldze.mvvmhabit._enum.ViewStatus;
 import me.goldze.mvvmhabit.base.BaseViewModel;
@@ -199,10 +200,15 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
     @Override
     protected void onResume() {
         super.onResume();
+        // 友盟
+        MobclickAgent.onResume(this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
+        // 友盟
+        MobclickAgent.onPause(this);
     }
+
 }

library_base/src/main/java/com/fry/base/base/BaseFragment.java

@@ -14,6 +14,7 @@ import androidx.lifecycle.Observer;
 
 import com.fry.base.R;
 import com.fry.base.ui.widget.ViewStatusLayout;
+import com.umeng.analytics.MobclickAgent;
 
 import me.goldze.mvvmhabit._enum.ViewStatus;
 import me.goldze.mvvmhabit.base.BaseViewModel;
@@ -148,14 +149,16 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
     public void onFirstUserVisible() {
         super.onFirstUserVisible();
         if(needStatistics()) {
+            MobclickAgent.onPageStart(getClass().getName());
         }
     }
-
     @CallSuper
     @Override
     public void onUserVisible() {
         super.onUserVisible();
         if(needStatistics()) {
+            MobclickAgent.onPageStart(getClass().getName());
+
         }
     }
 
@@ -164,6 +167,7 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
     public void onFirstUserInvisible() {
         super.onFirstUserInvisible();
         if(needStatistics()) {
+            MobclickAgent.onPageEnd(getClass().getName());
         }
     }
 
@@ -172,6 +176,8 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
     public void onUserInvisible() {
         super.onUserInvisible();
         if(needStatistics()) {
+            MobclickAgent.onPageEnd(getClass().getName());
+
         }
     }