Commit 08c52f5b authored by jyx's avatar jyx

Merge branch 'dev_ad' into dev_quzhuanqian

parents 2e0f09d3 6bdfce29
......@@ -244,7 +244,10 @@ dependencies {
implementation(name: 'mh-adsdk', ext: 'aar')
implementation(name: 'mh-adsdk-ext', ext: 'aar')
implementation(name: 'ks_3.3.5.3', ext: 'aar')
// 趣赚钱
implementation(name: 'okgo-release', ext: 'aar')
implementation(name: 'scenemodule-2.0', ext: 'aar')
implementation(name: 'scenead-2.0', ext: 'aar')
// testImplementation 'junit:junit:4.13'
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'
......
......@@ -501,3 +501,10 @@
# ======================= 瑞狮新闻 END ================
# ===================== 聚乐云 START ================
-keep class com.lzy.okgo.** {*;}
-keep class com.fly.scenemodule.** {*;}
# ======================= 聚乐云 END ================
\ No newline at end of file
......@@ -45,6 +45,10 @@
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />
<!-- 适配小米(xiaomi)刘海屏 -->
<meta-data
android:name="android.max_aspect"
......@@ -181,10 +185,10 @@
android:screenOrientation="portrait" />
<activity
android:name=".ui.activitys.AccountMergeActivity"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".ui.activitys.WrapperActivity"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<service
android:name=".service.UpdateService"
......
......@@ -6,7 +6,12 @@ import android.content.Context
import android.content.Intent
import cn.jpush.android.api.BasicPushNotificationBuilder
import cn.jpush.android.api.JPushInterface
import com.fly.scenemodule.SceneUtil
import com.fly.scenemodule.model.GDTInfo
import com.fly.scenemodule.model.TTInfo
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.BxmManager.initBxm
import com.mints.goodmoney.manager.SceneManager
import com.mints.library.utils.CommonUtils
import com.mob.MobSDK
import com.orhanobut.logger.AndroidLogAdapter
......@@ -17,6 +22,7 @@ import com.tendcloud.tenddata.TCAgent
import com.umeng.analytics.MobclickAgent
import com.umeng.commonsdk.UMConfigure
/**
* 子线程初始化SDK
*/
......
......@@ -167,6 +167,9 @@ object Constant {
const val HOT_ACTIVITY_EAT = "eat"
const val HOT_ACTIVITY_MORNINGCLOCK = "morningclock"
const val HOT_ACTIVITY_H5 = "h5"
const val HOT_ACTIVITY_SCRAPPAGE = "scrapPage"
const val HOT_ACTIVITY_DATI = "dati"
const val HOT_ACTIVITY_CAICY = "caichengyu"
// 打开激活
const val FIRST_DEVICE_FLAG = "first_device_flag"
......@@ -174,7 +177,8 @@ object Constant {
// share
const val SHARE_TITLE = "发现一个二傻子平台,人傻钱多,速来~一起薅死他~~"
var SHARE_CONTENT = "邀请码【${UserManager.getInstance().codeID}】,共享新模式,快来加入跟我一起赚钱吧"
// var SHARE_URL: String = BuildConfig.MainIp + "share/shareFriend.html?ruid=" + UserManager.getInstance().getUserID() + "&channel=" + CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
// var SHARE_URL: String = BuildConfig.MainIp + "share/shareFriend.html?ruid=" + UserManager.getInstance().getUserID() + "&channel=" + CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
var SHARE_URL: String = BuildConfig.MainIp + "wxShare/toShare?shareId=" + UserManager.getInstance().getUserID()
// 首页视频时长 单位-秒
......@@ -187,12 +191,12 @@ object Constant {
const val FIRST_VISITOR_FLAG = "first_visitor_flag"
// 账号合并
const val MERGE_MOBILE="merge_mobile"
const val MERGE_WXOPENID="merge_wxopenid"
const val MERGE_KEY="merge_key"
const val MERGE_MOBILE = "merge_mobile"
const val MERGE_WXOPENID = "merge_wxopenid"
const val MERGE_KEY = "merge_key"
// wrapper type
const val WRAPPER_TYPE="wrapper_type"
const val WRAPPER_TYPE = "wrapper_type"
}
package com.mints.goodmoney.manager
import com.fly.scenemodule.SceneUtil
import com.fly.scenemodule.model.GDTInfo
import com.fly.scenemodule.model.TTInfo
import com.mints.goodmoney.MintsApplication
/**
* 描述:聚乐云SDK
*/
object SceneManager {
const val SCENE_CHANNEL_Id = "10004"
/**
* 初始化
*/
fun initScene() {
val userId = UserManager.getInstance().userID
// 初始化聚乐云
SceneUtil.initSdk(SCENE_CHANNEL_Id, userId, MintsApplication.OAID)
//穿山甲-------
val ttInfo = TTInfo()
ttInfo.csJ_Appid = ""
ttInfo.csJ_VideoId = ""
ttInfo.csJ_BannerId = ""
ttInfo.csJ_InteractionId = ""
SceneUtil.initCSJConfig(ttInfo)
//广点通-------
val gdtInfo = GDTInfo()
gdtInfo.gdT_Appid = ""
gdtInfo.gdT_VideoId = ""
gdtInfo.gdT_ExpressId = ""
gdtInfo.GDT_InteractionId = ""
SceneUtil.initGDTConfig(gdtInfo)
}
}
\ No newline at end of file
......@@ -10,10 +10,13 @@ import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat
import com.fly.scenemodule.SceneUtil
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.login.LoginApi
import com.mints.goodmoney.login.OnLoginListener
import com.mints.goodmoney.manager.SceneManager
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.mvp.model.DrawcashBean
import com.mints.goodmoney.mvp.model.WXInfo
......@@ -39,6 +42,8 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
override fun initViewsAndEvents() {
settingsPresenter.attachView(this)
SceneUtil.signIn(this, SceneManager.SCENE_CHANNEL_Id, userManager.userID, MintsApplication.OAID)
initLayout()
}
......@@ -145,6 +150,19 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
item_feedBack.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(feedBack, null, null, null)
item_feedBack.findViewById<TextView>(R.id.tv_right).visibility = View.GONE
item_feedBack.findViewById<ImageView>(R.id.iv_right).visibility = View.VISIBLE
tv_1.setOnClickListener {
SceneUtil.luckyDraw(this)
}
tv_2.setOnClickListener {
SceneUtil.cCy(this)
}
tv_3.setOnClickListener {
SceneUtil.daTi(this)
}
tv_4.setOnClickListener {
SceneUtil.scrapPage(this)
}
}
override fun getContentViewLayoutID() = R.layout.activity_settings
......@@ -301,7 +319,7 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
}
if (!isFinishing) {
settingsPresenter.editUserMsg(res["openid"].toString(),JsonUtil.toJson(wxInfo))
settingsPresenter.editUserMsg(res["openid"].toString(), JsonUtil.toJson(wxInfo))
}
} catch (e: Exception) {
e.printStackTrace()
......
......@@ -10,7 +10,9 @@ import android.view.View
import android.widget.AdapterView
import androidx.recyclerview.widget.DividerItemDecoration
import com.component.dly.xzzq_ywsdk.YwSDK_WebActivity.Companion.open
import com.fly.scenemodule.SceneUtil
import com.mints.goodmoney.BuildConfig
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.R
import com.mints.goodmoney.ad.banner.BannerManager
import com.mints.goodmoney.ad.video.VedioAdingManager
......@@ -618,6 +620,18 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
Constant.HOT_ACTIVITY_BXM -> {
// 消费变现猫事件
}
Constant.HOT_ACTIVITY_CAICY -> {
// 猜成语
SceneUtil.cCy(requireActivity())
}
Constant.HOT_ACTIVITY_DATI -> {
// 答题
SceneUtil.daTi(requireActivity())
}
Constant.HOT_ACTIVITY_SCRAPPAGE -> {
// 刮刮乐
SceneUtil.scrapPage(requireActivity())
}
Constant.HOT_ACTIVITY_EAT -> {
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
readyGo(FoodSubsidyActivity::class.java)
......@@ -834,6 +848,11 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
YwhzManager.init(baseApplication)
}
}
// 聚乐云
SceneManager.initScene()
// 同步账户
// SceneUtil.signIn(requireActivity(), SceneManager.SCENE_CHANNEL_Id, userManager.userID, MintsApplication.OAID)
}
private fun initView() {
......
......@@ -8,7 +8,8 @@
<com.mints.goodmoney.ui.widgets.ElasticScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
......@@ -47,6 +48,39 @@
<include
android:id="@+id/item_feedBack"
layout="@layout/item_settings" />
<Button
android:id="@+id/tv_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="幸运抽奖" />
<Button
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="猜成语" />
<Button
android:id="@+id/tv_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="答题" />
<Button
android:id="@+id/tv_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="刮刮卡" />
<Button
android:id="@+id/btn_switch"
android:layout_width="200dp"
......
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