Commit e7c63517 authored by mengcuiguang's avatar mengcuiguang

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

parents 179e8524 1f6ae48f
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<uses-permission android:name="com.mints.goodmoney.permission" /> <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" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
...@@ -166,8 +166,8 @@ ...@@ -166,8 +166,8 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activitys.MokuGuideActivity" android:name=".ui.activitys.MokuGuideActivity"
android:theme="@style/AppTheme.NoActionBarTranslucent" android:screenOrientation="portrait"
android:screenOrientation="portrait" /> android:theme="@style/AppTheme.NoActionBarTranslucent" />
<activity <activity
android:name=".ui.activitys.SettingsActivity" android:name=".ui.activitys.SettingsActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
...@@ -251,8 +251,9 @@ ...@@ -251,8 +251,9 @@
<activity <activity
android:name=".call.detail.DetailApplyActivity" android:name=".call.detail.DetailApplyActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity android:name=".ui.activitys.XiaomanActivity" <activity
android:screenOrientation="portrait"/> android:name=".ui.activitys.XiaomanActivity"
android:screenOrientation="portrait" />
<service <service
android:name=".service.UpdateService" android:name=".service.UpdateService"
......
...@@ -50,6 +50,7 @@ import com.rd.animation.type.AnimationType ...@@ -50,6 +50,7 @@ import com.rd.animation.type.AnimationType
import com.scwang.smartrefresh.layout.api.RefreshLayout import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnRefreshListener import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import com.tbruyelle.rxpermissions.RxPermissions import com.tbruyelle.rxpermissions.RxPermissions
import com.umeng.analytics.MobclickAgent
import kotlinx.android.synthetic.main.fragment_main_my.* import kotlinx.android.synthetic.main.fragment_main_my.*
import kotlinx.android.synthetic.main.header_layout.* import kotlinx.android.synthetic.main.header_layout.*
import kotlinx.android.synthetic.main.item_fragment_main_my_clock.* import kotlinx.android.synthetic.main.item_fragment_main_my_clock.*
...@@ -141,6 +142,10 @@ class MyFragment : BaseFragment(), ...@@ -141,6 +142,10 @@ class MyFragment : BaseFragment(),
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
MobclickAgent.onPageEnd(this::class.java.simpleName)
MobclickAgent.onPause(mContext)
banner_view.stopAutoScroll() banner_view.stopAutoScroll()
item_clock_signview.stopRedbox() item_clock_signview.stopRedbox()
...@@ -149,6 +154,11 @@ class MyFragment : BaseFragment(), ...@@ -149,6 +154,11 @@ class MyFragment : BaseFragment(),
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
MobclickAgent.onPageStart(this::class.java.simpleName)
MobclickAgent.onResume(mContext)
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FIVE) { if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FIVE) {
// 防止首次加载两次 // 防止首次加载两次
if (AntiShake.check(item_title_id?.id)) return if (AntiShake.check(item_title_id?.id)) return
...@@ -859,6 +869,8 @@ class MyFragment : BaseFragment(), ...@@ -859,6 +869,8 @@ class MyFragment : BaseFragment(),
if (taskBean.otherConfig != null) { if (taskBean.otherConfig != null) {
when (taskBean.otherConfig.status) { when (taskBean.otherConfig.status) {
0 -> { 0 -> {
pushUmengEvent(MainMyAdapter.TO_DOWNLOADS)
pkgMCRSCarrier = Constant.CARRIER_FIRSTDOWNLOADS pkgMCRSCarrier = Constant.CARRIER_FIRSTDOWNLOADS
pkgMCRSKey = taskBean.otherConfig.key pkgMCRSKey = taskBean.otherConfig.key
pkgMCRSName = taskBean.otherConfig.pkg pkgMCRSName = taskBean.otherConfig.pkg
...@@ -894,6 +906,16 @@ class MyFragment : BaseFragment(), ...@@ -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?) { override fun onClick(v: View?) {
if (AntiShake.check(view?.id)) return if (AntiShake.check(view?.id)) return
...@@ -1184,7 +1206,7 @@ class MyFragment : BaseFragment(), ...@@ -1184,7 +1206,7 @@ class MyFragment : BaseFragment(),
* 激励视频播放成功回调 * 激励视频播放成功回调
*/ */
private fun videoAdingSuccess(adType: String) { private fun videoAdingSuccess(adType: String) {
if (activity != null && !activity!!.isFinishing) { if (activity != null && !requireActivity().isFinishing) {
// 高额任务 // 高额任务
if (TextUtils.equals(carrierType, Constant.CARRIER_HIGH_ACTIVITY)) { if (TextUtils.equals(carrierType, Constant.CARRIER_HIGH_ACTIVITY)) {
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment