Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_goodmoney
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
android
android_goodmoney
Commits
ee3c8398
Commit
ee3c8398
authored
Apr 29, 2021
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除书城,小满,回退umeng
parent
6e649a50
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
599 additions
and
608 deletions
+599
-608
build.gradle
GoodMoney/app/build.gradle
+9
-9
AndroidManifest.xml
GoodMoney/app/src/main/AndroidManifest.xml
+0
-7
MintsApplication.java
...p/src/main/java/com/mints/goodmoney/MintsApplication.java
+1
-2
XmManager.kt
...pp/src/main/java/com/mints/goodmoney/manager/XmManager.kt
+77
-77
XiaomanActivity.kt
.../java/com/mints/goodmoney/ui/activitys/XiaomanActivity.kt
+490
-490
GvMyAdapter.java
...main/java/com/mints/goodmoney/ui/adapter/GvMyAdapter.java
+0
-1
MoneyFragment.kt
...ain/java/com/mints/goodmoney/ui/fragment/MoneyFragment.kt
+5
-5
MyFragment.kt
...c/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
+11
-11
build.gradle
GoodMoney/build.gradle
+6
-6
No files found.
GoodMoney/app/build.gradle
View file @
ee3c8398
...
@@ -15,8 +15,8 @@ android {
...
@@ -15,8 +15,8 @@ android {
applicationId
"com.mints.goodmoney"
applicationId
"com.mints.goodmoney"
minSdkVersion
rootProject
.
ext
.
androidMinSdkVersion
minSdkVersion
rootProject
.
ext
.
androidMinSdkVersion
targetSdkVersion
rootProject
.
ext
.
androidTargetSdkVersion
targetSdkVersion
rootProject
.
ext
.
androidTargetSdkVersion
versionCode
2
5
versionCode
2
6
versionName
"1.2.
4
"
versionName
"1.2.
7
"
flavorDimensions
"default"
flavorDimensions
"default"
// dex突破65535的限制
// dex突破65535的限制
...
@@ -224,8 +224,8 @@ dependencies {
...
@@ -224,8 +224,8 @@ dependencies {
// 应用管理中心分包
// 应用管理中心分包
implementation
(
name:
'humesdk-1.0.0'
,
ext:
'aar'
)
implementation
(
name:
'humesdk-1.0.0'
,
ext:
'aar'
)
// umeng
// umeng
implementation
'com.umeng.umsdk:common:9.
3.8
'
// (必选)
implementation
'com.umeng.umsdk:common:9.
1.0
'
// (必选)
implementation
'com.umeng.umsdk:asms:1.
2.2
'
// asms包依赖(必选)
implementation
'com.umeng.umsdk:asms:1.
1.3
'
// asms包依赖(必选)
implementation
'com.umeng.umsdk:crash:0.0.4'
// native crash包依赖(必选)
implementation
'com.umeng.umsdk:crash:0.0.4'
// native crash包依赖(必选)
// TalkingDada(已集成)
// TalkingDada(已集成)
// 一览视频
// 一览视频
...
@@ -347,11 +347,11 @@ dependencies {
...
@@ -347,11 +347,11 @@ dependencies {
// implementation 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.4.3'
// implementation 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.4.3'
// api 'org.aspectj:aspectjrt:1.9.5'
// api 'org.aspectj:aspectjrt:1.9.5'
//小满
//小满
implementation
(
"com.bx:adsdk:1.4.2.2"
){
//
implementation ("com.bx:adsdk:1.4.2.2"){
exclude
group:
"com.miit.sdk"
//
exclude group:"com.miit.sdk"
transitive
=
true
//
transitive = true
changing
=
true
//
changing = true
}
//
}
// testImplementation 'junit:junit:4.13'
// testImplementation 'junit:junit:4.13'
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'
...
...
GoodMoney/app/src/main/AndroidManifest.xml
View file @
ee3c8398
...
@@ -251,8 +251,6 @@
...
@@ -251,8 +251,6 @@
<activity
<activity
android:name=
".call.detail.DetailApplyActivity"
android:name=
".call.detail.DetailApplyActivity"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activitys.XiaomanActivity"
android:screenOrientation=
"portrait"
/>
<service
<service
android:name=
".service.UpdateService"
android:name=
".service.UpdateService"
...
@@ -380,11 +378,6 @@
...
@@ -380,11 +378,6 @@
android:name=
"com.qq.e.comm.DownloadService"
android:name=
"com.qq.e.comm.DownloadService"
android:exported=
"false"
/>
android:exported=
"false"
/>
<!--小滿廣告-->
<activity
android:name=
"com.qq.e.tg.ADActivity"
android:configChanges=
"keyboard|keyboardHidden|orientation|screenSize"
/>
<activity
<activity
android:name=
"com.qq.e.ads.ADActivity"
android:name=
"com.qq.e.ads.ADActivity"
android:configChanges=
"keyboard|keyboardHidden|orientation|screenSize"
/>
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;
...
@@ -20,7 +20,6 @@ import com.mints.goodmoney.manager.RsNewsManager;
import
com.mints.goodmoney.manager.TtCsjAdManager
;
import
com.mints.goodmoney.manager.TtCsjAdManager
;
import
com.mints.goodmoney.manager.TzManager
;
import
com.mints.goodmoney.manager.TzManager
;
import
com.mints.goodmoney.manager.WnManager
;
import
com.mints.goodmoney.manager.WnManager
;
import
com.mints.goodmoney.manager.XmManager
;
import
com.mints.goodmoney.manager.YlVideoManager
;
import
com.mints.goodmoney.manager.YlVideoManager
;
import
com.mints.goodmoney.manager.YlhAdManager
;
import
com.mints.goodmoney.manager.YlhAdManager
;
import
com.mints.goodmoney.net.LoanService
;
import
com.mints.goodmoney.net.LoanService
;
...
@@ -138,7 +137,7 @@ public class MintsApplication extends MultiDexApplication {
...
@@ -138,7 +137,7 @@ public class MintsApplication extends MultiDexApplication {
TzManager
.
INSTANCE
.
initTz
(
this
);
TzManager
.
INSTANCE
.
initTz
(
this
);
//小满
//小满
XmManager
.
INSTANCE
.
initXm
(
this
);
//
XmManager.INSTANCE.initXm(this);
// 一览视频
// 一览视频
YlVideoManager
.
INSTANCE
.
init
(
this
);
YlVideoManager
.
INSTANCE
.
init
(
this
);
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/XmManager.kt
View file @
ee3c8398
package
com.mints.goodmoney.manager
//package com.mints.goodmoney.manager
//
import
android.app.Application
//import android.app.Application
import
android.text.TextUtils
//import android.text.TextUtils
import
android.util.Log
//import android.util.Log
import
android.view.View
//import android.view.View
import
android.widget.ImageView
//import android.widget.ImageView
import
com.bumptech.glide.Glide
//import com.bumptech.glide.Glide
import
com.bx.adsdk.AdSdk
//import com.bx.adsdk.AdSdk
import
com.bx.adsdk.util.MaterialTm
//import com.bx.adsdk.util.MaterialTm
import
com.bytedance.sdk.openadsdk.TTAdConfig
//import com.bytedance.sdk.openadsdk.TTAdConfig
import
com.bytedance.sdk.openadsdk.TTAdConstant
//import com.bytedance.sdk.openadsdk.TTAdConstant
import
com.bytedance.sdk.openadsdk.TTAdSdk
//import com.bytedance.sdk.openadsdk.TTAdSdk
import
com.fendasz.moku.planet.exception.MokuException
//import com.fendasz.moku.planet.exception.MokuException
import
com.fendasz.moku.planet.helper.MokuHelper
//import com.fendasz.moku.planet.helper.MokuHelper
import
com.mints.goodmoney.BuildConfig
//import com.mints.goodmoney.BuildConfig
import
com.mints.goodmoney.MintsApplication
//import com.mints.goodmoney.MintsApplication
import
com.mints.goodmoney.utils.LogUtil
//import com.mints.goodmoney.utils.LogUtil
import
com.qq.e.comm.managers.GDTADManager
//import com.qq.e.comm.managers.GDTADManager
import
kotlinx.android.synthetic.main.activity_layout_xiaoman.*
//import kotlinx.android.synthetic.main.activity_layout_xiaoman.*
//
/**
///**
* 描述:小满
// * 描述:小满
*/
// */
object
XmManager
{
//object XmManager {
//
private
const
val
ACCESSKEY
=
"hzq-az_rvkvdy"
// private const val ACCESSKEY = "hzq-az_rvkvdy"
private
const
val
SECRETKEY
=
"22FvHjUzvQ516214"
// private const val SECRETKEY = "22FvHjUzvQ516214"
//
private
var
placeMateId
=
""
// private var placeMateId = ""
private
var
materialId
=
""
// private var materialId = ""
//
fun
initXm
(
application
:
Application
)
{
// fun initXm(application: Application) {
try
{
// try {
//打开日志,上线之前记得关闭
// //打开日志,上线之前记得关闭
AdSdk
.
setDebug
(
BuildConfig
.
DEBUG
)
// AdSdk.setDebug(BuildConfig.DEBUG)
//初始化 需要在Applicaiton 中
// //初始化 需要在Applicaiton 中
AdSdk
.
init
(
application
,
ACCESSKEY
,
SECRETKEY
)
// AdSdk.init(application, ACCESSKEY, SECRETKEY)
}
catch
(
e
:
Exception
)
{
//这里应该是小满的异常
// } catch (e: Exception) {//这里应该是小满的异常
e
.
printStackTrace
()
// e.printStackTrace()
}
// }
}
// }
//
fun
loadMater
(
placeid
:
String
)
{
// fun loadMater(placeid: String) {
if
(
TextUtils
.
isEmpty
(
placeMateId
))
{
// if (TextUtils.isEmpty(placeMateId)) {
MaterialTm
().
loadMaterialData
(
UserManager
.
getInstance
().
userID
,
placeid
,
object
:
MaterialTm
.
Callback
{
// MaterialTm().loadMaterialData(UserManager.getInstance().userID, placeid, object : MaterialTm.Callback {
//对应PlaceID会有对应的素材
// //对应PlaceID会有对应的素材
override
fun
onSuccess
(
imgUrl
:
String
,
placeMateId2
:
String
,
materialId2
:
String
)
{
// override fun onSuccess(imgUrl: String, placeMateId2: String, materialId2: String) {
placeMateId
=
placeMateId2
// placeMateId = placeMateId2
materialId
=
materialId2
// materialId = materialId2
AdSdk
.
exposure
(
UserManager
.
getInstance
().
userID
,
placeid
,
placeMateId
,
materialId
);
// AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
LogUtil
.
d
(
"******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**"
)
// LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
}
// }
//
override
fun
onFailure
(
code
:
String
,
errmsg
:
String
)
{
// override fun onFailure(code: String, errmsg: String) {
LogUtil
.
d
(
"$code$errmsg"
)
// LogUtil.d("$code$errmsg")
}
// }
})
// })
}
else
{
// } else {
AdSdk
.
exposure
(
UserManager
.
getInstance
().
userID
,
placeid
,
placeMateId
,
materialId
);
// AdSdk.exposure(UserManager.getInstance().userID, placeid, placeMateId, materialId);
LogUtil
.
d
(
"******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**"
)
// LogUtil.d("******exposure*********${UserManager.getInstance().userID}******$placeMateId********$materialId****************$placeid**")
}
// }
}
// }
//
//
/**
// /**
* 入口点击上报
// * 入口点击上报
* @param view
// * @param view
*/
// */
fun
exprotClick
(
placeid
:
String
)
{
// fun exprotClick(placeid: String) {
if
(!
TextUtils
.
isEmpty
(
placeMateId
))
{
// if (!TextUtils.isEmpty(placeMateId)) {
AdSdk
.
click
(
UserManager
.
getInstance
().
userID
,
placeid
,
materialId
,
materialId
)
// AdSdk.click(UserManager.getInstance().userID, placeid, materialId, materialId)
LogUtil
.
d
(
"******exprotClick*******${UserManager.getInstance().userID}*******$placeMateId********$materialId******$placeid"
)
// LogUtil.d("******exprotClick*******${UserManager.getInstance().userID}*******$placeMateId********$materialId******$placeid")
}
// }
}
// }
//
}
//}
\ No newline at end of file
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/XiaomanActivity.kt
View file @
ee3c8398
This diff is collapsed.
Click to expand it.
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/GvMyAdapter.java
View file @
ee3c8398
...
@@ -17,7 +17,6 @@ import com.mints.goodmoney.R;
...
@@ -17,7 +17,6 @@ import com.mints.goodmoney.R;
import
com.mints.goodmoney.common.Constant
;
import
com.mints.goodmoney.common.Constant
;
import
com.mints.goodmoney.manager.BxmManager
;
import
com.mints.goodmoney.manager.BxmManager
;
import
com.mints.goodmoney.manager.UserManager
;
import
com.mints.goodmoney.manager.UserManager
;
import
com.mints.goodmoney.manager.XmManager
;
import
com.mints.goodmoney.mvp.model.BannerBean
;
import
com.mints.goodmoney.mvp.model.BannerBean
;
import
com.mints.library.utils.GlideUtils
;
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 {
...
@@ -46,7 +46,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
if
(
AppConfig
.
showAdFlag
)
{
if
(
AppConfig
.
showAdFlag
)
{
if
(
curPosition
==
0
)
{
if
(
curPosition
==
0
)
{
mainFragment
?.
onHiddenChanged
(
hidden
)
mainFragment
?.
onHiddenChanged
(
hidden
)
}
else
if
(
curPosition
==
4
)
{
}
else
if
(
curPosition
==
3
)
{
liebaoGameFragment
?.
onHiddenChanged
(
hidden
)
liebaoGameFragment
?.
onHiddenChanged
(
hidden
)
}
}
}
}
...
@@ -73,11 +73,11 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
...
@@ -73,11 +73,11 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
currentFragment
=
mainFragment
currentFragment
=
mainFragment
}
}
xtFragmentMoney
.
setxTabDisplayNum
(
5
)
xtFragmentMoney
.
setxTabDisplayNum
(
4
)
val
newTab1
=
xtFragmentMoney
.
newTab
()
val
newTab1
=
xtFragmentMoney
.
newTab
()
newTab1
.
text
=
"视频"
newTab1
.
text
=
"视频"
val
newTab3
=
xtFragmentMoney
.
newTab
()
//
val newTab3 = xtFragmentMoney.newTab()
newTab3
.
text
=
"书城"
//
newTab3.text = "书城"
val
newTab4
=
xtFragmentMoney
.
newTab
()
val
newTab4
=
xtFragmentMoney
.
newTab
()
newTab4
.
text
=
"听书"
newTab4
.
text
=
"听书"
val
newTab5
=
xtFragmentMoney
.
newTab
()
val
newTab5
=
xtFragmentMoney
.
newTab
()
...
@@ -85,7 +85,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
...
@@ -85,7 +85,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
val
newTab6
=
xtFragmentMoney
.
newTab
()
val
newTab6
=
xtFragmentMoney
.
newTab
()
newTab6
.
text
=
"来电秀"
newTab6
.
text
=
"来电秀"
xtFragmentMoney
.
addTab
(
newTab1
)
xtFragmentMoney
.
addTab
(
newTab1
)
xtFragmentMoney
.
addTab
(
newTab3
)
//
xtFragmentMoney.addTab(newTab3)
xtFragmentMoney
.
addTab
(
newTab4
)
xtFragmentMoney
.
addTab
(
newTab4
)
xtFragmentMoney
.
addTab
(
newTab5
)
xtFragmentMoney
.
addTab
(
newTab5
)
xtFragmentMoney
.
addTab
(
newTab6
)
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(),
...
@@ -248,12 +248,12 @@ class MyFragment : BaseFragment(),
// 生成热门活动数据
// 生成热门活动数据
private
fun
generateGridData
(
data
:
List
<
BannerBean
.
ListBean
>)
{
private
fun
generateGridData
(
data
:
List
<
BannerBean
.
ListBean
>)
{
val
inflater
=
LayoutInflater
.
from
(
mContext
)
val
inflater
=
LayoutInflater
.
from
(
mContext
)
for
(
i
in
0
..
data
.
size
-
1
)
{
//
for (i in 0..data.size - 1) {
if
(
data
.
get
(
i
).
toUrl
.
equals
(
Constant
.
HOT_ACTIVITY_SHEEP
))
{
//
if (data.get(i).toUrl.equals(Constant.HOT_ACTIVITY_SHEEP)) {
XmManager
.
loadMater
(
data
.
get
(
i
).
xmPlaceId
)
//
XmManager.loadMater(data.get(i).xmPlaceId)
break
//
break
}
//
}
}
//
}
val
pageCount
=
ceil
(
data
.
size
*
1.0
/
HOT_PAGE_SIZE
).
toInt
()
val
pageCount
=
ceil
(
data
.
size
*
1.0
/
HOT_PAGE_SIZE
).
toInt
()
val
pagerList
=
arrayListOf
<
View
>()
val
pagerList
=
arrayListOf
<
View
>()
...
@@ -950,11 +950,11 @@ class MyFragment : BaseFragment(),
...
@@ -950,11 +950,11 @@ class MyFragment : BaseFragment(),
// 自有界面
// 自有界面
when
(
hotBean
.
toUrl
)
{
when
(
hotBean
.
toUrl
)
{
Constant
.
HOT_ACTIVITY_SHEEP
->
{
Constant
.
HOT_ACTIVITY_SHEEP
->
{
XmManager
.
exprotClick
(
hotBean
.
xmPlaceId
)
//
XmManager.exprotClick(hotBean.xmPlaceId)
val
bundle
=
Bundle
()
//
val bundle = Bundle()
bundle
.
putString
(
Constant
.
ACTIVITY_TITLE
,
hotBean
.
title
)
//
bundle.putString(Constant.ACTIVITY_TITLE, hotBean.title)
bundle
.
putString
(
Constant
.
ACTIVITY_ID
,
hotBean
.
xmPlaceId
)
//
bundle.putString(Constant.ACTIVITY_ID, hotBean.xmPlaceId)
readyGo
(
XiaomanActivity
::
class
.
java
,
bundle
)
//
readyGo(XiaomanActivity::class.java, bundle)
}
}
Constant
.
HOT_ACTIVITY_WATER
->
{
Constant
.
HOT_ACTIVITY_WATER
->
{
TTPreLoadCarrierExpressManager
.
getInstance
().
loadTtFrameLayout
(
TtCsjAdManager
.
TT_AD_NATIVEEXPRESS_WATER
)
TTPreLoadCarrierExpressManager
.
getInstance
().
loadTtFrameLayout
(
TtCsjAdManager
.
TT_AD_NATIVEEXPRESS_WATER
)
...
...
GoodMoney/build.gradle
View file @
ee3c8398
...
@@ -53,10 +53,10 @@ buildscript {
...
@@ -53,10 +53,10 @@ buildscript {
url
'http://maven.aliyun.com/nexus/content/repositories/releases/'
url
'http://maven.aliyun.com/nexus/content/repositories/releases/'
}
}
// 添加小满科技
//
// 添加小满科技
maven
{
url
'http://maven.aliyun.com/nexus/content/repositories/jcenter'
}
//
maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
maven
{
url
"https://maven.google.com"
}
//
maven { url "https://maven.google.com"}
maven
{
url
"https://maven.linzhuxin.com/repository/lzoom_read_sdk_prd/"
}
//
maven { url "https://maven.linzhuxin.com/repository/lzoom_read_sdk_prd/"}
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:4.0.1'
classpath
'com.android.tools.build:gradle:4.0.1'
...
@@ -84,8 +84,8 @@ allprojects {
...
@@ -84,8 +84,8 @@ allprojects {
maven
{
maven
{
url
'http://maven.aliyun.com/nexus/content/repositories/releases/'
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" }
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment