Skip to content

A
android_goodmoney
Commit ee3c8398 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

删除书城，小满，回退umeng

parent 6e649a50
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 599 additions and 608 deletions
GoodMoney/app/build.gradle
View file @ ee3c8398
......@@ -15,8 +15,8 @@ android {
applicationId "com.mints.goodmoney"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 25
versionName "1.2.4"
versionCode 26
versionName "1.2.7"
flavorDimensions "default"
// dex突破65535的限制
......@@ -224,8 +224,8 @@ dependencies {
// 应用管理中心分包
implementation(name: 'humesdk-1.0.0', ext: 'aar')
// umeng
implementation 'com.umeng.umsdk:common:9.3.8' // (必选)
implementation 'com.umeng.umsdk:asms:1.2.2' // asms包依赖(必选)
implementation 'com.umeng.umsdk:common:9.1.0' // (必选)
implementation 'com.umeng.umsdk:asms:1.1.3' // asms包依赖(必选)
implementation 'com.umeng.umsdk:crash:0.0.4' // native crash包依赖(必选)
// TalkingDada（已集成）
// 一览视频
......@@ -347,11 +347,11 @@ dependencies {
// implementation 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.4.3'
// api 'org.aspectj:aspectjrt:1.9.5'
//小满
implementation ("com.bx:adsdk:1.4.2.2"){
exclude group:"com.miit.sdk"
transitive = true
changing = true
}
// implementation ("com.bx:adsdk:1.4.2.2"){
// exclude group:"com.miit.sdk"
// transitive = true
// changing = true
// }
// testImplementation 'junit:junit:4.13'
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'
......
GoodMoney/app/src/main/AndroidManifest.xml
View file @ ee3c8398
......@@ -251,8 +251,6 @@
<activity
android:name=".call.detail.DetailApplyActivity"
android:screenOrientation="portrait" />
<activity android:name=".ui.activitys.XiaomanActivity"
android:screenOrientation="portrait"/>
<service
android:name=".service.UpdateService"
......@@ -380,11 +378,6 @@
android:name="com.qq.e.comm.DownloadService"
android:exported="false" />
<!--小滿廣告-->
<activity
android:name="com.qq.e.tg.ADActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
<activity
android:name="com.qq.e.ads.ADActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" />
......
GoodMoney/app/src/main/java/com/mints/goodmoney/MintsApplication.java
View file @ ee3c8398
......@@ -20,7 +20,6 @@ import com.mints.goodmoney.manager.RsNewsManager;
import com.mints.goodmoney.manager.TtCsjAdManager;
import com.mints.goodmoney.manager.TzManager;
import com.mints.goodmoney.manager.WnManager;
import com.mints.goodmoney.manager.XmManager;
import com.mints.goodmoney.manager.YlVideoManager;
import com.mints.goodmoney.manager.YlhAdManager;
import com.mints.goodmoney.net.LoanService;
......@@ -138,7 +137,7 @@ public class MintsApplication extends MultiDexApplication {
TzManager.INSTANCE.initTz(this);
//小满
XmManager.INSTANCE.initXm(this);
// XmManager.INSTANCE.initXm(this);
// 一览视频
YlVideoManager.INSTANCE.init(this);
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/XmManager.kt
View file @ ee3c8398
package com.mints.goodmoney.manager
import android.app.Application
import android.text.TextUtils
import android.util.Log
import android.view.View
import android.widget.ImageView
import com.bumptech.glide.Glide
import com.bx.adsdk.AdSdk
import com.bx.adsdk.util.MaterialTm
import com.bytedance.sdk.openadsdk.TTAdConfig
import com.bytedance.sdk.openadsdk.TTAdConstant
import com.bytedance.sdk.openadsdk.TTAdSdk
import com.fendasz.moku.planet.exception.MokuException
import com.fendasz.moku.planet.helper.MokuHelper
import com.mints.goodmoney.BuildConfig
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.utils.LogUtil
import com.qq.e.comm.managers.GDTADManager
import kotlinx.android.synthetic.main.activity_layout_xiaoman.*
/**
* 描述：小满
*/
object XmManager {
private const val ACCESSKEY = "hzq-az_rvkvdy"
private const val SECRETKEY = "22FvHjUzvQ516214"
private var placeMateId = ""
private var materialId = ""
fun initXm(application: Application) {
try {
//打开日志，上线之前记得关闭
AdSdk.setDebug(BuildConfig.DEBUG)
//初始化 需要在Applicaiton 中
AdSdk.init(application, ACCESSKEY, SECRETKEY)
} catch (e: Exception) {//这里应该是小满的异常
e.printStackTrace()
}
}
fun loadMater(placeid: String) {
if (TextUtils.isEmpty(placeMateId)) {
MaterialTm().loadMaterialData(UserManager.getInstance().userID, placeid, object : MaterialTm.Callback {
//对应PlaceID会有对应的素材
override fun onSuccess(imgUrl: String, placeMateId2: String, materialId2: String) {
placeMateId = placeMateId2
materialId = materialId2
AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
}
override fun onFailure(code: String, errmsg: String) {
LogUtil.d("$code$errmsg")
}
})
} else {
AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
}
}
/**
* 入口点击上报
* @param view
*/
fun exprotClick(placeid: String) {
if (!TextUtils.isEmpty(placeMateId)) {
AdSdk.click(UserManager.getInstance().userID, placeid, materialId, materialId)
LogUtil.d("******exprotClick*******${UserManager.getInstance().userID}*******$placeMateId********$materialId******$placeid")
}
}
}
\ No newline at end of file
//package com.mints.goodmoney.manager
//
//import android.app.Application
//import android.text.TextUtils
//import android.util.Log
//import android.view.View
//import android.widget.ImageView
//import com.bumptech.glide.Glide
//import com.bx.adsdk.AdSdk
//import com.bx.adsdk.util.MaterialTm
//import com.bytedance.sdk.openadsdk.TTAdConfig
//import com.bytedance.sdk.openadsdk.TTAdConstant
//import com.bytedance.sdk.openadsdk.TTAdSdk
//import com.fendasz.moku.planet.exception.MokuException
//import com.fendasz.moku.planet.helper.MokuHelper
//import com.mints.goodmoney.BuildConfig
//import com.mints.goodmoney.MintsApplication
//import com.mints.goodmoney.utils.LogUtil
//import com.qq.e.comm.managers.GDTADManager
//import kotlinx.android.synthetic.main.activity_layout_xiaoman.*
//
///**
// * 描述：小满
// */
//object XmManager {
//
// private const val ACCESSKEY = "hzq-az_rvkvdy"
// private const val SECRETKEY = "22FvHjUzvQ516214"
//
// private var placeMateId = ""
// private var materialId = ""
//
// fun initXm(application: Application) {
// try {
// //打开日志，上线之前记得关闭
// AdSdk.setDebug(BuildConfig.DEBUG)
// //初始化 需要在Applicaiton 中
// AdSdk.init(application, ACCESSKEY, SECRETKEY)
// } catch (e: Exception) {//这里应该是小满的异常
// e.printStackTrace()
// }
// }
//
// fun loadMater(placeid: String) {
// if (TextUtils.isEmpty(placeMateId)) {
// MaterialTm().loadMaterialData(UserManager.getInstance().userID, placeid, object : MaterialTm.Callback {
// //对应PlaceID会有对应的素材
// override fun onSuccess(imgUrl: String, placeMateId2: String, materialId2: String) {
// placeMateId = placeMateId2
// materialId = materialId2
// AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
// LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
// }
//
// override fun onFailure(code: String, errmsg: String) {
// LogUtil.d("$code$errmsg")
// }
// })
// } else {
// AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
// LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
// }
// }
//
//
// /**
// * 入口点击上报
// * @param view
// */
// fun exprotClick(placeid: String) {
// if (!TextUtils.isEmpty(placeMateId)) {
// AdSdk.click(UserManager.getInstance().userID, placeid, materialId, materialId)
// LogUtil.d("******exprotClick*******${UserManager.getInstance().userID}*******$placeMateId********$materialId******$placeid")
// }
// }
//
//}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/GvMyAdapter.java
View file @ ee3c8398
......@@ -17,7 +17,6 @@ import com.mints.goodmoney.R;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.manager.BxmManager;
import com.mints.goodmoney.manager.UserManager;
import com.mints.goodmoney.manager.XmManager;
import com.mints.goodmoney.mvp.model.BannerBean;
import com.mints.library.utils.GlideUtils;
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MoneyFragment.kt
View file @ ee3c8398
......@@ -46,7 +46,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
if (AppConfig.showAdFlag) {
if (curPosition == 0) {
mainFragment?.onHiddenChanged(hidden)
} else if (curPosition == 4) {
} else if (curPosition == 3) {
liebaoGameFragment?.onHiddenChanged(hidden)
}
}
......@@ -73,11 +73,11 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
currentFragment = mainFragment
}
xtFragmentMoney.setxTabDisplayNum(5)
xtFragmentMoney.setxTabDisplayNum(4)
val newTab1 = xtFragmentMoney.newTab()
newTab1.text = "视频"
val newTab3 = xtFragmentMoney.newTab()
newTab3.text = "书城"
// val newTab3 = xtFragmentMoney.newTab()
// newTab3.text = "书城"
val newTab4 = xtFragmentMoney.newTab()
newTab4.text = "听书"
val newTab5 = xtFragmentMoney.newTab()
......@@ -85,7 +85,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
val newTab6 = xtFragmentMoney.newTab()
newTab6.text = "来电秀"
xtFragmentMoney.addTab(newTab1)
xtFragmentMoney.addTab(newTab3)
// xtFragmentMoney.addTab(newTab3)
xtFragmentMoney.addTab(newTab4)
xtFragmentMoney.addTab(newTab5)
xtFragmentMoney.addTab(newTab6)
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ ee3c8398
......@@ -248,12 +248,12 @@ class MyFragment : BaseFragment(),
// 生成热门活动数据
private fun generateGridData(data: List<BannerBean.ListBean>) {
val inflater = LayoutInflater.from(mContext)
for (i in 0..data.size - 1) {
if (data.get(i).toUrl.equals(Constant.HOT_ACTIVITY_SHEEP)) {
XmManager.loadMater(data.get(i).xmPlaceId)
break
}
}
// for (i in 0..data.size - 1) {
// if (data.get(i).toUrl.equals(Constant.HOT_ACTIVITY_SHEEP)) {
// XmManager.loadMater(data.get(i).xmPlaceId)
// break
// }
// }
val pageCount = ceil(data.size * 1.0 / HOT_PAGE_SIZE).toInt()
val pagerList = arrayListOf<View>()
......@@ -950,11 +950,11 @@ class MyFragment : BaseFragment(),
// 自有界面
when (hotBean.toUrl) {
Constant.HOT_ACTIVITY_SHEEP -> {
XmManager.exprotClick(hotBean.xmPlaceId)
val bundle = Bundle()
bundle.putString(Constant.ACTIVITY_TITLE, hotBean.title)
bundle.putString(Constant.ACTIVITY_ID, hotBean.xmPlaceId)
readyGo(XiaomanActivity::class.java, bundle)
// XmManager.exprotClick(hotBean.xmPlaceId)
// val bundle = Bundle()
// bundle.putString(Constant.ACTIVITY_TITLE, hotBean.title)
// bundle.putString(Constant.ACTIVITY_ID, hotBean.xmPlaceId)
// readyGo(XiaomanActivity::class.java, bundle)
}
Constant.HOT_ACTIVITY_WATER -> {
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
......
GoodMoney/build.gradle
View file @ ee3c8398
......@@ -53,10 +53,10 @@ buildscript {
url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
}
// 添加小满科技
maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
maven { url "https://maven.google.com"}
maven { url "https://maven.linzhuxin.com/repository/lzoom_read_sdk_prd/"}
// // 添加小满科技
// maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
// maven { url "https://maven.google.com"}
// maven { url "https://maven.linzhuxin.com/repository/lzoom_read_sdk_prd/"}
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
......@@ -84,8 +84,8 @@ allprojects {
maven {
url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
}
//小满
maven { url "http://47.97.184.214:8081/nexus/content/groups/public" }
// //小满
// maven { url "http://47.97.184.214:8081/nexus/content/groups/public" }
}
}
......
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