Merge branch 'dev_ad' of http://39.97.65.143:81/android/android_goodmoney into dev_ad

GoodMoney/app/src/main/AndroidManifest.xml

@@ -39,7 +39,7 @@
     <uses-permission android:name="com.mints.goodmoney.permission" />
 
     <!--  蘑菇星球  -->
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
     <!--小满-->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -166,8 +166,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.MokuGuideActivity"
-            android:theme="@style/AppTheme.NoActionBarTranslucent"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBarTranslucent" />
         <activity
             android:name=".ui.activitys.SettingsActivity"
             android:screenOrientation="portrait" />
@@ -251,8 +251,9 @@
         <activity
             android:name=".call.detail.DetailApplyActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".ui.activitys.XiaomanActivity"
-            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.activitys.XiaomanActivity"
+            android:screenOrientation="portrait" />
 
         <service
             android:name=".service.UpdateService"

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -50,6 +50,7 @@ import com.rd.animation.type.AnimationType
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener
 import com.tbruyelle.rxpermissions.RxPermissions
+import com.umeng.analytics.MobclickAgent
 import kotlinx.android.synthetic.main.fragment_main_my.*
 import kotlinx.android.synthetic.main.header_layout.*
 import kotlinx.android.synthetic.main.item_fragment_main_my_clock.*
@@ -141,6 +142,10 @@ class MyFragment : BaseFragment(),
 
     override fun onPause() {
         super.onPause()
+
+        MobclickAgent.onPageEnd(this::class.java.simpleName)
+        MobclickAgent.onPause(mContext)
+
         banner_view.stopAutoScroll()
 
         item_clock_signview.stopRedbox()
@@ -149,6 +154,11 @@ class MyFragment : BaseFragment(),
     override fun onResume() {
         super.onResume()
 
+
+        MobclickAgent.onPageStart(this::class.java.simpleName)
+        MobclickAgent.onResume(mContext)
+
+
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FIVE) {
             // 防止首次加载两次
             if (AntiShake.check(item_title_id?.id)) return
@@ -859,6 +869,8 @@ class MyFragment : BaseFragment(),
                         if (taskBean.otherConfig != null) {
                             when (taskBean.otherConfig.status) {
                                 0 -> {
+                                    pushUmengEvent(MainMyAdapter.TO_DOWNLOADS)
+
                                     pkgMCRSCarrier = Constant.CARRIER_FIRSTDOWNLOADS
                                     pkgMCRSKey = taskBean.otherConfig.key
                                     pkgMCRSName = taskBean.otherConfig.pkg
@@ -894,6 +906,16 @@ class MyFragment : BaseFragment(),
         }
     }
 
+    /**
+     * 推送umeng事件埋点
+     */
+    private fun pushUmengEvent(carrierType: String) {
+        // 埋点上送事件
+        val map = mutableMapOf<String, String>()
+        map["userId"] = UserManager.getInstance().userID
+        MobclickAgent.onEvent(mContext, carrierType, map)
+    }
+
     //点击事件
     override fun onClick(v: View?) {
         if (AntiShake.check(view?.id)) return
@@ -1184,7 +1206,7 @@ class MyFragment : BaseFragment(),
      * 激励视频播放成功回调
      */
     private fun videoAdingSuccess(adType: String) {
-        if (activity != null && !activity!!.isFinishing) {
+        if (activity != null && !requireActivity().isFinishing) {
             // 高额任务
             if (TextUtils.equals(carrierType, Constant.CARRIER_HIGH_ACTIVITY)) {
                 return