Skip to content

A
android_highgold
Commit 22cbac9b authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

添加穿山甲、优量汇插屏交替，banner

parent 9bc2e2fd
Show whitespace changes
Inline Side-by-side
Showing with 797 additions and 573 deletions
highgold/app/src/main/java/com/mints/highgold/ad/AdParam.java deleted 100644 → 0
View file @ 9bc2e2fd
package com.mints.highgold.ad;
import com.mints.highgold.common.Constant;
import java.util.HashMap;
public class AdParam {
/**
* 封装广告参数
*
* @param curCoin 当前任务金币
* @param extraId 当前任务id
* @param adsource 广告来源
* @param carrierType 载体
* @param tid 穿山甲id
* @return
*/
public static HashMap<String, Object> getAdMapVO(int curCoin, String extraId, String adsource, String carrierType, String tid) {
HashMap<String, Object> vo = new HashMap<>();
vo.put("adsource", adsource);
vo.put("carrierType", carrierType);
vo.put("adtype", Constant.ADTYPE_VEDIO);
vo.put("tid", tid);
vo.put("adsource", Constant.AD_SOURCE_CSJ);
switch (carrierType) {
case Constant.CARRIER_DAILY_DOWNLOAD:// 每日任务-视频
vo.put("coin", curCoin);
break;
case Constant.CARRIER_DAILY_VIDEO:// 观看视频-视频
vo.put("coin", curCoin);
break;
case Constant.CARRIER_HOMEWATER_BUBBLE:// 首页喝水汽泡
vo.put("page", Constant.PAGE_ONE);
vo.put("waterCoin", curCoin);
break;
case Constant.CARRIER_ONLINE_INCOME_DOUBLE:// 在线收益翻倍
vo.put("page", Constant.PAGE_ONE);
if (curCoin != -1) {
vo.put("online_income", curCoin);
}
break;
case Constant.CARRIER_OFFLINE_DOUBLE:// 离线收益翻倍
vo.put("page", Constant.PAGE_ONE);
if (curCoin != -1) {
vo.put("offline_income", curCoin);
}
case Constant.CARRIER_SIGNIN_HOMEPAGE_CARD:// 签到翻倍
vo.put("page", Constant.PAGE_TWO);
vo.put("block", Constant.BLOCK_ONE);
vo.put("order", Constant.ORDER_ONE);
break;
case Constant.CARRIER_DRINK:// 喝水正常
case Constant.CARRIER_DRINK_PATCH:// 喝水补卡
vo.put("page", Constant.PAGE_ONE);
vo.put("block", Constant.BLOCK_FOUR);
vo.put("order", Constant.ORDER_ONE);
vo.put("critId", extraId);
break;
case Constant.CARRIER_VERSUS_DRINKTEA://喝饮料
vo.put("page", Constant.PAGE_TWO);
vo.put("block", Constant.BLOCK_ONE);
vo.put("order", Constant.ORDER_THREE);
vo.put("critId", extraId);
break;
case Constant.CARRIER_DAILY_TURN:// 首页大转盘
vo.put("page", Constant.PAGE_ONE);
vo.put("block", Constant.BLOCK_THREE);
vo.put("order", Constant.ORDER_THREE);
vo.put("turntableKey", extraId);
break;
case Constant.CARRIER_CHALLENGE_TURN:// 挑战大转盘
vo.put("page", Constant.PAGE_TWO);
vo.put("block", Constant.BLOCK_ONE);
vo.put("order", Constant.ORDER_FOUR);
vo.put("turntableKey", extraId);
break;
case Constant.CARRIER_CHALLENGE_CARD:// 挑战刮刮乐
vo.put("page", Constant.PAGE_TWO);
vo.put("block", Constant.BLOCK_ONE);
vo.put("order", Constant.ORDER_FIVE);
vo.put("turntableKey", extraId);
break;
case Constant.CARRIER_REDENVELOPE_DOUBLE:// 红包翻倍奖励
case Constant.CARRIER_REDENVELOPE:// 红包奖励
vo.put("page", Constant.PAGE_ONE);
vo.put("block", Constant.BLOCK_ONE);
vo.put("order", Constant.ORDER_ONE);
vo.put("numKey", extraId);
break;
default:// 在线收益翻倍
vo.put("page", Constant.PAGE_ONE);
if (curCoin != -1) {
vo.put("online_income", curCoin);
}
break;
}
return vo;
}
}
highgold/app/src/main/java/com/mints/highgold/ad/VedioAdingManager.java
View file @ 22cbac9b
......@@ -208,7 +208,7 @@ public class VedioAdingManager {
if (lyVedioAdManager == null) {
if (activity == null) {
if (vedioAdingListener != null) {
vedioAdingListener.vedioAdingListenerError(bean.getCarrierType());
vedioAdingListener.vedioAdingListenerError(Constant.LY_VEDIO_AD);
}
return;
}
......@@ -240,7 +240,7 @@ public class VedioAdingManager {
if (ylhVedioAdManager == null) {
if (activity == null) {
if (vedioAdingListener != null) {
vedioAdingListener.vedioAdingListenerError(bean.getCarrierType());
vedioAdingListener.vedioAdingListenerError(Constant.YLH_VEDIO_AD);
}
return;
}
......@@ -276,7 +276,7 @@ public class VedioAdingManager {
if (csjFullVedioAdManager == null) {
if (activity == null) {
if (vedioAdingListener != null) {
vedioAdingListener.vedioAdingListenerError(bean.getCarrierType());
vedioAdingListener.vedioAdingListenerError(Constant.CSJ_FULL_AD);
}
return;
}
......@@ -312,7 +312,7 @@ public class VedioAdingManager {
if (csjVedioAdManager == null) {
if (activity == null) {
if (vedioAdingListener != null) {
vedioAdingListener.vedioAdingListenerError(bean.getCarrierType());
vedioAdingListener.vedioAdingListenerError(Constant.CSJ_VEDIO_AD);
}
return;
}
......
highgold/app/src/main/java/com/mints/highgold/ad/inscreen/InsertScreenAdManager.java 0 → 100644
View file @ 22cbac9b
package com.mints.highgold.ad.inscreen;
import android.app.Activity;
import android.view.View;
import com.bytedance.sdk.openadsdk.AdSlot;
import com.bytedance.sdk.openadsdk.TTAdNative;
import com.bytedance.sdk.openadsdk.TTNativeExpressAd;
import com.mints.highgold.common.AppConfig;
import com.mints.highgold.common.Constant;
import com.mints.highgold.manager.TTAdManagerHolder;
import com.mints.highgold.manager.YlhAdManager;
import com.qq.e.ads.interstitial2.UnifiedInterstitialAD;
import com.qq.e.ads.interstitial2.UnifiedInterstitialADListener;
import com.qq.e.comm.util.AdError;
import java.util.List;
/**
* 插屏广告
*/
public class InsertScreenAdManager {
private Activity activity;
private TTAdNative mTTAdNative;
private TTNativeExpressAd mTTAd;
private UnifiedInterstitialAD iad;
public InsertScreenAdManager(Activity activity) {
this.activity = activity;
}
public void showInsertScreenAd(String carrierType) {
// initInsertScreenAd(carrierType);
}
public void ondestory() {
if (mTTAd != null) {
mTTAd.destroy();
}
if (iad != null) {
iad.destroy();
}
}
/**
* 插屏广告显示类型 true-穿山甲 false-优量汇
*
* @param carrierType
*/
private void initInsertScreenAd(String carrierType) {
if (AppConfig.isInteractionAdTypeFlag) {
//显示穿山甲
loadCsjInteractionAd(carrierType);
} else {
//优量汇
loadYlhInteractionAd(carrierType);
}
}
/**
* 加载穿山甲插屏广告
*/
public void loadCsjInteractionAd(String carrierType) {
if (activity == null) return;
String codeId = TTAdManagerHolder.TT_AD_INSERT_LOADING_ID_SMALLVEDIO;
switch (carrierType) {
case Constant.CARRIER_DRAWCASH:// 提现
codeId = TTAdManagerHolder.TT_AD_INSERT_LOADING_ID_DRAWCASH;
break;
case Constant.CARRIER_YILANVEIDO_REDENVELOPE:// 小视频
codeId = TTAdManagerHolder.TT_AD_INSERT_LOADING_ID_SMALLVEDIO;
break;
case Constant.CARRIER_REDENVELOPE:// 抢红包
codeId = TTAdManagerHolder.TT_AD_INSERT_LOADING_ID_REDBOX;
break;
case Constant.CARRIER_FRIENDS:// 邀请好友
codeId = TTAdManagerHolder.TT_AD_INSERT_LOADING_ID_FRIENDS;
break;
case Constant.CARRIER_GAME:// 游戏赚
codeId = TTAdManagerHolder.TT_AD_INSERT_LOADING_ID_GAME;
break;
}
//step4:创建广告请求参数AdSlot,具体参数含义参考文档
AdSlot adSlot = new AdSlot.Builder()
.setCodeId(codeId) //广告位id
.setSupportDeepLink(true)
.setAdCount(1) //请求广告数量为1到3条
.setExpressViewAcceptedSize(300, 0) //期望模板广告view的size,单位dp
.setImageAcceptedSize(600, 600)
.build();
//step5:请求广告，对请求回调的广告作渲染处理
if (mTTAdNative == null) {
mTTAdNative = TTAdManagerHolder.get().createAdNative(activity);
}
mTTAdNative.loadInteractionExpressAd(adSlot, new TTAdNative.NativeExpressAdListener() {
@Override
public void onError(int code, String message) {
//当前播放完成换下一个类型 true-穿山甲
// AppConfig.isInteractionAdTypeFlag = false;
}
@Override
public void onNativeExpressAdLoad(List<TTNativeExpressAd> ads) {
if (ads == null || ads.size() == 0) {
return;
}
mTTAd = ads.get(0);
bindAdListener(mTTAd);
mTTAd.render();
}
});
}
private void bindAdListener(TTNativeExpressAd ad) {
if (activity == null) return;
ad.setExpressInteractionListener(new TTNativeExpressAd.AdInteractionListener() {
@Override
public void onAdDismiss() {
}
@Override
public void onAdClicked(View view, int type) {
}
@Override
public void onAdShow(View view, int type) {
//当前播放完成换下一个类型 true-穿山甲
AppConfig.isInteractionAdTypeFlag = false;
}
@Override
public void onRenderFail(View view, String msg, int code) {
}
@Override
public void onRenderSuccess(View view, float width, float height) {
if (activity != null) {
//返回view的宽高 单位 dp
mTTAd.showInteractionExpressAd(activity);
}
}
});
}
/**
* 加载优量汇插屏广告
*/
public void loadYlhInteractionAd(String carrierType) {
iad = getIAD(carrierType);
iad.loadAD();
}
private UnifiedInterstitialAD getIAD(String carrierType) {
if (activity != null) {
String posId = YlhAdManager.YLH_AD_INTERSTITIALAD_SMALLVEDIO;
switch (carrierType) {
case Constant.CARRIER_DRAWCASH:// 提现
posId = YlhAdManager.YLH_AD_INTERSTITIALAD_DRAWCAH;
break;
case Constant.CARRIER_YILANVEIDO_REDENVELOPE:// 小视频
posId = YlhAdManager.YLH_AD_INTERSTITIALAD_SMALLVEDIO;
break;
case Constant.CARRIER_REDENVELOPE:// 抢红包
posId = YlhAdManager.YLH_AD_INTERSTITIALAD_REDBOX;
break;
case Constant.CARRIER_FRIENDS:// 邀请好友
posId = YlhAdManager.YLH_AD_INTERSTITIALAD_FRIENDS;
break;
case Constant.CARRIER_GAME:// 游戏赚
posId = YlhAdManager.YLH_AD_INTERSTITIALAD_GAME;
break;
}
if (this.iad != null) {
iad.close();
iad.destroy();
iad = null;
}
iad = new UnifiedInterstitialAD(activity, YlhAdManager.YLH_AD_VEDIO_APPID, posId, new UnifiedInterstitialADListener() {
@Override
public void onADReceive() {
//当前播放完成换下一个类型 false-优量汇
AppConfig.isInteractionAdTypeFlag = true;
showAD();
}
@Override
public void onVideoCached() {
}
@Override
public void onNoAD(AdError adError) {
// error
//当前播放完成换下一个类型 false-优量汇
// AppConfig.isInteractionAdTypeFlag = true;
}
@Override
public void onADOpened() {
}
@Override
public void onADExposure() {
}
@Override
public void onADClicked() {
}
@Override
public void onADLeftApplication() {
}
@Override
public void onADClosed() {
}
});
}
return iad;
}
private void showAD() {
if (iad != null) {
iad.show();
}
}
}
highgold/app/src/main/java/com/mints/highgold/common/AppConfig.java
View file @ 22cbac9b
......@@ -74,4 +74,9 @@ public class AppConfig {
* 一览视频 时间间隔 单位-秒
*/
public static int yilanVedioTime = 30;
/**
* 插屏广告显示类型 true-穿山甲 false-优量汇
*/
public static boolean isInteractionAdTypeFlag = true;
}
highgold/app/src/main/java/com/mints/highgold/common/Constant.java
View file @ 22cbac9b
......@@ -38,6 +38,8 @@ public interface Constant {
// 地理位置信息
String LOCATION_DATA = "location_data";
// 原生地理位置信息
String LOCATION_NATIVE_DATA = "location_native_data";
// 显示第一个fragment
String SHOW_FIRST_FRAGMENT = "show_first_fragment";
......@@ -140,14 +142,17 @@ public interface Constant {
String NORMAL_WATER_COIN = "normal_water_coin";
String PATCH_WATER_COIN = "patch_water_coin";
// 广告类型
String VEDIO_AD_TYPE = "VEDIO_AD_TYPE";
// 视频广告类型
String LY_VEDIO_AD = "LY_VEDIO_AD";
String CSJ_FULL_AD = "CSJ_FULL_AD";
String CSJ_VEDIO_AD = "CSJ_VEDIO_AD";
String YLH_VEDIO_AD= "YLH_VEDIO_AD";
String YILAN_VEDIO_AD= "YILAN_VEDIO_AD";
// 插屏广告类型
String CSJ_INTERACTION_AD = "CSJ_INTERACTION_AD";
String YLH_INTERACTION_AD = "YLH_INTERACTION_AD";
// 载体
String CARRIER_DRINK = "DRINK";//喝水
String CARRIER_DRINK_PATCH = "DRINK_PATCH";//喝水补卡
......@@ -196,6 +201,7 @@ public interface Constant {
String CARRIER_CHALLENGE_HEALTH_STAND = "CHALLENGE_HEALTH_STAND";//小健康-站一站
String CARRIER_CHALLENGE_HEALTH_FRUIT = "CHALLENGE_HEALTH_FRUIT";//小健康-吃水果
String CARRIER_CHALLENGE_HEALTH_EYE = "CHALLENGE_HEALTH_EYE";//小健康-放松眼
String CARRIER_FRIENDS = "CARRIER_FRIENDS";//邀请好友
String CARRIER_NEW_USER = "CARRIER_NEW_USER";//新用户5000红包
......
highgold/app/src/main/java/com/mints/highgold/manager/TTAdManagerHolder.java
View file @ 22cbac9b
......@@ -34,7 +34,9 @@ public class TTAdManagerHolder {
/*banner*/
public static final String TT_AD_BANNER_ID_DRAWCASH = "945131766";//提现
public static final String TT_AD_BANNER_ID_MY = "945131765";//我的
public static final String TT_AD_BANNER_ID_MAIN = "945147447";//首页
public static final String TT_AD_BANNER_ID_DRAWCASH_RECORD = "945131768";//提现明细
public static final String TT_AD_BANNER_ID_REDBOX = "945145182";//抢红包
public static final String TT_AD_BANNER_ID_TRYGOLD_RECORD = "";//金币明细
public static final String TT_AD_BANNER_ID_INCOME_RECORD = "";//收入明细
public static final String TT_AD_BANNER_ID_DRINK = "";//喝水打卡 *弃用 改用信息流
......@@ -57,6 +59,11 @@ public class TTAdManagerHolder {
/*插屏广告*/
public static final String TT_AD_INSERT_ID_LIEBAO = "945131770";//猎豹插屏场景
public static final String TT_AD_INSERT_LOADING_ID_LIEBAO = "945131772";//猎豹游戏加载时
public static final String TT_AD_INSERT_LOADING_ID_DRAWCASH = "945143935";//提现
public static final String TT_AD_INSERT_LOADING_ID_SMALLVEDIO = "945143977";//小视频
public static final String TT_AD_INSERT_LOADING_ID_FRIENDS = "945145181";//邀请好友
public static final String TT_AD_INSERT_LOADING_ID_REDBOX = "945145179";//抢红包
public static final String TT_AD_INSERT_LOADING_ID_GAME = "945145177";//游戏赚
private static boolean sInit;
......
highgold/app/src/main/java/com/mints/highgold/manager/YlhAdManager.java
View file @ 22cbac9b
......@@ -15,4 +15,11 @@ public class YlhAdManager {
public static final String YLH_AD_VEDIO_MAIN_PAN_POSTID = "5071107856089058";//首页大转盘
public static final String YLH_AD_VEDIO_VERSUS_PAN_POSTID = "2011506866980034";//挑战大转盘
public static final String YLH_AD_VEDIO_VERSUS_ERASE_POSTID = "6031208866083065";//挑战刮刮乐
/* 插屏 */
public static final String YLH_AD_INTERSTITIALAD_DRAWCAH = "4021600917420124";//提现
public static final String YLH_AD_INTERSTITIALAD_SMALLVEDIO = "7041309928150366";//小视频
public static final String YLH_AD_INTERSTITIALAD_REDBOX = "4081004968252005";//抢红包
public static final String YLH_AD_INTERSTITIALAD_FRIENDS = "4051600998851098";//邀请好友
public static final String YLH_AD_INTERSTITIALAD_GAME = "3021005957922121";//游戏赚
}
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/DrawcashPresenter.java
View file @ 22cbac9b
......@@ -230,7 +230,7 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
vo.put("appPkgList", deviceInfo.getPkgInfo(context));
vo.put("oaid", DevicesUtil.getOaid());
vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
vo.put("tempuuid", DevicesUtil.getUniquePsuedoID());
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
......
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/GamePresenter.java
View file @ 22cbac9b
......@@ -110,7 +110,7 @@ public class GamePresenter extends BasePresenter<GameView> {
HashMap<String, Object> vo = new HashMap<>();
String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
vo.put("device", uuid);
vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
// vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
AppHttpManager.getInstance(loanApplication)
.call(loanService.visitorlogin(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/LoanPresenter.java
View file @ 22cbac9b
......@@ -460,7 +460,7 @@ public class LoanPresenter extends BasePresenter<LoanView> {
HashMap<String, Object> vo = new HashMap<>();
uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
vo.put("device", uuid);
vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
// vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
AppHttpManager.getInstance(loanApplication)
.call(loanService.visitorlogin(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......@@ -554,7 +554,7 @@ public class LoanPresenter extends BasePresenter<LoanView> {
vo.put("appversion", deviceInfo.getVersionName());
vo.put("appPkgList", deviceInfo.getPkgInfo(context));
vo.put("oaid", DevicesUtil.getOaid());
vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
vo.put("tempuuid", DevicesUtil.getUniquePsuedoID());
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
new BaseSubscriber<BaseResponse<Object>>() {
......@@ -641,7 +641,7 @@ public class LoanPresenter extends BasePresenter<LoanView> {
vo.put("appversion", deviceInfo.getVersionName());
vo.put("appPkgList", deviceInfo.getPkgInfo(context));
vo.put("oaid", DevicesUtil.getOaid());
vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
vo.put("tempuuid", DevicesUtil.getUniquePsuedoID());
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/LoginPresenter.java
View file @ 22cbac9b
......@@ -322,7 +322,7 @@ public class LoginPresenter extends BasePresenter<LoginView> {
vo.put("appversion", deviceInfo.getVersionName());
vo.put("appPkgList", deviceInfo.getPkgInfo(context));
vo.put("oaid", DevicesUtil.getOaid());
vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
vo.put("tempuuid", DevicesUtil.getUniquePsuedoID());
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/MyPresenter.java
View file @ 22cbac9b
......@@ -178,7 +178,7 @@ public class MyPresenter extends BasePresenter<MyView> {
HashMap<String, Object> vo = new HashMap<>();
String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
vo.put("device", uuid);
vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID() + System.currentTimeMillis()));
// vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID() + System.currentTimeMillis()));
AppHttpManager.getInstance(loanApplication)
.call(loanService.visitorlogin(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/VersusPresenter.java
View file @ 22cbac9b
......@@ -378,7 +378,7 @@ public class VersusPresenter extends BasePresenter<VersusView> {
HashMap<String, Object> vo = new HashMap<>();
String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
vo.put("device", uuid);
vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID() + System.currentTimeMillis()));
// vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID() + System.currentTimeMillis()));
AppHttpManager.getInstance(loanApplication)
.call(loanService.visitorlogin(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......
highgold/app/src/main/java/com/mints/highgold/mvp/presenters/WxLoginPresenter.java
View file @ 22cbac9b
......@@ -156,7 +156,7 @@ public class WxLoginPresenter extends BasePresenter<WxLoginView> {
vo.put("appversion", deviceInfo.getVersionName());
vo.put("appPkgList", deviceInfo.getPkgInfo(context));
vo.put("oaid", DevicesUtil.getOaid());
vo.put("tempuuid", DevicesUtil.getPesudoUniqueID());
vo.put("tempuuid", DevicesUtil.getUniquePsuedoID());
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
......
highgold/app/src/main/java/com/mints/highgold/net/GsonConverterFactory.java
View file @ 22cbac9b
......@@ -160,7 +160,7 @@ public class GsonConverterFactory extends Converter.Factory {
HashMap<String, Object> vo = new HashMap<>();
String uuid = new DeviceUuidFactory(loanApplication).getDeviceUuid().toString();
vo.put("device", uuid);
vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
// vo.put("seq", MD5.GetMD5Code(DevicesUtil.getPesudoUniqueID()+System.currentTimeMillis()));
loanApplication.getLoanService().visitorlogin(vo)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(loanApplication.defaultSubscribeScheduler())
......
highgold/app/src/main/java/com/mints/highgold/net/LoanService.java
View file @ 22cbac9b
......@@ -476,32 +476,32 @@ public interface LoanService {
builder.interceptors().add(okHttpInterceptor);
Retrofit retrofit;
// if (BuildConfig.DEBUG) {
// SPUtil spUtil = SPUtil.getInstance(context);
// if (TextUtils.isEmpty(spUtil.getString(Constant.LOCAL_IP))) {
// spUtil.putString(Constant.LOCAL_IP, "http://39.106.5.102:9082/api-p1/");
// }
// retrofit = new Retrofit.Builder()
// .client(builder.build())
// .baseUrl(spUtil.getString(Constant.LOCAL_IP))
// .addConverterFactory(GsonConverterFactory.create())
// .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
// .build();
// } else {
// retrofit = new Retrofit.Builder()
// .client(builder.build())
// .baseUrl(BuildConfig.MainIp)
// .addConverterFactory(GsonConverterFactory.create())
// .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
// .build();
// }
if (BuildConfig.DEBUG) {
SPUtil spUtil = SPUtil.getInstance(context);
if (TextUtils.isEmpty(spUtil.getString(Constant.LOCAL_IP))) {
spUtil.putString(Constant.LOCAL_IP, "http://39.106.5.102:9082/api-p1/");
}
retrofit = new Retrofit.Builder()
.client(builder.build())
.baseUrl(spUtil.getString(Constant.LOCAL_IP))
.addConverterFactory(GsonConverterFactory.create())
.addCallAdapterFactory(RxJavaCallAdapterFactory.create())
.build();
} else {
retrofit = new Retrofit.Builder()
.client(builder.build())
.baseUrl(BuildConfig.MainIp)
.addConverterFactory(GsonConverterFactory.create())
.addCallAdapterFactory(RxJavaCallAdapterFactory.create())
.build();
}
// retrofit = new Retrofit.Builder()
// .client(builder.build())
// .baseUrl(BuildConfig.MainIp)
// .addConverterFactory(GsonConverterFactory.create())
// .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
// .build();
return retrofit.create(LoanService.class);
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/DrawcashActivity.java
View file @ 22cbac9b
package com.mints.highgold.ui.activitys;
import android.Manifest;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
......@@ -11,6 +12,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.mints.highgold.R;
import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
import com.mints.highgold.common.Constant;
import com.mints.highgold.login.LoginApi;
import com.mints.highgold.login.OnLoginListener;
......@@ -25,6 +27,7 @@ import com.mints.highgold.ui.activitys.base.BaseActivity;
import com.mints.highgold.utils.SpanUtils;
import com.mints.library.utils.json.JsonUtil;
import com.mints.library.utils.nodoubleclick.AntiShake;
import com.tbruyelle.rxpermissions.RxPermissions;
import java.math.BigDecimal;
import java.util.HashMap;
......@@ -115,6 +118,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
private double drawcash;
private UserManager userManager;
private InsertScreenAdManager insertScreenAd;
@Override
protected int getContentViewLayoutID() {
......@@ -129,12 +133,14 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
tvActivityTitle.setText("提现");
userManager = UserManager.getInstance();
insertScreenAd = new InsertScreenAdManager(DrawcashActivity.this);
// 加载banner广告
//应用商店上线隐藏广告
if (userManager.getAdShowFlag()) {
initTTBanner();
}
}
......@@ -161,6 +167,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
}
System.out.println("mcg __ drawcash onresume");
insertScreenAd.showInsertScreenAd(Constant.CARRIER_DRAWCASH);
drawcashPresenter.getUserTaskMsg();
}
......@@ -179,6 +186,10 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
loginApi = null;
}
if (insertScreenAd != null) {
insertScreenAd.ondestory();
}
drawcashPresenter.detachView();
}
......@@ -252,6 +263,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
tvDrawcashAboutcash.setText("约" + cashStr + "元");
tvDrawcashHint.setText("* 如您或好友通过刷机等违规操作获取非法收益，平台将视情况扣除违规所得或冻结账号。" +
"\n* 因广告收益价值变化，会同步调整金币发放数量，但不影响提现功能，达标即可随时提现，请放心使用。" +
"\n* 最终解释权归本公司所有。");
}
......@@ -469,7 +481,16 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
}
}
new RxPermissions(DrawcashActivity.this)
.request(Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION)
.subscribe(granted -> {
if (granted) {
drawcashPresenter.saveTerminalInfo(getContext(), curCash, paymentType);
} else {
showMissingPermissionDialog("设备,地理位置");
}
});
break;
}
}
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/ExchangeActivity.java
View file @ 22cbac9b
......@@ -57,6 +57,8 @@ public class ExchangeActivity extends BaseActivity {
etExchangeIp.setText(ipStr);
etExchangeCode.setText(portStr);
}else{
tvExchangeIpshow.setText("*** 该包不支持更换IP");
}
}
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/FriendsNewActivity.java
View file @ 22cbac9b
......@@ -12,6 +12,8 @@ import com.github.lzyzsd.jsbridge.CallBackFunction;
import com.github.lzyzsd.jsbridge.DefaultHandler;
import com.mints.highgold.BuildConfig;
import com.mints.highgold.R;
import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
import com.mints.highgold.common.Constant;
import com.mints.highgold.manager.UserManager;
import com.mints.highgold.ui.activitys.base.BaseActivity;
import com.mints.highgold.utils.ImageUtil;
......@@ -52,6 +54,8 @@ public class FriendsNewActivity extends BaseActivity implements PlatformActionLi
private Drawable drawable;
private String shareUrl;
private InsertScreenAdManager insertScreenAd;
@Override
protected int getContentViewLayoutID() {
return R.layout.activity_friends_new;
......@@ -70,6 +74,11 @@ public class FriendsNewActivity extends BaseActivity implements PlatformActionLi
shareUrl = BuildConfig.MainIp + "login.html?ruid=" + UserManager.getInstance().getUserID() + "&channel=android_share";
getFriendsUrl();
insertScreenAd = new InsertScreenAdManager(FriendsNewActivity.this);
if (UserManager.getInstance().getAdShowFlag()) {
insertScreenAd.showInsertScreenAd(Constant.CARRIER_FRIENDS);
}
}
@Override
......@@ -89,6 +98,10 @@ public class FriendsNewActivity extends BaseActivity implements PlatformActionLi
blFriendsnewWebview.destroy();
blFriendsnewWebview = null;
}
if (insertScreenAd != null) {
insertScreenAd.ondestory();
}
}
@OnClick({R.id.tv_activity_back, R.id.share_weixin, R.id.share_friends, R.id.share_qq})
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/RedboxActivity.java
View file @ 22cbac9b
......@@ -3,12 +3,16 @@ package com.mints.highgold.ui.activitys;
import android.content.res.Resources;
import android.os.Bundle;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.mints.highgold.R;
import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
import com.mints.highgold.common.Constant;
import com.mints.highgold.mvp.model.EventMessage;
import com.mints.highgold.manager.TTAdManagerHolder;
import com.mints.highgold.manager.TTBannerManager;
import com.mints.highgold.manager.UserManager;
import com.mints.highgold.mvp.model.RedBoxBean;
import com.mints.highgold.mvp.model.RedBoxListBean;
import com.mints.highgold.mvp.presenters.RedboxPresenter;
......@@ -16,7 +20,6 @@ import com.mints.highgold.mvp.views.RedboxView;
import com.mints.highgold.ui.activitys.base.BaseActivity;
import com.mints.highgold.ui.widgets.countdowntimer.CountDownTimerSupport;
import com.mints.highgold.ui.widgets.countdowntimer.OnCountDownTimerListener;
import com.mints.highgold.utils.RxBus;
import com.mints.highgold.utils.TimeRender;
import com.mints.library.net.netstatus.NetUtils;
import com.mints.library.utils.nodoubleclick.AntiShake;
......@@ -24,11 +27,9 @@ import com.mints.library.utils.nodoubleclick.AntiShake;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
import static com.mints.highgold.common.Constant.SHOW_THREE_FRAGMENT;
import static com.mints.highgold.common.Constant.SHOW_TWO_FRAGMENT;
/**
* 描述：红包界面
* 作者：孟崔广
......@@ -77,6 +78,8 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
RelativeLayout rlRedboxNine;
@Bind(R.id.rl_redbox_ten)
RelativeLayout rlRedboxTen;
@Bind(R.id.fl_redbox_ttbanner)
FrameLayout flRedboxTtbanner;
private RedboxPresenter redboxPresenter;
......@@ -94,6 +97,10 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
long countDownInterval = 1000;//间隔时长
private List<RedBoxListBean.DataBean> redBoxList = null;//红包信息
private InsertScreenAdManager insertScreenAd;
private TTBannerManager ttUtil;
@Override
protected int getContentViewLayoutID() {
return R.layout.activity_redbox;
......@@ -110,6 +117,19 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
// 获取按键栏
// Utils.hideBottomUIMenu(this);
insertScreenAd = new InsertScreenAdManager(RedboxActivity.this);
if (UserManager.getInstance().getAdShowFlag()) {
initTTBanner();
}
}
/**
* 加载banner广告
*/
private void initTTBanner() {
ttUtil = new TTBannerManager();
ttUtil.initTTAd(getContext(), true);
ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_REDBOX, flRedboxTtbanner, 370, 80);
}
@Override
......@@ -140,6 +160,8 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
protected void onResume() {
super.onResume();
insertScreenAd.showInsertScreenAd(Constant.CARRIER_REDENVELOPE);
redboxPresenter.getAllRedEnvelopeMsg();
}
......@@ -154,6 +176,10 @@ public class RedboxActivity extends BaseActivity implements RedboxView {
public void onDestroy() {
super.onDestroy();
if (insertScreenAd != null) {
insertScreenAd.ondestory();
}
onDestoryTimer();
redboxPresenter.detachView();
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/GameFragment.java
View file @ 22cbac9b
......@@ -17,6 +17,7 @@ import com.cmcm.cmgame.IGameStateCallback;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mints.highgold.R;
import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
import com.mints.highgold.common.AppConfig;
import com.mints.highgold.common.Constant;
import com.mints.highgold.manager.UserManager;
......@@ -68,6 +69,10 @@ public class GameFragment extends BaseFragment
private String gameID;
private UserManager userManager;
private InsertScreenAdManager insertScreenAd;
private boolean isExitGameFlag = false;//是否从游戏中退出
@Override
protected int getContentViewLayoutID() {
return R.layout.fragment_main_game;
......@@ -78,6 +83,8 @@ public class GameFragment extends BaseFragment
gamePresenter = new GamePresenter();
gamePresenter.attachView(this);
insertScreenAd = new InsertScreenAdManager(getActivity());
tvGameHint.setText(new SpanUtils()
.append("试玩小游戏").setForegroundColor(getResources().getColor(R.color.black_text))
.append("15秒以上可获取金币").setForegroundColor(getResources().getColor(R.color.red))
......@@ -121,6 +128,16 @@ public class GameFragment extends BaseFragment
} else {
gamePresenter.userLogin();
}
if (AppConfig.fragmentTTbannerFlag) {
insertScreenAd.showInsertScreenAd(Constant.CARRIER_GAME);
AppConfig.fragmentTTbannerFlag = false;
}
if (isExitGameFlag) {
isExitGameFlag = false;
insertScreenAd.showInsertScreenAd(Constant.CARRIER_GAME);
}
}
}
......@@ -128,6 +145,10 @@ public class GameFragment extends BaseFragment
public void onDestroy() {
super.onDestroy();
if (insertScreenAd != null) {
insertScreenAd.ondestory();
}
CmGameSdk.removeGameClickCallback();
CmGameSdk.setMoveView(null);
CmGameSdk.removeGamePlayTimeCallback();
......@@ -265,6 +286,8 @@ public class GameFragment extends BaseFragment
// if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_GAME) {
String eventTypeTime = Constant.EVENT_TYPE_TIME;
isExitGameFlag = true;
if (playTimeInSeconds < 15) {
Bundle bundle = new Bundle();
bundle.putInt(Constant.MAIN_CUR_COIN, 0);
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java
View file @ 22cbac9b
......@@ -69,8 +69,6 @@ import com.mints.highgold.ui.widgets.WaterView;
import com.mints.highgold.ui.widgets.countdowntimer.CountDownTimerSupport;
import com.mints.highgold.ui.widgets.countdowntimer.OnCountDownTimerListener;
import com.mints.highgold.ui.widgets.refresh.CustomRefreshLayout;
import com.mints.highgold.utils.DeviceUuidFactory;
import com.mints.highgold.utils.DevicesUtil;
import com.mints.highgold.utils.MD5;
import com.mints.highgold.utils.SPUtil;
import com.mints.highgold.utils.SpanUtils;
......@@ -230,13 +228,17 @@ public class MainFragment extends BaseFragment
super.onResume();
userID = userManager.getUserID();
// ttBanner切换时调用
// if (ttUtil != null && flMainTtbanner != null) {
// ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_NEWMAIN, flMainTtbanner, 390, 170);
// }
// 点击当前标签时调用
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_LOAN) {
// ttBanner切换时调用
if (userManager.getAdShowFlag()) {
if (ttUtil != null && flMainTtbanner != null) {
flMainTtbanner.setVisibility(View.VISIBLE);
ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MAIN, flMainTtbanner, 370, 40);
}
} else {
flMainTtbanner.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(userID)) {
loanPresenter.getUserTaskMsg(false);
......@@ -1354,7 +1356,7 @@ public class MainFragment extends BaseFragment
});
// 加载banner广告
// initTTBanner();
initTTBanner();
try {
ShumeiManager.getInstance().initShumei();
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/MyFragment.java
View file @ 22cbac9b
package com.mints.highgold.ui.fragment;
import android.Manifest;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
......@@ -13,7 +12,6 @@ import android.widget.GridView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.component.dly.xzzq_ywsdk.YwSDK_WebActivity;
import com.mints.highgold.BuildConfig;
import com.mints.highgold.R;
import com.mints.highgold.common.AppConfig;
......@@ -50,7 +48,6 @@ import com.mints.library.utils.ConstantUtil;
import com.mints.library.utils.GlideUtils;
import com.mints.library.utils.nodoubleclick.AntiShake;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.tbruyelle.rxpermissions.RxPermissions;
import java.math.BigDecimal;
import java.util.ArrayList;
......@@ -146,17 +143,16 @@ public class MyFragment extends BaseFragment
@Override
public void onResume() {
super.onResume();
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_MY) {
//应用商店上线隐藏广告
if (userManager.getAdShowFlag()) {
if (ttUtil != null && flMyTtbanner != null) {
ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MY, flMyTtbanner, 370, 80);
}
} else {
flMyTtbanner.setVisibility(View.GONE);
}
// if (userManager.getAdShowFlag()) {
// if (ttUtil != null && flMyTtbanner != null) {
// ttUtil.getBannerInit(getContext(), TTAdManagerHolder.TT_AD_BANNER_ID_MY, flMyTtbanner, 370, 80);
// }
// } else {
// flMyTtbanner.setVisibility(View.GONE);
// }
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_MY) {
if (!TextUtils.isEmpty(userManager.getUserID())) {
myPresenter.getUserTaskMsg(false);
} else {
......@@ -185,8 +181,8 @@ public class MyFragment extends BaseFragment
}
@OnClick({R.id.ll_my_gold, R.id.ll_my_cash, R.id.iv_my_set,
R.id.rl_my_feedback, R.id.rl_my_phone, R.id.rl_my_aboutas, R.id.ll_my_login,
R.id.tv_my_invitecode, R.id.tv_my_invitecode_copy})
R.id.rl_my_feedback, R.id.rl_my_phone, R.id.rl_my_aboutas,
R.id.ll_my_login, R.id.tv_my_invitecode, R.id.tv_my_invitecode_copy})
public void onClick(View view) {
if (AntiShake.check(view.getId())) return;
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/YilanVedioFragment.java
View file @ 22cbac9b
......@@ -4,6 +4,7 @@ import android.support.v4.app.FragmentTransaction;
import android.text.TextUtils;
import com.mints.highgold.R;
import com.mints.highgold.ad.inscreen.InsertScreenAdManager;
import com.mints.highgold.common.AppConfig;
import com.mints.highgold.mvp.presenters.YilanVedioPresenter;
import com.mints.highgold.mvp.views.YilanVedioView;
......@@ -41,6 +42,7 @@ public class YilanVedioFragment extends BaseFragment
private String curAdVedioType = com.mints.highgold.common.Constant.YILAN_VEDIO_AD;// 默认yilan
private boolean isClickStop = false;// 是否点击一览视频暂停
private boolean isFirstLoadVedio = true;// 是否第一次加载成功视频
private InsertScreenAdManager insertScreenAd;
@Override
protected int getContentViewLayoutID() {
......@@ -53,6 +55,8 @@ public class YilanVedioFragment extends BaseFragment
yilanVedioPresenter.attachView(this);
showLittle();
insertScreenAd = new InsertScreenAdManager(getActivity());
}
@Override
......@@ -83,9 +87,13 @@ public class YilanVedioFragment extends BaseFragment
if (cdvvYilanTime != null) {
cdvvYilanTime.resume();
}
if (AppConfig.fragmentTTbannerFlag) {
insertScreenAd.showInsertScreenAd(com.mints.highgold.common.Constant.CARRIER_YILANVEIDO_REDENVELOPE);
AppConfig.fragmentTTbannerFlag = false;
}
// System.out.println("mcg __ onResume");
}
}
@Override
......@@ -98,14 +106,16 @@ public class YilanVedioFragment extends BaseFragment
if (cdvvYilanTime != null) {
cdvvYilanTime.pause();
}
// System.out.println("mcg __ onPause");
}
@Override
public void onDestroy() {
super.onDestroy();
if (insertScreenAd != null) {
insertScreenAd.ondestory();
}
yilanVedioPresenter.detachView();
}
......@@ -322,6 +332,4 @@ public class YilanVedioFragment extends BaseFragment
cdvvYilanTime.setTime(vedioTime);
cdvvYilanTime.start();
}
}
highgold/app/src/main/java/com/mints/highgold/utils/DevicesUtil.java
View file @ 22cbac9b
......@@ -25,7 +25,6 @@ public class DevicesUtil {
return idfa;
}
/**
* Pseudo-Unique ID, 这个在任何Android手机中都有效
* 有一些特殊的情况，一些如平板电脑的设置没有通话功能，或者你不愿加入READ_PHONE_STATE许可。而你仍然想获得唯
......@@ -36,33 +35,9 @@ public class DevicesUtil {
*
* @return PesudoUniqueID
*/
public static String getPesudoUniqueID() {
String m_szDevIDShort = "35" + //we make this look like a valid IMEI
Build.BOARD.length() % 10 +
Build.BRAND.length() % 10 +
Build.CPU_ABI.length() % 10 +
Build.DEVICE.length() % 10 +
Build.DISPLAY.length() % 10 +
Build.HOST.length() % 10 +
Build.ID.length() % 10 +
Build.MANUFACTURER.length() % 10 +
Build.MODEL.length() % 10 +
Build.PRODUCT.length() % 10 +
Build.TAGS.length() % 10 +
Build.TYPE.length() % 10 +
Build.USER.length() % 10; //13 digits
m_szDevIDShort = MD5.GetMD5Code(m_szDevIDShort);
return m_szDevIDShort;
}
/**
* uuid
*
* @return
*/
public static String getUUID() {
public static String getUniquePsuedoID() {
String serial = null;
String m_szDevIDShort = "35" +
Build.BOARD.length() % 10 + Build.BRAND.length() % 10 +
Build.CPU_ABI.length() % 10 + Build.DEVICE.length() % 10 +
......@@ -71,12 +46,9 @@ public class DevicesUtil {
Build.MODEL.length() % 10 + Build.PRODUCT.length() % 10 +
Build.TAGS.length() % 10 + Build.TYPE.length() % 10 +
Build.USER.length() % 10; //13 位
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
serial = android.os.Build.getSerial();
} else {
serial = Build.SERIAL;
}
serial = android.os.Build.class.getField("SERIAL").get(null).toString();
//API>=9 使用serial号
return new UUID(m_szDevIDShort.hashCode(), serial.hashCode()).toString();
} catch (Exception exception) {
......
highgold/app/src/main/res/layout/activity_drawcash.xml
View file @ 22cbac9b
......@@ -381,14 +381,6 @@
android:textColor="@color/tv_payday_arrivalamount"
android:textSize="14sp" />
<FrameLayout
android:id="@+id/fl_drawcash_ttbanner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_margin="20pt" />
</LinearLayout>
......@@ -400,6 +392,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fl_drawcash_ttbanner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
<View
android:layout_width="match_parent"
android:layout_height="1pt"
......
highgold/app/src/main/res/layout/activity_redbox.xml
View file @ 22cbac9b
......@@ -10,6 +10,12 @@
<include layout="@layout/header_activity" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -259,6 +265,11 @@
android:src="@mipmap/bg_redbox_bottom" />
</LinearLayout>
</ScrollView>
</LinearLayout>
<FrameLayout
android:id="@+id/fl_redbox_ttbanner"
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"/>
</LinearLayout>
\ No newline at end of file
highgold/app/src/main/res/layout/fragment_main_first.xml
View file @ 22cbac9b
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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"
......@@ -9,7 +9,8 @@
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/main_main_crl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
app:srlAccentColor="@color/gray"
app:srlPrimaryColor="@color/white">
......@@ -21,7 +22,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdge="none"
android:layout_marginBottom="98pt"
android:overScrollMode="never">
<LinearLayout
......@@ -83,7 +83,7 @@
android:layout_marginTop="530pt"
android:layout_marginRight="70pt"
android:src="@mipmap/ic_main_redgift"
android:visibility="gone"/>
android:visibility="gone" />
<RelativeLayout
android:id="@+id/rl_fragment_main_redbox"
......@@ -191,7 +191,6 @@
android:orientation="vertical"
android:paddingLeft="20pt">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -231,8 +230,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="24pt"
android:layout_marginTop="10pt"
android:layout_marginBottom="20pt"
android:layout_marginRight="24pt"
android:layout_marginBottom="20pt"
android:background="@color/white"
android:divider="@null"
android:dividerHeight="10pt"
......@@ -240,7 +239,6 @@
android:scrollbars="none" />
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_fragment_main_vedio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -253,7 +251,8 @@
android:paddingLeft="36pt"
android:paddingTop="20pt"
android:paddingRight="20pt"
android:paddingBottom="20pt">
android:paddingBottom="20pt"
android:visibility="gone">
<com.shehuan.niv.NiceImageView
android:layout_width="100pt"
......@@ -320,7 +319,6 @@
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_fragment_main_try"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -333,7 +331,8 @@
android:paddingLeft="36pt"
android:paddingTop="20pt"
android:paddingRight="20pt"
android:paddingBottom="20pt">
android:paddingBottom="20pt"
android:visibility="gone">
<com.shehuan.niv.NiceImageView
android:id="@+id/tv_fragment_main_tryplay"
......@@ -404,11 +403,11 @@
android:layout_width="match_parent"
android:layout_height="240pt"
android:layout_marginLeft="28pt"
android:visibility="gone"
android:layout_marginRight="28pt"
android:layout_marginBottom="20pt"
android:scaleType="fitXY"
android:src="@mipmap/ic_main_banner_year" />
android:src="@mipmap/ic_main_banner_year"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_fragment_main_banner"
......@@ -420,21 +419,15 @@
android:scaleType="fitXY"
android:src="@mipmap/bg_main_banner" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
</LinearLayout>
</ScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<FrameLayout
android:id="@+id/fl_main_ttbanner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</RelativeLayout>
android:layout_gravity="center_horizontal"
android:layout_marginBottom="98pt" />
</LinearLayout>
highgold/app/src/main/res/layout/fragment_main_my.xml
View file @ 22cbac9b
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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"
......@@ -9,7 +9,8 @@
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/main_my_crl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
app:srlAccentColor="@color/gray"
app:srlPrimaryColor="@color/white">
......@@ -21,7 +22,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fadingEdge="none"
android:layout_marginBottom="98pt"
android:overScrollMode="never">
<LinearLayout
......@@ -89,14 +89,14 @@
<include layout="@layout/item_fragment_my_set" />
<FrameLayout
android:id="@+id/fl_my_ttbanner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20pt"
android:layout_marginTop="10pt"
android:layout_marginRight="20pt" />
</LinearLayout>
</ScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</RelativeLayout>
\ No newline at end of file
<FrameLayout
android:id="@+id/fl_my_ttbanner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="98pt" />
</LinearLayout>
\ 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