Skip to content

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

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

parents 8777fc49 09f2a542
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 255 deletions
GoodMoney/app/build.gradle
View file @ 151d0d2b
......@@ -68,8 +68,6 @@ android {
manifestPlaceholders = [TD_SCHEMA_KEY: DEBUG_TD_SCHEMA_KEY,
TD_KEY : DEBUG_TD_KEY]
// buildConfigField "String", "MainIp", RELEASE_URL
//混淆
minifyEnabled false
zipAlignEnabled false
......@@ -206,10 +204,6 @@ dependencies {
exclude group: 'com.yilan.sdk', module: 'toutiao'
exclude group: 'com.yilan.sdk', module: 'gdt'
}
implementation ("com.yilan.sdk:ad:3.0.0.3"){
exclude group: 'com.yilan.sdk', module: 'toutiao'
exclude group: 'com.yilan.sdk', module: 'gdt'
}
implementation('com.aliyun.ams:alicloud-android-httpdns:1.2.3@aar') {
transitive true
}
......@@ -241,8 +235,8 @@ dependencies {
implementation(name: 'bxmsdk-release-3.0.0-csj3300', ext: 'aar')
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
// testImplementation 'junit:junit:4.13'
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TTNativeExpressManager.java
View file @ 151d0d2b
......@@ -67,7 +67,7 @@ public class TTNativeExpressManager {
* @param viewHeight
*/
private void getTtNativeExpress(String codeId, FrameLayout view, float viewWidth, float viewHeight) {
Context context= MintsApplication.getContext();
// Context context= MintsApplication.getContext();
//step4:创建广告请求参数AdSlot,具体参数含义参考文档
AdSlot adSlot = new AdSlot.Builder()
.setCodeId(codeId) //广告位id
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TTPreLoadCarrierExpressManager.java 0 → 100644
View file @ 151d0d2b
package com.mints.goodmoney.manager;
import android.content.Context;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import com.mints.goodmoney.MintsApplication;
public class TTPreLoadCarrierExpressManager {
private static TTPreLoadCarrierExpressManager _inst;
private FrameLayout ttFrameLayout;
private TTNativeExpressManager ttNativeExpressManager;
private HandlerThread mHandlerThread = new HandlerThread("TTPreLoadHandlerThread");
private Handler mWorkHandler;
private Handler mMainHandler = new Handler(Looper.getMainLooper());
private int mTTPreLoadWhat = 0x3243434;
public static TTPreLoadCarrierExpressManager getInstance() {
if (_inst == null) {
_inst = new TTPreLoadCarrierExpressManager();
}
return _inst;
}
private TTPreLoadCarrierExpressManager() {
init();
}
private void init() {
ttNativeExpressManager = new TTNativeExpressManager();
ttNativeExpressManager.initTTAd(false);
// 启动异步线程
mHandlerThread.start();
mWorkHandler = new Handler(mHandlerThread.getLooper()) {
@Override
public void handleMessage(@NonNull Message msg) {
// 工作线程进行加载数据
if (msg.what == mTTPreLoadWhat) {
loadTtFrameLayoutInThread((String) msg.obj);
}
}
};
}
public void onDestroy() {
mHandlerThread.quit();
mHandlerThread = null;
mWorkHandler.removeCallbacksAndMessages(null);
mWorkHandler = null;
}
public FrameLayout getTtFrameLayout() {
return ttFrameLayout;
}
private void loadTtFrameLayoutInThread(String codeId) {
Context context = MintsApplication.getContext();
ttFrameLayout = null;
try {
ttFrameLayout = new FrameLayout(context);
ttNativeExpressManager.getNativeExpressInit(codeId, ttFrameLayout, 340, 0);
ttNativeExpressManager.setTTNativeExpressManagerListener(view -> {
mMainHandler.post(() -> {
// 主线程更新UI操作
if (view == null) {
ttFrameLayout = null;
} else {
try {
ttFrameLayout = view;
} catch (Exception e) {
e.printStackTrace();
ttFrameLayout = null;
}
}
});
});
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* 预加载 信息流
*/
public void loadTtFrameLayout(String codeId) {
Message msg = Message.obtain();
msg.what = mTTPreLoadWhat;
msg.obj = codeId;
mWorkHandler.sendMessage(msg);
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TTPreLoadExpressManager.java
View file @ 151d0d2b
......@@ -38,23 +38,21 @@ public class TTPreLoadExpressManager {
* 预加载 信息流
*/
public void loadTtFrameLayout() {
Context context= MintsApplication.getContext();
Context context = MintsApplication.getContext();
ttFrameLayout = null;
try {
ttFrameLayout = new FrameLayout(context);
ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_AWARD, ttFrameLayout, 310, 0);
ttNativeExpressManager.setTTNativeExpressManagerListener(new TTNativeExpressManager.TTNativeExpressManagerListener() {
@Override
public void setTtExpressView(FrameLayout view) {
if (view == null) {
ttFrameLayout = null;
} else {
ttNativeExpressManager.setTTNativeExpressManagerListener(view -> {
if (view == null) {
ttFrameLayout = null;
} else {
try {
ttFrameLayout = view;
} catch (Exception e) {
e.printStackTrace();
ttFrameLayout = null;
}
try {
ttFrameLayout = view;
} catch (Exception e) {
e.printStackTrace();
ttFrameLayout = null;
}
}
});
......@@ -62,6 +60,5 @@ public class TTPreLoadExpressManager {
} catch (Exception e) {
e.printStackTrace();
}
ttFrameLayout = null;
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/FoodSubsidyActivity.kt
View file @ 151d0d2b
......@@ -5,6 +5,7 @@ import android.view.View
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.TTNativeExpressManager
import com.mints.goodmoney.manager.TTPreLoadCarrierExpressManager
import com.mints.goodmoney.manager.TtCsjAdManager
import com.mints.goodmoney.mvp.model.MealBean
import com.mints.goodmoney.mvp.presenters.FoodSubsidyPresenter
......@@ -92,6 +93,9 @@ class FoodSubsidyActivity : BaseActivity(), View.OnClickListener, FoodSubsidyVie
readyGo(AwardActivity::class.java, bundle)
}
}
// 预加载信息流
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
}
......@@ -99,9 +103,20 @@ class FoodSubsidyActivity : BaseActivity(), View.OnClickListener, FoodSubsidyVie
* 初始化信息iyc
*/
private fun initExpress() {
try {
// try {
// ttNativeExpressManager.initTTAd(false)
ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT, flWalkAd, 320f, 0f)
// ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT, flSubsidykAd, 320f, 0f)
// } catch (e: Exception) {
// e.printStackTrace()
// }
try {
if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
if (flSubsidykAd != null) {
flSubsidykAd.removeAllViews()
flSubsidykAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
}
}
} catch (e: Exception) {
e.printStackTrace()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MainActivity.kt
View file @ 151d0d2b
......@@ -12,6 +12,7 @@ import com.mints.goodmoney.R
import com.mints.goodmoney.ad.video.VedioAdingManager
import com.mints.goodmoney.common.AppConfig
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.TTPreLoadCarrierExpressManager
import com.mints.goodmoney.manager.ZhangyueManager
import com.mints.goodmoney.mvp.views.MainView
import com.mints.goodmoney.ui.activitys.base.BaseActivity
......@@ -70,6 +71,7 @@ class MainActivity : BaseActivity(), MainView, View.OnClickListener {
super.onDestroy()
TTPreLoadCarrierExpressManager.getInstance().onDestroy()
VedioAdingManager.getInstance(this).setVedioAdingListener(null)
VedioAdingManager.getInstance(this).onDestory()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MorningClockActivity.kt
View file @ 151d0d2b
......@@ -7,6 +7,7 @@ import com.mints.goodmoney.R
import com.mints.goodmoney.ad.video.VedioAdingManager
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.TTNativeExpressManager
import com.mints.goodmoney.manager.TTPreLoadCarrierExpressManager
import com.mints.goodmoney.manager.TtCsjAdManager
import com.mints.goodmoney.mvp.model.MorningClockBean
import com.mints.goodmoney.mvp.model.VedioAdingBean
......@@ -15,7 +16,6 @@ import com.mints.goodmoney.mvp.views.MorningClockView
import com.mints.goodmoney.ui.activitys.base.BaseActivity
import com.mints.goodmoney.ui.adapter.MorningClockAdapter
import com.mints.goodmoney.utils.SpanUtils
import kotlinx.android.synthetic.main.activity_drawcash.*
import kotlinx.android.synthetic.main.activity_morning_clock.*
/**
......@@ -64,6 +64,9 @@ class MorningClockActivity : BaseActivity()
R.id.ivMorningClockBack -> finish()
R.id.tvMorningClockClick -> {
awardVedio()
// 预加载信息流
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK)
}
}
}
......@@ -73,19 +76,18 @@ class MorningClockActivity : BaseActivity()
morningClockList = data.targetList
if (data.isCanClick) {
tvMorningClockClick.setBackground(resources.getDrawable(R.drawable.shape_water_btn))
tvMorningClockClick.background = resources.getDrawable(R.drawable.shape_water_btn)
tvMorningClockClick.isEnabled = true
} else {
tvMorningClockClick.setBackground(resources.getDrawable(R.drawable.shape_tv_gold_none))
tvMorningClockClick.background = resources.getDrawable(R.drawable.shape_tv_gold_none)
tvMorningClockClick.isEnabled = false
}
tvMorningClockClick.text = data.buttonMsg
tvMorningClockDay.setText(
SpanUtils()
.append("打卡领金币 已连续打卡")
.append("${data.continuityDays}").setForegroundColor(resources.getColor(R.color.main_mints))
.append("天")
.create())
tvMorningClockDay.text = SpanUtils()
.append("打卡领金币 已连续打卡")
.append("${data.continuityDays}").setForegroundColor(resources.getColor(R.color.main_mints))
.append("天")
.create()
initRvView()
}
......@@ -178,9 +180,20 @@ class MorningClockActivity : BaseActivity()
* 初始化信息iyc
*/
private fun initExpress() {
// try {
// ttNativeExpressManager.initTTAd(false)
// ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK, flMorningClockAd, 320f, 0f)
// } catch (e: Exception) {
// e.printStackTrace()
// }
try {
ttNativeExpressManager.initTTAd(false)
ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK, flMorningClockAd, 320f, 0f)
if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
if (flMorningClockAd != null) {
flMorningClockAd.removeAllViews()
flMorningClockAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
}
}
} catch (e: Exception) {
e.printStackTrace()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WalkActivity.kt
View file @ 151d0d2b
......@@ -4,7 +4,7 @@ import android.os.Bundle
import android.view.View
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.TTNativeExpressManager
import com.mints.goodmoney.manager.TTPreLoadCarrierExpressManager
import com.mints.goodmoney.manager.TtCsjAdManager
import com.mints.goodmoney.mvp.model.WalkBean
import com.mints.goodmoney.mvp.presenters.WalkPresenter
......@@ -21,7 +21,8 @@ import kotlinx.android.synthetic.main.activity_walk.*
class WalkActivity : BaseActivity(), View.OnClickListener, WalkView, StepView.StepViewListener {
private val walkPresenter by lazy { WalkPresenter() }
private val ttNativeExpressManager by lazy { TTNativeExpressManager() }
// private val ttNativeExpressManager by lazy { TTNativeExpressManager() }
private var curCoin = 0//点击的汽泡金币
override fun getContentViewLayoutID() = R.layout.activity_walk
......@@ -45,7 +46,7 @@ class WalkActivity : BaseActivity(), View.OnClickListener, WalkView, StepView.St
super.onDestroy()
svWalk?.destoryAnim()
ttNativeExpressManager.onTTAdDestroy()
// ttNativeExpressManager.onTTAdDestroy()
walkPresenter.detachView()
}
......@@ -97,15 +98,29 @@ class WalkActivity : BaseActivity(), View.OnClickListener, WalkView, StepView.St
bundle.putString(Constant.MAIN_CARRIER_TYPE, Constant.CARRIER_WALK_BUBBLE)
readyGo(AwardActivity::class.java, bundle)
}
// 预加载信息流
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK)
}
/**
* 初始化信息iyc
*/
private fun initExpress() {
// try {
// ttNativeExpressManager.initTTAd(false)
// ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK, flWalkAd, 320f, 0f)
// } catch (e: Exception) {
// e.printStackTrace()
// }
try {
ttNativeExpressManager.initTTAd(false)
ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK, flWalkAd, 320f, 0f)
if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
if (flWalkAd != null) {
flWalkAd.removeAllViews()
flWalkAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
}
}
} catch (e: Exception) {
e.printStackTrace()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WaterActivity.kt
View file @ 151d0d2b
......@@ -4,7 +4,7 @@ import android.os.Bundle
import android.view.View
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.TTNativeExpressManager
import com.mints.goodmoney.manager.TTPreLoadCarrierExpressManager
import com.mints.goodmoney.manager.TtCsjAdManager
import com.mints.goodmoney.mvp.model.WaterBean
import com.mints.goodmoney.mvp.presenters.WaterPresenter
......@@ -17,11 +17,9 @@ import kotlinx.android.synthetic.main.activity_water.*
* 作者：孟崔广
* 时间：2020/10/13 11:55
*/
class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewListener
, com.mints.goodmoney.mvp.views.WaterView {
class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewListener, com.mints.goodmoney.mvp.views.WaterView {
private val waterPresenter by lazy { WaterPresenter() }
private val ttNativeExpressManager by lazy { TTNativeExpressManager() }
override fun getContentViewLayoutID() = R.layout.activity_water
......@@ -53,7 +51,7 @@ class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewL
wvWater?.destoryAnim()
wvWater?.closeWaterViewTime()
ttNativeExpressManager.onTTAdDestroy()
// ttNativeExpressManager.onTTAdDestroy()
waterPresenter.detachView()
}
......@@ -69,6 +67,9 @@ class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewL
if (water == 0) {
waterPresenter.clickForWater()
}
// 预加载信息流
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
}
override fun clickForWaterSuc(waterCoin: Int) {
......@@ -110,8 +111,12 @@ class WaterActivity : BaseActivity(), View.OnClickListener, WaterView.WaterViewL
*/
private fun initExpress() {
try {
ttNativeExpressManager.initTTAd( false)
ttNativeExpressManager.getNativeExpressInit(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER, flWaterAd, 320f, 0f)
if (TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout != null) {
if (flWaterAd != null) {
flWaterAd.removeAllViews()
flWaterAd.addView(TTPreLoadCarrierExpressManager.getInstance().ttFrameLayout)
}
}
} catch (e: Exception) {
e.printStackTrace()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/BannerTaskAdapter.kt deleted 100644 → 0
View file @ 8777fc49
package com.mints.goodmoney.ui.adapter
import android.content.Context
import android.graphics.Color
import android.view.View
import android.widget.TextView
import com.mints.goodmoney.R
import com.mints.goodmoney.mvp.model.FriendsTaskBean
class BannerTaskAdapter(context: Context) : BannerBaseAdapter<FriendsTaskBean.ChallengeBean.ListBean>(context) {
private val mContext: Context = context
override fun getLayoutResID() = R.layout.item_bv_friends_task
override fun convert(convertView: View, data: FriendsTaskBean.ChallengeBean.ListBean) {
convertView.findViewById<TextView>(R.id.item_bv_friends_task_title).text = data.title
convertView.findViewById<TextView>(R.id.item_bv_friends_task_info).text = data.remarks
convertView.findViewById<TextView>(R.id.item_bv_friends_task_btn).text = data.button
if (data.button == "去邀请") {
convertView.findViewById<TextView>(R.id.item_bv_friends_task_btn).setBackgroundResource(R.drawable.shape_btn_orange)
convertView.findViewById<TextView>(R.id.item_bv_friends_task_btn).setTextColor(mContext.resources.getColor(R.color.my_color_orange))
} else {
convertView.findViewById<TextView>(R.id.item_bv_friends_task_btn).setBackgroundResource(R.drawable.shape_btn_orange_complete)
convertView.findViewById<TextView>(R.id.item_bv_friends_task_btn).setTextColor(Color.WHITE)
}
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt
View file @ 151d0d2b
......@@ -213,6 +213,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
* 显示红包动画
*/
fun showRedbox(view: View?) {
rope = null
rope = YoYo.with(Techniques.Pulse).duration(1200)
.interpolate(AccelerateDecelerateInterpolator())
.repeat(-1)
......@@ -259,8 +260,8 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
.create()
tv_bonus_money.text = SpanUtils()
.append(data.cash.toString()).setFontSize(50).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.append("元").setFontSize(30).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.append(data.cash.toString()).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.append("元").setFontSize(22).setForegroundColor(resources.getColor(R.color.color_E72C2B))
.create()
tv_bonus_rate.text = SpanUtils()
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ 151d0d2b
......@@ -20,9 +20,7 @@ import com.mints.goodmoney.R
import com.mints.goodmoney.ad.video.VedioAdingManager
import com.mints.goodmoney.common.AppConfig
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.BxmManager
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.manager.YwhzManager
import com.mints.goodmoney.manager.*
import com.mints.goodmoney.mvp.model.*
import com.mints.goodmoney.mvp.presenters.MyPresenter
import com.mints.goodmoney.mvp.views.MyView
......@@ -352,7 +350,15 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
// 已登录
if (userManager.wxOpenid.isNotEmpty()) {
GlideUtils.loadImageViewLoding(context, userManager.wxHeader, item_title_avatar, R.mipmap.ic_my, R.mipmap.ic_my)
item_title_id.text = userManager.wxName
if (userManager.wxName.isEmpty()) {
var mobile = userManager.mobile
if (mobile.isNotEmpty()) {
mobile = mobile.substring(0, 3) + "****" + mobile.substring(mobile.length - 4, mobile.length)
}
item_title_id.text = "手机:$mobile"
} else {
item_title_id.text = userManager.wxName
}
} else {
var mobile = userManager.mobile
if (mobile.isNotEmpty()) {
......@@ -588,9 +594,11 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
// 自有界面
when (hotBean.toUrl) {
Constant.HOT_ACTIVITY_WATER -> {
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WATER)
readyGo(WaterActivity::class.java)
}
Constant.HOT_ACTIVITY_WALK -> {
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_WALK)
readyGo(WalkActivity::class.java)
}
Constant.HOT_ACTIVITY_CARD -> {
......@@ -600,12 +608,14 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
readyGo(LiebaoGameActivity::class.java)
}
Constant.HOT_ACTIVITY_MORNINGCLOCK -> {
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_MORNINGCLOCK)
readyGo(MorningClockActivity::class.java)
}
Constant.HOT_ACTIVITY_BXM -> {
// 消费变现猫事件
}
Constant.HOT_ACTIVITY_EAT -> {
TTPreLoadCarrierExpressManager.getInstance().loadTtFrameLayout(TtCsjAdManager.TT_AD_NATIVEEXPRESS_EAT)
readyGo(FoodSubsidyActivity::class.java)
}
else -> {
......
GoodMoney/app/src/main/res/layout/activity_award.xml
View file @ 151d0d2b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -110,11 +109,12 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_gravity="center"
android:layout_marginLeft="25dp"
android:layout_marginTop="10dp"
android:layout_marginRight="25dp"
android:layout_gravity="center"
android:background="@drawable/shape_bg_write">
<FrameLayout
android:id="@+id/flAwardAd"
android:layout_width="wrap_content"
......
GoodMoney/app/src/main/res/layout/activity_food_subsidy.xml
View file @ 151d0d2b
......@@ -7,8 +7,10 @@
android:overScrollMode="never">
<LinearLayout
android:id="@+id/ll_food"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<FrameLayout
......@@ -41,14 +43,12 @@
</FrameLayout>
<FrameLayout
android:id="@+id/flWalkAd"
android:id="@+id/flSubsidykAd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:background="@color/full_transparent">
</FrameLayout>
android:background="@color/full_transparent"/>
</LinearLayout>
</ScrollView>
GoodMoney/app/src/main/res/layout/activity_walk.xml
View file @ 151d0d2b
......@@ -46,9 +46,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:background="@color/full_transparent">
android:background="@color/full_transparent"/>
</FrameLayout>
</LinearLayout>
</ScrollView>
GoodMoney/app/src/main/res/layout/activity_water.xml
View file @ 151d0d2b
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
......@@ -23,14 +22,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:padding="15dp"
android:src="@drawable/yl_mp_ic_back_left"></ImageView>
android:src="@drawable/yl_mp_ic_back_left" />
<ImageView
android:layout_width="wrap_content"
android:src="@mipmap/ic_font_water"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="60dp"
android:layout_height="wrap_content"/>
android:src="@mipmap/ic_font_water" />
<com.mints.goodmoney.ui.widgets.WaterView
android:id="@+id/wvWater"
......@@ -42,13 +41,12 @@
<FrameLayout
android:id="@+id/flWaterAd"
android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/full_transparent">
android:layout_marginTop="20dp"
android:background="@color/full_transparent" />
</FrameLayout>
</LinearLayout>
</ScrollView>
GoodMoney/app/src/main/res/layout/browser_controller.xml deleted 100755 → 0
View file @ 8777fc49
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFF6F6F6"
android:orientation="horizontal"
android:paddingBottom="10dp"
android:paddingTop="10dp">
<ImageButton
android:id="@+id/browser_controller_back"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent"
android:scaleType="centerInside"
android:src="@mipmap/btn_back_normal" />
<ImageButton
android:id="@+id/browser_controller_forward"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent"
android:scaleType="centerInside"
android:src="@mipmap/btn_forward_normal" />
<ImageButton
android:id="@+id/browser_controller_refresh"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent"
android:scaleType="centerInside"
android:src="@mipmap/btn_refresh_normal" />
<ImageButton
android:id="@+id/browser_controller_go"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent"
android:scaleType="centerInside"
android:src="@mipmap/btn_export_normal" />
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/fragment_main_friends.xml
View file @ 151d0d2b
......@@ -35,11 +35,6 @@
android:layout_height="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/bg_invite_friends" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -186,19 +181,19 @@
android:id="@+id/tv_yesterday_bonus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:paddingRight="10dp"
android:gravity="end"
android:paddingEnd="10dp"
android:text="@string/dot"
android:textSize="20sp" />
android:textSize="22sp" />
<TextView
android:id="@+id/tv_today_bonus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:paddingRight="10dp"
android:gravity="end"
android:paddingEnd="10dp"
android:text="@string/dot"
android:textSize="20sp" />
android:textSize="22sp" />
</LinearLayout>
......@@ -214,7 +209,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginStart="6dp"
android:layout_marginTop="15dp"
android:text="分红收益"
android:textColor="@color/color_CF7E7E" />
......@@ -223,9 +218,10 @@
android:id="@+id/tv_bonus_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginStart="6dp"
android:layout_marginTop="40dp"
android:text="@string/dot" />
android:text="@string/dot"
android:textSize="22sp" />
<Button
android:id="@+id/btn_get_bonus"
......
GoodMoney/app/src/main/res/layout/header_activity.xml deleted 100644 → 0
View file @ 8777fc49
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/tv_activity_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
android:paddingTop="36dp"
android:paddingRight="5dp"
android:paddingBottom="10dp"
android:scaleType="center"
android:src="@mipmap/ic_activity_arrow" />
<TextView
android:id="@+id/tv_activity_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="36dp"
android:textColor="@color/product_net_text"
android:textSize="18sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#E1E1E1" />
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_bv_friends_task.xml deleted 100644 → 0
View file @ 8777fc49
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/item_bv_friends_task_iv"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:src="@mipmap/ic_friends_task"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_bv_friends_task_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:text="任务1"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/item_bv_friends_task_iv"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_bv_friends_task_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginBottom="12dp"
android:text="邀请1名好友"
android:textColor="@color/main_bg_text"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/item_bv_friends_task_iv" />
<TextView
android:id="@+id/item_bv_friends_task_btn"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_btn_orange"
android:gravity="center"
android:text="去邀请"
android:textColor="@color/my_color_orange"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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