Commit 766bb792 authored by mengcuiguang's avatar mengcuiguang

代码合并

parents 4ff8a621 424668e8
...@@ -14,8 +14,8 @@ android { ...@@ -14,8 +14,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 31 versionCode 33
versionName "1.3.1" versionName "1.3.3"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<uses-permission android:name="com.mints.goodmoney.permission" /> <uses-permission android:name="com.mints.goodmoney.permission" />
<!-- 蘑菇星球 --> <!-- 蘑菇星球 -->
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/> <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<!--小满--> <!--小满-->
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
...@@ -166,8 +166,8 @@ ...@@ -166,8 +166,8 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activitys.MokuGuideActivity" android:name=".ui.activitys.MokuGuideActivity"
android:theme="@style/AppTheme.NoActionBarTranslucent" android:screenOrientation="portrait"
android:screenOrientation="portrait" /> android:theme="@style/AppTheme.NoActionBarTranslucent" />
<activity <activity
android:name=".ui.activitys.SettingsActivity" android:name=".ui.activitys.SettingsActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
...@@ -253,7 +253,8 @@ ...@@ -253,7 +253,8 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity android:name=".ui.activitys.XiaomanActivity" <activity android:name=".ui.activitys.XiaomanActivity"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name=".ui.activitys.ShaiziActivity"
android:screenOrientation="portrait"/>
<service <service
android:name=".service.UpdateService" android:name=".service.UpdateService"
android:exported="true" /> android:exported="true" />
...@@ -341,6 +342,21 @@ ...@@ -341,6 +342,21 @@
tools:replace="android:resource" /> tools:replace="android:resource" />
</provider> </provider>
<!-- OneWay -->
<activity
android:name="mobi.oneway.export.AdShowActivity"
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
android:hardwareAccelerated="true"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
<provider
android:name="mobi.oneway.export.OWProvider"
android:authorities="${applicationId}.OWProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/ow_file_paths" />
</provider>
<!-- 鱼丸盒子广告 --> <!-- 鱼丸盒子广告 -->
<provider <provider
......
...@@ -18,7 +18,6 @@ import com.mints.goodmoney.manager.LiebaoManager; ...@@ -18,7 +18,6 @@ import com.mints.goodmoney.manager.LiebaoManager;
import com.mints.goodmoney.manager.MhManager; import com.mints.goodmoney.manager.MhManager;
import com.mints.goodmoney.manager.MiitHelper; import com.mints.goodmoney.manager.MiitHelper;
import com.mints.goodmoney.manager.OwManager; import com.mints.goodmoney.manager.OwManager;
import com.mints.goodmoney.manager.ReaderManager;
import com.mints.goodmoney.manager.RsNewsManager; 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;
...@@ -26,7 +25,6 @@ import com.mints.goodmoney.manager.WnManager; ...@@ -26,7 +25,6 @@ import com.mints.goodmoney.manager.WnManager;
import com.mints.goodmoney.manager.XmManager; 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.manager.YyzManager;
import com.mints.goodmoney.net.LoanService; import com.mints.goodmoney.net.LoanService;
import com.mints.goodmoney.utils.ForegroundOrBackground; import com.mints.goodmoney.utils.ForegroundOrBackground;
import com.mints.goodmoney.utils.LogUtil; import com.mints.goodmoney.utils.LogUtil;
......
...@@ -6,6 +6,8 @@ import com.mints.goodmoney.manager.UserManager ...@@ -6,6 +6,8 @@ import com.mints.goodmoney.manager.UserManager
object Constant { object Constant {
const val MONEY_KEY="MONEY_KEY"
/** /**
* 首次弹出权限声明 * 首次弹出权限声明
*/ */
......
package com.mints.goodmoney.manager package com.mints.goodmoney.manager
import android.app.Application import android.app.Application
import com.maplehaze.adsdk.MaplehazeSDK
import mobi.oneway.export.Ad.OnewaySdk import mobi.oneway.export.Ad.OnewaySdk
/** /**
...@@ -10,14 +9,15 @@ import mobi.oneway.export.Ad.OnewaySdk ...@@ -10,14 +9,15 @@ import mobi.oneway.export.Ad.OnewaySdk
*/ */
object OwManager { object OwManager {
private const val PUBLISH_ID = "" private const val PUBLISH_ID = "bf236dc4c17946cd"
const val REWARD_PID = "" const val REWARD_PID = "P9663XII5Q9VJM25"
/** /**
* 初始化 * 初始化
*/ */
fun init(application: Application) { fun init(application: Application) {
OnewaySdk.configure(application, PUBLISH_ID) OnewaySdk.configure(application, PUBLISH_ID)
OnewaySdk.setDebugMode(true)
} }
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ package com.mints.goodmoney.manager ...@@ -3,6 +3,7 @@ package com.mints.goodmoney.manager
import android.app.Activity import android.app.Activity
import android.app.Application import android.app.Application
import android.util.Log import android.util.Log
import androidx.fragment.app.FragmentActivity
import com.mdad.sdk.mduisdk.AdManager import com.mdad.sdk.mduisdk.AdManager
import com.mdad.sdk.mduisdk.CommonCallBack import com.mdad.sdk.mduisdk.CommonCallBack
import com.mints.goodmoney.MintsApplication import com.mints.goodmoney.MintsApplication
...@@ -13,9 +14,10 @@ object YyzManager { ...@@ -13,9 +14,10 @@ object YyzManager {
private const val KEY = "37e179d05b23b0a" private const val KEY = "37e179d05b23b0a"
private const val APPID = "550" private const val APPID = "550"
fun initYyz(appActivity: Application) { fun initYyz() {
val context = MintsApplication.getContext()
//当用户登陆了且权限具备了后执行初始化操作 //当用户登陆了且权限具备了后执行初始化操作
AdManager.getInstance(appActivity).init(appActivity, APPID, UserManager.getInstance().userID, KEY, object : CommonCallBack<Any?> { AdManager.getInstance(context).init(context, APPID, UserManager.getInstance().userID, KEY, object : CommonCallBack<Any?> {
override fun onSuccess(response: String) { //初始化成功 override fun onSuccess(response: String) { //初始化成功
Log.e("hyw", "init onSuccess:$response") Log.e("hyw", "init onSuccess:$response")
} }
......
...@@ -19,6 +19,7 @@ public class DrawcashBean implements Serializable { ...@@ -19,6 +19,7 @@ public class DrawcashBean implements Serializable {
private boolean openJDCash = true; private boolean openJDCash = true;
private String JDUrl = null; private String JDUrl = null;
public String getJDUrl() { public String getJDUrl() {
return JDUrl; return JDUrl;
} }
......
package com.mints.goodmoney.mvp.model;
import java.io.Serializable;
/**
* 猜大小 结果
*/
public class ShaiziBean implements Serializable {
private int randomPoint;
private int success;//0-失败 1-成功
private Long diceId;
public int getRandomPoint() {
return randomPoint;
}
public Long getDiceId() {
return diceId;
}
public int getSuccess() {
return success;
}
}
...@@ -109,7 +109,6 @@ public class AwardPresenter extends BasePresenter<AwardView> { ...@@ -109,7 +109,6 @@ public class AwardPresenter extends BasePresenter<AwardView> {
if (!TextUtils.isEmpty(MintsApplication.OAID)) { if (!TextUtils.isEmpty(MintsApplication.OAID)) {
vo.put("oaid", MintsApplication.OAID); vo.put("oaid", MintsApplication.OAID);
} }
AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo), .call(loanService.saveTerminalInfo(vo),
new BaseSubscriber<BaseResponse<UserBean>>() { new BaseSubscriber<BaseResponse<UserBean>>() {
......
...@@ -4,6 +4,7 @@ import android.text.TextUtils; ...@@ -4,6 +4,7 @@ import android.text.TextUtils;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.mints.goodmoney.MintsApplication; import com.mints.goodmoney.MintsApplication;
import com.mints.goodmoney.common.AppConfig;
import com.mints.goodmoney.common.Constant; import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.common.DeviceInfo; import com.mints.goodmoney.common.DeviceInfo;
import com.mints.goodmoney.manager.AppHttpManager; import com.mints.goodmoney.manager.AppHttpManager;
...@@ -153,8 +154,6 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> { ...@@ -153,8 +154,6 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
vo.put("oaid", MintsApplication.OAID); vo.put("oaid", MintsApplication.OAID);
} }
vo.put("ua", deviceInfo.getUserAgent()); vo.put("ua", deviceInfo.getUserAgent());
TrackManager.getInstance().riskinfo(); TrackManager.getInstance().riskinfo();
AppHttpManager.getInstance(loanApplication) AppHttpManager.getInstance(loanApplication)
...@@ -226,16 +225,64 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> { ...@@ -226,16 +225,64 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
view.showToast(baseResponse.getMessage()); view.showToast(baseResponse.getMessage());
switch (code) { switch (code) {
case 200://成功 case 200://成功
getUserTaskMsg();
break;
case 429://操作频繁 case 429://操作频繁
view.userFrequently(); view.userFrequently();
break; break;
case 610://无法提现,金币数不足
getUserTaskMsg();
break;
}
}
});
}
public void queryCanRollDiceMsg(double cash) {
view.showLoading("加载中...");
HashMap<String, Object> vo = new HashMap<>();
vo.put("cash", cash);
AppHttpManager.getInstance(loanApplication)
.call(loanService.queryCanRollDiceMsg(vo),
new BaseSubscriber<BaseResponse<JsonObject>>() {
@Override
public void onCompleted() {
if (isLinkView()) return;
view.hideLoading();
}
@Override
public void onError(Throwable e) {
if (isLinkView()) return;
view.hideLoading();
view.showToast(e.getMessage());
}
@Override
public void onNext(BaseResponse<JsonObject> baseResponse) {
if (isLinkView()) return;
int code = baseResponse.getStatus();
switch (code) {
case 200://成功
JsonObject data = baseResponse.getData();
if (data != null) {
if (data.get("canRoll") != null) {
view.getqueryCanRollDiceMsg(data.get("canRoll").getAsBoolean());
}
}
break;
default:
view.showToast(baseResponse.getMessage());
break;
} }
} }
}); });
} }
/** /**
* 检测是否京东金融新用户 * 检测是否京东金融新用户
*/ */
......
package com.mints.goodmoney.mvp.presenters;
import android.text.TextUtils;
import com.google.gson.JsonObject;
import com.mints.goodmoney.MintsApplication;
import com.mints.goodmoney.common.DeviceInfo;
import com.mints.goodmoney.manager.AppHttpManager;
import com.mints.goodmoney.manager.ShumeiManager;
import com.mints.goodmoney.manager.TrackManager;
import com.mints.goodmoney.mvp.model.BaseResponse;
import com.mints.goodmoney.mvp.model.ShaiziBean;
import com.mints.goodmoney.mvp.model.UserBean;
import com.mints.goodmoney.mvp.model.WaterBean;
import com.mints.goodmoney.mvp.views.ShaiziView;
import com.mints.goodmoney.mvp.views.WaterView;
import com.mints.goodmoney.utils.DeviceUuidFactory;
import com.mints.goodmoney.utils.rxutil.CommonRxTask;
import com.mints.goodmoney.utils.rxutil.RxjavaUtil;
import com.mints.library.net.neterror.BaseSubscriber;
import com.mints.library.net.neterror.Throwable;
import java.util.HashMap;
public class ShaiziPresenter extends BasePresenter<ShaiziView> {
public void getRollDiceMsg(double cash,boolean isBig) {
HashMap<String, Object> vo = new HashMap<>();
vo.put("cash", cash);
vo.put("isBig",isBig);
//添加摇色子ID
AppHttpManager.getInstance(loanApplication)
.call(loanService.getRollDiceMsg(vo),
new BaseSubscriber<BaseResponse<ShaiziBean>>() {
@Override
public void onCompleted() {
if (isLinkView()) return;
view.hideLoading();
}
@Override
public void onError(Throwable e) {
if (isLinkView()) return;
view.getShaiziMsgHomefail();
view.hideLoading();
//提示错误信息
view.showToast(e.getMessage());
}
@Override
public void onNext(BaseResponse<ShaiziBean> baseResponse) {
if (isLinkView()) return;
int code = baseResponse.getStatus();
switch (code) {
case 200://成功
view.getShaiziMsgHomeSuc(baseResponse.getData());
break;
default:
view.showToast(baseResponse.getMessage());
break;
}
}
});
}
public void saveTerminalInfo(double curCash,long diceid) {
view.showLoading("加载中...");
DeviceInfo deviceInfo = DeviceInfo.Companion.getInstance();
RxjavaUtil.executeRxTask(new CommonRxTask<String>("") {
@Override
public void doInIOThread() {
setT(deviceInfo.getAppInfoMap());
}
@Override
public void doInUIThread() {
HashMap<String, Object> vo = new HashMap<>();
String macAddress = deviceInfo.getMacAddress();
if (!TextUtils.isEmpty(macAddress)) {
String mac = macAddress.replace(":", "");
vo.put("mac", mac);
vo.put("mac1", macAddress);
}
vo.put("imei", deviceInfo.getIMEI());
vo.put("androidid", deviceInfo.getAndroidId(null));
vo.put("os", "android");
vo.put("shumeiId", ShumeiManager.getInstance().getShumeiDeviceId());
vo.put("model", deviceInfo.getNewModel());
vo.put("uuid", new DeviceUuidFactory().getDeviceUuid());
vo.put("osversion", deviceInfo.getOSVersion());
vo.put("appversion", deviceInfo.getVersionName());
vo.put("appPkgList", getT());
if (!TextUtils.isEmpty(MintsApplication.OAID)) {
vo.put("oaid", MintsApplication.OAID);
}
vo.put("ua", deviceInfo.getUserAgent());
TrackManager.getInstance().riskinfo();
AppHttpManager.getInstance(loanApplication)
.call(loanService.saveTerminalInfo(vo),
new BaseSubscriber<BaseResponse<UserBean>>() {
@Override
public void onCompleted() {
if (isLinkView()) return;
}
@Override
public void onError(Throwable e) {
if (isLinkView()) return;
view.hideLoading();
}
@Override
public void onNext(BaseResponse<UserBean> baseResponse) {
if (isLinkView()) return;
int code = baseResponse.getStatus();
String message = baseResponse.getMessage();
switch (code) {
case 200://成功
addShaiziresult(curCash,diceid);
break;
default:
view.showToast(message);
view.hideLoading();
break;
}
}
});
}
});
}
public void addShaiziresult(double cash,long diceid) {
HashMap<String, Object> vo = new HashMap<>();
vo.put("payChannel","WEIXIN");
vo.put("cash", cash);
vo.put("diceid",diceid);
//添加摇色子ID
AppHttpManager.getInstance(loanApplication)
.call(loanService.addCashoutReq(vo),
new BaseSubscriber<BaseResponse<Object>>() {
@Override
public void onCompleted() {
if (isLinkView()) return;
view.hideLoading();
}
@Override
public void onError(Throwable e) {
if (isLinkView()) return;
view.hideLoading();
view.showToast(e.getMessage());
}
@Override
public void onNext(BaseResponse<Object> baseResponse) {
if (isLinkView()) return;
int code = baseResponse.getStatus();
switch (code) {
case 200://成功
view.drawCashSuc();
break;
default:
view.showToast(baseResponse.getMessage());
break;
}
}
});
}
}
...@@ -2,6 +2,9 @@ package com.mints.goodmoney.mvp.views; ...@@ -2,6 +2,9 @@ package com.mints.goodmoney.mvp.views;
import com.mints.goodmoney.mvp.model.DrawcashBean; import com.mints.goodmoney.mvp.model.DrawcashBean;
import com.mints.goodmoney.mvp.model.ShaiziBean;
import retrofit2.http.Body;
public interface DrawcashView extends BaseView { public interface DrawcashView extends BaseView {
/** /**
...@@ -26,4 +29,7 @@ public interface DrawcashView extends BaseView { ...@@ -26,4 +29,7 @@ public interface DrawcashView extends BaseView {
void checkJDNewUsersFail(); void checkJDNewUsersFail();
void getCommonJdUrlSuc(String jdUrl); void getCommonJdUrlSuc(String jdUrl);
void getqueryCanRollDiceMsg(boolean showDialog);
} }
package com.mints.goodmoney.mvp.views;
import com.mints.goodmoney.mvp.model.ShaiziBean;
public interface ShaiziView extends BaseView {
/**
* 骰子
*
* @param data
*/
void getShaiziMsgHomeSuc(ShaiziBean data);
void getShaiziMsgHomefail();
void drawCashSuc();
}
...@@ -20,6 +20,7 @@ import com.mints.goodmoney.mvp.model.MealBean; ...@@ -20,6 +20,7 @@ import com.mints.goodmoney.mvp.model.MealBean;
import com.mints.goodmoney.mvp.model.MorningClockBean; import com.mints.goodmoney.mvp.model.MorningClockBean;
import com.mints.goodmoney.mvp.model.MyInfo; import com.mints.goodmoney.mvp.model.MyInfo;
import com.mints.goodmoney.mvp.model.RotationChartBean; import com.mints.goodmoney.mvp.model.RotationChartBean;
import com.mints.goodmoney.mvp.model.ShaiziBean;
import com.mints.goodmoney.mvp.model.SignCardBean; import com.mints.goodmoney.mvp.model.SignCardBean;
import com.mints.goodmoney.mvp.model.TaskCpdBean; import com.mints.goodmoney.mvp.model.TaskCpdBean;
import com.mints.goodmoney.mvp.model.TurnBean; import com.mints.goodmoney.mvp.model.TurnBean;
...@@ -614,8 +615,8 @@ public interface LoanService { ...@@ -614,8 +615,8 @@ public interface LoanService {
Observable<BaseResponse<Object>> addTurnToOtherMsg(@Body Map<String, Object> vo); Observable<BaseResponse<Object>> addTurnToOtherMsg(@Body Map<String, Object> vo);
/** /**
*
* 我的页面Banner * 我的页面Banner
*
* @return * @return
*/ */
@POST("api/myRotationChart") @POST("api/myRotationChart")
...@@ -623,6 +624,7 @@ public interface LoanService { ...@@ -623,6 +624,7 @@ public interface LoanService {
/** /**
* 参数判断(公众号弹框) * 参数判断(公众号弹框)
*
* @param vo * @param vo
* @return * @return
*/ */
...@@ -638,8 +640,23 @@ public interface LoanService { ...@@ -638,8 +640,23 @@ public interface LoanService {
Observable<BaseResponse<UserTaskMsgBean>> vedioPlans(); Observable<BaseResponse<UserTaskMsgBean>> vedioPlans();
/** /**
* 默认http工厂 * 提现界面 是否弹出猜大小
*
* @return
*/
@POST("api/queryCanRollDiceMsg")
Observable<BaseResponse<JsonObject>> queryCanRollDiceMsg(@Body Map<String, Object> vo);
/**
* 猜大小界面发起竞猜 成功-提现
*
* @return
*/ */
@POST("api/getRollDiceMsg")
Observable<BaseResponse<ShaiziBean>> getRollDiceMsg(@Body Map<String,Object> vo);
/**
* 默认http工厂
*/
class Factory { class Factory {
public static LoanService create() { public static LoanService create() {
......
package com.mints.goodmoney.ui.activitys package com.mints.goodmoney.ui.activitys
import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
import android.util.Log
import android.view.View import android.view.View
import android.widget.CompoundButton import android.widget.CompoundButton
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
...@@ -21,6 +23,8 @@ import com.mints.goodmoney.mvp.views.DrawcashView ...@@ -21,6 +23,8 @@ import com.mints.goodmoney.mvp.views.DrawcashView
import com.mints.goodmoney.ui.activitys.base.BaseActivity import com.mints.goodmoney.ui.activitys.base.BaseActivity
import com.mints.goodmoney.ui.adapter.DrawcashAdapter import com.mints.goodmoney.ui.adapter.DrawcashAdapter
import com.mints.goodmoney.ui.adapter.listener.OnItemClickListener import com.mints.goodmoney.ui.adapter.listener.OnItemClickListener
import com.mints.goodmoney.ui.widgets.dialog.DialogListener
import com.mints.goodmoney.ui.widgets.dialog.DialogUtils.showTxDialog
import com.mints.goodmoney.ui.widgets.dialog.DrawcashVideoDialog import com.mints.goodmoney.ui.widgets.dialog.DrawcashVideoDialog
import com.mints.goodmoney.utils.LogUtil import com.mints.goodmoney.utils.LogUtil
import com.mints.library.utils.CommonUtils import com.mints.library.utils.CommonUtils
...@@ -53,7 +57,7 @@ class DrawcashActivity : BaseActivity(), ...@@ -53,7 +57,7 @@ class DrawcashActivity : BaseActivity(),
private var priceList: MutableList<DrawcashBean.CashOutMoneyArrBean>? = null private var priceList: MutableList<DrawcashBean.CashOutMoneyArrBean>? = null
private var wxInfo: WXInfo? = null private var wxInfo: WXInfo? = null
private var userConfig: DrawcashBean? = null private var userConfig: DrawcashBean? = null
private var isLoadRvItem: Boolean = true //是否首次加载rv item private var isLoadRvItem: Boolean = true //是否首次加载rvitem
// private var isJDNewUser = false // private var isJDNewUser = false
// private var jumpJdUrl: String? = null // private var jumpJdUrl: String? = null
...@@ -64,6 +68,7 @@ class DrawcashActivity : BaseActivity(), ...@@ -64,6 +68,7 @@ class DrawcashActivity : BaseActivity(),
override fun isApplyKitKatTranslucency() = false override fun isApplyKitKatTranslucency() = false
override fun initViewsAndEvents() { override fun initViewsAndEvents() {
drawcashPresenter.attachView(this)
tv_title.text = "提现" tv_title.text = "提现"
iv_left_icon.visibility = View.VISIBLE iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_back) iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
...@@ -74,7 +79,6 @@ class DrawcashActivity : BaseActivity(), ...@@ -74,7 +79,6 @@ class DrawcashActivity : BaseActivity(),
view_title.text = "提现规则" view_title.text = "提现规则"
vedioAdingManager = VideoAdingManager.getInstance(this) vedioAdingManager = VideoAdingManager.getInstance(this)
drawcashPresenter.attachView(this)
initListener() initListener()
} }
...@@ -173,8 +177,11 @@ class DrawcashActivity : BaseActivity(), ...@@ -173,8 +177,11 @@ class DrawcashActivity : BaseActivity(),
val curCount = userConfig?.vedioComplete!! val curCount = userConfig?.vedioComplete!!
val sumCount = priceList!![drawcashAdapter.getPosition()].vedio val sumCount = priceList!![drawcashAdapter.getPosition()].vedio
if (curCount >= sumCount) { if (curCount >= sumCount) {
drawcashPresenter.saveTerminalInfo(priceList!![drawcashAdapter.getPosition()].money) //摇骰子弹窗
drawcashPresenter.queryCanRollDiceMsg(priceList!![drawcashAdapter.getPosition()].money)
// drawcashPresenter.saveTerminalInfo(priceList!![drawcashAdapter.getPosition()].money)
} else { } else {
//提现看视频啦
drawcashVideoDialog(curCount, sumCount) drawcashVideoDialog(curCount, sumCount)
} }
} }
...@@ -331,15 +338,39 @@ class DrawcashActivity : BaseActivity(), ...@@ -331,15 +338,39 @@ class DrawcashActivity : BaseActivity(),
} }
it.setOnClickListener(object : DrawcashVideoDialog.OnClickListener { it.setOnClickListener(object : DrawcashVideoDialog.OnClickListener {
override fun onClick() { override fun onClick() {
if (priceList != null && priceList!!.size > 0) { drawcashPresenter.queryCanRollDiceMsg(priceList!![drawcashAdapter.getPosition()].money)
drawcashPresenter.saveTerminalInfo(priceList!![drawcashAdapter.getPosition()].money)
}
} }
}) })
it.show() it.show()
} }
} }
private fun ShaiziDialog(drawcashPresenter: DrawcashPresenter, priceList: MutableList<DrawcashBean.CashOutMoneyArrBean>?, drawcashAdapter: DrawcashAdapter) {
showTxDialog(this@DrawcashActivity, object : DialogListener() {
override fun onClick(dialog: Dialog?, v: View?) {
when (v?.id) {
R.id.tv_cash -> {//提现
if (priceList != null && priceList!!.size > 0) {
drawcashPresenter.saveTerminalInfo(priceList!![drawcashAdapter.getPosition()].money)
}
dialog?.dismiss()
}
R.id.tv_double -> {//翻倍
val bundle = Bundle()
bundle.putDouble(Constant.MONEY_KEY, priceList!![drawcashAdapter.getPosition()].money)
readyGo(ShaiziActivity::class.java, bundle)
dialog?.dismiss()
}
R.id.iv_Close -> {
dialog?.dismiss()
}
}
}
})
}
override fun checkJDNewUsersSuc(isJdNewUser: Boolean, JDUrl: String?) { override fun checkJDNewUsersSuc(isJdNewUser: Boolean, JDUrl: String?) {
// jdTintDialog?.dismiss() // jdTintDialog?.dismiss()
...@@ -372,6 +403,22 @@ class DrawcashActivity : BaseActivity(), ...@@ -372,6 +403,22 @@ class DrawcashActivity : BaseActivity(),
} }
} }
/**
* 获取是否提示 骰子弹框
*/
override fun getqueryCanRollDiceMsg(showDialog: Boolean) {
LogUtil.e("jinbitixian","========$showDialog")
if (showDialog){
ShaiziDialog(drawcashPresenter, priceList, drawcashAdapter);
}else{
//提现
if (priceList != null && priceList!!.size > 0) {
drawcashPresenter.saveTerminalInfo(priceList!![drawcashAdapter.getPosition()].money)
}
}
}
override fun userFrequently() { override fun userFrequently() {
if (AntiShake.check(tvDrawcashExplain?.id)) return if (AntiShake.check(tvDrawcashExplain?.id)) return
......
...@@ -94,7 +94,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener { ...@@ -94,7 +94,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
try { try {
// 登录成功初始化鱼玩盒子userid // 登录成功初始化鱼玩盒子userid
YwhzManager.init(baseApplication) YwhzManager.init(baseApplication)
YyzManager.initYyz(baseApplication) YyzManager.initYyz()
} catch (e: Exception) { } catch (e: Exception) {
} }
......
package com.mints.goodmoney.ui.activitys
import android.app.Dialog
import android.os.Bundle
import android.view.View
import com.bumptech.glide.Glide
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.mvp.model.ShaiziBean
import com.mints.goodmoney.mvp.presenters.ShaiziPresenter
import com.mints.goodmoney.mvp.views.ShaiziView
import com.mints.goodmoney.ui.activitys.base.BaseActivity
import com.mints.goodmoney.ui.widgets.dialog.DialogListener
import com.mints.goodmoney.ui.widgets.dialog.DialogUtils
import com.mints.goodmoney.utils.SpanUtils
import kotlinx.android.synthetic.main.activity_shaizi.*
import java.util.*
class ShaiziActivity : BaseActivity(), View.OnClickListener, ShaiziView {
private var count: Int = 0
private var diceId: Long? = null
private var moneys: Double = 0.0
private val shaiziPresenter by lazy { ShaiziPresenter() }
private var starttime: Long? = null
private var shaiziFlag: Int = 0 // 骰子大小 0-小 1-
private var dialog: Dialog? = null
override fun getContentViewLayoutID() = R.layout.activity_shaizi
override fun isApplyKitKatTranslucency() = false
override fun initViewsAndEvents() {
shaiziPresenter.attachView(this)
var spannable = SpanUtils().append(" 猜骰子投掷数字为大还是小,1/2/3/为小,4/5/6为大,猜中时本次提现获得")
.append("双倍收益")
.setBold()
.append("(奖励以金币形式发放),若没有猜中则本次提现金币回收。")
.create()
tv2.text = spannable
initListener()
}
override fun onResume() {
super.onResume()
}
override fun onPause() {
super.onPause()
}
override fun onDestroy() {
//关闭 接口绑定
shaiziPresenter.detachView()
super.onDestroy()
}
override fun onClick(v: View) {
when (v.id) {
R.id.shaiziback -> {
finish()
}
R.id.btn_big -> {
starttime = System.currentTimeMillis()
shaiziPresenter.getRollDiceMsg(moneys, true)
shaiziFlag = 1
}
R.id.btn_small -> {
starttime = System.currentTimeMillis()
shaiziPresenter.getRollDiceMsg(moneys, false)
}
}
}
fun startShaizi(time: Long, success: Int) {
Glide.with(context).asGif().load(R.drawable.shaizi).into(iv_saizi);
val timer = Timer()
val task: TimerTask = object : TimerTask() {
override fun run() {
runOnUiThread {
when (count) {
1 -> Glide.with(context).load(R.mipmap.iv_tx_sz1).into(iv_saizi);
2 -> Glide.with(context).load(R.mipmap.iv_tx_sz2).into(iv_saizi);
3 -> Glide.with(context).load(R.mipmap.iv_tx_sz3).into(iv_saizi);
4 -> Glide.with(context).load(R.mipmap.iv_tx_sz4).into(iv_saizi);
5 -> Glide.with(context).load(R.mipmap.iv_tx_sz5).into(iv_saizi);
6 -> Glide.with(context).load(R.mipmap.iv_tx_sz6).into(iv_saizi);
}
if(success==1){
if(shaiziFlag==1) showresultDialog("恭喜您!", "本次开奖结果为大,您的收益已翻倍!",true)//猜的是大
else showresultDialog("恭喜您!", "本次开奖结果为小,您的收益已翻倍!",true)//猜的是小
} else {
if (shaiziFlag===1) showresultDialog("很遗憾!", "本次开奖结果为小,您未中奖,金币已收回。",false)
else showresultDialog("很遗憾!", "本次开奖结果为大,您未中奖,金币已收回。",false)
}
// if (shaiziFlag == 1) {
// if (count >= 4) {
// showresultDialog("恭喜您!", "本次开奖结果为大,您的收益已翻倍!", true)
// } else {
// showresultDialog("很遗憾!", "本次开奖结果为小,您未中奖,金币已收回。",false)
// }
// } else {
// if (count <= 3) {
// showresultDialog("恭喜您!", "本次开奖结果为小,您的收益已翻倍!",true)
// } else {
// showresultDialog("很遗憾!", "本次开奖结果为大,您未中奖,金币已收回。",false)
// }
// }
}
}
}
timer.schedule(task, (time!! - starttime!!) + 2000)
}
/**
* 展示 骰子结果 弹框
*/
private fun showresultDialog(s: String, s1: String, b: Boolean) {
DialogUtils.showWinDialog(this@ShaiziActivity, s, s1, object : DialogListener() {
override fun onClick(mydialog: Dialog?, v: View?) {
when (v?.id) {
R.id.tv_know -> {
//向服务器传递 提现金额 骰子Id
mydialog?.dismiss()
if (b){
shaiziPresenter.saveTerminalInfo(moneys, diceId!!)
} else{
finish()
}
// dialog = mydialog
}
}
}
})
}
/**
* 获取 提现金额
*/
override fun getBundleExtras(extras: Bundle) {
super.getBundleExtras(extras)
moneys = extras.getDouble(Constant.MONEY_KEY)
}
private fun initListener() {
shaiziback.setOnClickListener(this)
btn_small.setOnClickListener(this)
btn_big.setOnClickListener(this)
}
/**
* 请求成功
*/
override fun getShaiziMsgHomeSuc(data: ShaiziBean) {
//设置按钮 不可点击
setButtonstatus(false)
//更改按钮 背景
if (shaiziFlag == 1) {
btn_big.setBackgroundResource(R.mipmap.btn_tx_down)
} else {
btn_small.setBackgroundResource(R.mipmap.btn_tx_down_small)
}
//获取骰子 点数、Id
count = data.randomPoint
diceId = data.diceId
//执行延时,旋转骰子,显示结果
startShaizi(System.currentTimeMillis(), data.success)
}
/**
* 设置按钮状态(可否点击)
*/
private fun setButtonstatus(b: Boolean) {
btn_small.isEnabled = b
btn_big.isEnabled = b
}
/**
* 请求失败
*/
override fun getShaiziMsgHomefail() {
//设置按钮 可点击
setButtonstatus(true)
//改变按钮 背景
if (shaiziFlag == 1) {
btn_big.setBackgroundResource(R.mipmap.btn_tx_up)
} else {
btn_small.setBackgroundResource(R.mipmap.btn_tx_up_small)
}
}
override fun drawCashSuc() {
finish()
}
}
...@@ -118,7 +118,7 @@ class WxLoginActivity : BaseActivity() ...@@ -118,7 +118,7 @@ class WxLoginActivity : BaseActivity()
try { try {
// 登录成功初始化鱼玩盒子userid // 登录成功初始化鱼玩盒子userid
YwhzManager.init(baseApplication) YwhzManager.init(baseApplication)
YyzManager.initYyz(baseApplication) YyzManager.initYyz()
} catch (e: Exception) { } catch (e: Exception) {
} }
......
...@@ -4,12 +4,9 @@ import androidx.fragment.app.Fragment ...@@ -4,12 +4,9 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import com.androidkun.xtablayout.XTabLayout import com.androidkun.xtablayout.XTabLayout
import com.chineseall.reader17ksdk.feature.main.bookshop.wellchosen.WellChosenFragment
import com.mints.goodmoney.R import com.mints.goodmoney.R
import com.mints.goodmoney.common.AppConfig import com.mints.goodmoney.common.AppConfig
import com.mints.goodmoney.ui.fragment.base.BaseFragment import com.mints.goodmoney.ui.fragment.base.BaseFragment
import com.mints.goodmoney.utils.LogUtil
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.android.synthetic.main.fragment_main_money.* import kotlinx.android.synthetic.main.fragment_main_money.*
/** /**
...@@ -68,7 +65,6 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener { ...@@ -68,7 +65,6 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
if (AppConfig.showAdFlag) { if (AppConfig.showAdFlag) {
if (mainFragment == null) { if (mainFragment == null) {
mainFragment = MainFragment() mainFragment = MainFragment()
LogUtil.d("mainFragment","mainFragment是空的。。。。。。。。。。。。。。。。。。")
} }
if (!mainFragment!!.isAdded) { if (!mainFragment!!.isAdded) {
// 提交事务 // 提交事务
......
...@@ -50,6 +50,7 @@ import com.rd.animation.type.AnimationType ...@@ -50,6 +50,7 @@ import com.rd.animation.type.AnimationType
import com.scwang.smartrefresh.layout.api.RefreshLayout import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnRefreshListener import com.scwang.smartrefresh.layout.listener.OnRefreshListener
import com.tbruyelle.rxpermissions.RxPermissions import com.tbruyelle.rxpermissions.RxPermissions
import com.umeng.analytics.MobclickAgent
import kotlinx.android.synthetic.main.fragment_main_my.* import kotlinx.android.synthetic.main.fragment_main_my.*
import kotlinx.android.synthetic.main.header_layout.* import kotlinx.android.synthetic.main.header_layout.*
import kotlinx.android.synthetic.main.item_fragment_main_my_clock.* import kotlinx.android.synthetic.main.item_fragment_main_my_clock.*
...@@ -141,6 +142,10 @@ class MyFragment : BaseFragment(), ...@@ -141,6 +142,10 @@ class MyFragment : BaseFragment(),
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
MobclickAgent.onPageEnd(this::class.java.simpleName)
MobclickAgent.onPause(mContext)
banner_view.stopAutoScroll() banner_view.stopAutoScroll()
item_clock_signview.stopRedbox() item_clock_signview.stopRedbox()
...@@ -149,6 +154,11 @@ class MyFragment : BaseFragment(), ...@@ -149,6 +154,11 @@ class MyFragment : BaseFragment(),
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
MobclickAgent.onPageStart(this::class.java.simpleName)
MobclickAgent.onResume(mContext)
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FIVE) { if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FIVE) {
// 防止首次加载两次 // 防止首次加载两次
if (AntiShake.check(item_title_id?.id)) return if (AntiShake.check(item_title_id?.id)) return
...@@ -367,46 +377,6 @@ class MyFragment : BaseFragment(), ...@@ -367,46 +377,6 @@ class MyFragment : BaseFragment(),
} }
} }
private fun gzhDialog() {
DialogUtils.showGzhDialog(requireActivity(), object : DialogListener() {
override fun onClick(dialog: Dialog?, v: View?) {
when (v?.id) {
R.id.tv_focus -> {
//并将“淘金空间”复制到粘贴板上
// val clipboardManager = dialog?.ownerActivity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
// val clipData = ClipData.newPlainText("Label", "淘金空间")
// clipboardManager.setPrimaryClip(clipData)
// // Toast 提示
// showToast("已复制内容到剪贴板")
//直接跳转到微信搜索界面
getWechatApi()
}
R.id.tv_subscribe -> {
//关闭当前页面
//并不在提示当前弹窗
if (activity != null && !activity!!.isFinishing && dialog != null && dialog.isShowing) {
dialog.dismiss()
ps.put(Constant.LOAN_PERMISSION_FLAG, false)
// 数美初始化
ShumeiManager.getInstance().initShumei()
}
}
R.id.iv_Close -> {
//关闭当前界面
//再次打开时会继续弹出该弹窗
if (activity != null && !activity!!.isFinishing && dialog != null && dialog.isShowing) {
dialog.dismiss()
ps.put(Constant.LOAN_PERMISSION_FLAG, false)
// 数美初始化
ShumeiManager.getInstance().initShumei()
}
}
}
}
})
}
/** /**
* 跳转到微信搜索页面 * 跳转到微信搜索页面
*/ */
...@@ -558,7 +528,7 @@ class MyFragment : BaseFragment(), ...@@ -558,7 +528,7 @@ class MyFragment : BaseFragment(),
private fun setUserLoginStatus() { private fun setUserLoginStatus() {
if (userManager.userIsLogin()) { if (userManager.userIsLogin()) {
LogUtil.d("lixianshouyi","setUserLoginStatus。。。。。。。。。。。。。。。。。。。。。。。。。。") LogUtil.d("lixianshouyi", "setUserLoginStatus。。。。。。。。。。。。。。。。。。。。。。。。。。")
// 已登录 // 已登录
if (userManager.wxOpenid.isNotEmpty()) { if (userManager.wxOpenid.isNotEmpty()) {
GlideUtils.loadImageViewLoding(context, userManager.wxHeader, item_title_avatar, R.mipmap.ic_my, R.mipmap.ic_my) GlideUtils.loadImageViewLoding(context, userManager.wxHeader, item_title_avatar, R.mipmap.ic_my, R.mipmap.ic_my)
...@@ -916,6 +886,8 @@ class MyFragment : BaseFragment(), ...@@ -916,6 +886,8 @@ class MyFragment : BaseFragment(),
if (taskBean.otherConfig != null) { if (taskBean.otherConfig != null) {
when (taskBean.otherConfig.status) { when (taskBean.otherConfig.status) {
0 -> { 0 -> {
pushUmengEvent(MainMyAdapter.TO_DOWNLOADS)
pkgMCRSCarrier = Constant.CARRIER_FIRSTDOWNLOADS pkgMCRSCarrier = Constant.CARRIER_FIRSTDOWNLOADS
pkgMCRSKey = taskBean.otherConfig.key pkgMCRSKey = taskBean.otherConfig.key
pkgMCRSName = taskBean.otherConfig.pkg pkgMCRSName = taskBean.otherConfig.pkg
...@@ -951,6 +923,16 @@ class MyFragment : BaseFragment(), ...@@ -951,6 +923,16 @@ class MyFragment : BaseFragment(),
} }
} }
/**
* 推送umeng事件埋点
*/
private fun pushUmengEvent(carrierType: String) {
// 埋点上送事件
val map = mutableMapOf<String, String>()
map["userId"] = UserManager.getInstance().userID
MobclickAgent.onEvent(mContext, carrierType, map)
}
//点击事件 //点击事件
override fun onClick(v: View?) { override fun onClick(v: View?) {
if (AntiShake.check(view?.id)) return if (AntiShake.check(view?.id)) return
...@@ -994,7 +976,7 @@ class MyFragment : BaseFragment(), ...@@ -994,7 +976,7 @@ class MyFragment : BaseFragment(),
myPresenter.getAutoUserHallBaseMsg() myPresenter.getAutoUserHallBaseMsg()
return return
} }
LogUtil.e("jinbitixian","*****************************************+++++++++++++++++++========================****&&&&&&&&%%^&$^$&%$&")
readyGo(DrawcashActivity::class.java) readyGo(DrawcashActivity::class.java)
} }
R.id.btn_coinRecord -> { R.id.btn_coinRecord -> {
...@@ -1241,9 +1223,10 @@ class MyFragment : BaseFragment(), ...@@ -1241,9 +1223,10 @@ class MyFragment : BaseFragment(),
* 激励视频播放成功回调 * 激励视频播放成功回调
*/ */
private fun videoAdingSuccess(adType: String) { private fun videoAdingSuccess(adType: String) {
if (activity != null && !activity!!.isFinishing) { if (activity != null && !requireActivity().isFinishing) {
// 高额任务 // 高额任务
if (TextUtils.equals(carrierType, Constant.CARRIER_HIGH_ACTIVITY)) { if (TextUtils.equals(carrierType, Constant.CARRIER_HIGH_ACTIVITY)) {
onDestroyBroadcastReceiver()
return return
} }
...@@ -1275,13 +1258,15 @@ class MyFragment : BaseFragment(), ...@@ -1275,13 +1258,15 @@ class MyFragment : BaseFragment(),
private fun initManager() { private fun initManager() {
BannerManager.init() BannerManager.init()
videoAdingManager = VideoAdingManager.getInstance(activity) videoAdingManager = VideoAdingManager.getInstance(activity)
LogUtil.d("lixianshouyi","进入到initManager。。。。。。。。。。。。。。。。。。。。。。。。。。") LogUtil.d("lixianshouyi", "进入到initManager。。。。。。。。。。。。。。。。。。。。。。。。。。")
//登录成功 //登录成功
if (!TextUtils.isEmpty(userManager.userID)) { if (!TextUtils.isEmpty(userManager.userID)) {
LogUtil.d("lixianshouyi","用户登陆成功!!!。。。。。。。。。。。。。。。。。。。。。。。。。。") LogUtil.d("lixianshouyi", "用户登陆成功!!!。。。。。。。。。。。。。。。。。。。。。。。。。。")
// 登录成功的用户初始化鱼丸盒子 // 登录成功的用户初始化鱼丸盒子
if (userManager.userIsLogin()) { if (userManager.userIsLogin()) {
YwhzManager.init(baseApplication) YwhzManager.init(baseApplication)
YyzManager.initYyz()
} }
} }
......
...@@ -74,4 +74,22 @@ object DialogUtils { ...@@ -74,4 +74,22 @@ object DialogUtils {
bonusDialog.show() bonusDialog.show()
dialogListener.setDialog(bonusDialog) dialogListener.setDialog(bonusDialog)
} }
/**
* 提现弹框
*/
fun showTxDialog(ctx: Context,dialogListener: DialogListener){
val weakReference = WeakReference<Context>(ctx)
val bonusDialog = TxDialog(weakReference.get()!!, dialogListener)
bonusDialog.show()
dialogListener.setDialog(bonusDialog)
}
/**
* 中奖弹窗
*/
fun showWinDialog(ctx: Context,str1:String,str2:String,dialogListener: DialogListener){
val weakReference = WeakReference<Context>(ctx)
val bonusDialog = WinDialog(weakReference.get()!!, dialogListener,str1,str2)
bonusDialog.show()
dialogListener.setDialog(bonusDialog)
}
} }
\ No newline at end of file
...@@ -60,6 +60,7 @@ class DrawcashVideoDialog(activity: Activity) : ...@@ -60,6 +60,7 @@ class DrawcashVideoDialog(activity: Activity) :
when (v.id) { when (v.id) {
R.id.btn_dialog_drawcash_next -> { R.id.btn_dialog_drawcash_next -> {
if (TextUtils.equals(tvNext.text.toString(), "去提现")) { if (TextUtils.equals(tvNext.text.toString(), "去提现")) {
onClickListener?.onClick() onClickListener?.onClick()
dismiss() dismiss()
} else { } else {
......
package com.mints.goodmoney.ui.widgets.dialog package com.mints.goodmoney.ui.widgets.dialog
import com.mints.goodmoney.R
import com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils
import com.mints.goodmoney.utils.SpanUtils
import android.app.Dialog import android.app.Dialog
import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.Intent import android.text.Html
import android.graphics.Paint
import android.view.Gravity import android.view.Gravity
import android.view.KeyEvent import android.view.KeyEvent
import android.view.View
import android.view.WindowManager import android.view.WindowManager
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import com.mints.goodmoney.R
import com.mints.library.utils.nodoubleclick.AntiShake
/**
* 关注公众号
*/
class GzhDialog(context: Context, private val listener: DialogListener) : class GzhDialog(context: Context, private val listener: DialogListener) :
Dialog(context, R.style.dialog) { Dialog(context, R.style.dialog) {
private val lp: WindowManager.LayoutParams private val lp: WindowManager.LayoutParams
...@@ -42,12 +43,25 @@ class GzhDialog(context: Context, private val listener: DialogListener) : ...@@ -42,12 +43,25 @@ class GzhDialog(context: Context, private val listener: DialogListener) :
tv_focus = findViewById(R.id.tv_focus) tv_focus = findViewById(R.id.tv_focus)
tv_subscribe = findViewById(R.id.tv_subscribe) tv_subscribe = findViewById(R.id.tv_subscribe)
iv_Close = findViewById(R.id.iv_Close) iv_Close = findViewById(R.id.iv_Close)
//设置文字底部下划线,不同android系统显示效果不同,未使用
// tv_subscribe.paint.setFlags(Paint.UNDERLINE_TEXT_FLAG)
// tv_subscribe.paint.setAntiAlias(true)//抗锯齿
tv_focus.setOnClickListener(listener) val ssb = SpanUtils()
tv_subscribe.setOnClickListener(listener) .append("关注官方公众号")
iv_Close.setOnClickListener(listener) .append("[淘金空间]\n").setFontSize(BubbleUtils.dp2px(20)).setBold()
.append("您可以第一时间了解到")
.create()
findViewById<TextView>(R.id.tv_1).text = ssb
tv_subscribe.text = Html.fromHtml("<u>我已订阅</u>")
tv_focus.setOnClickListener {
listener.onClick(it)
}
tv_subscribe.setOnClickListener {
listener.onClick(it)
}
iv_Close.setOnClickListener {
listener.onClick(it)
}
} }
} }
\ No newline at end of file
package com.mints.goodmoney.ui.widgets.dialog
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.view.KeyEvent
import android.view.WindowManager
import android.widget.ImageView
import android.widget.TextView
import com.mints.goodmoney.R
class TxDialog(context: Context, private val listener: DialogListener) :
Dialog(context, R.style.dialog_two) {
private val lp: WindowManager.LayoutParams
private val iv_Close: ImageView
private val tv_cash: TextView
private val tv_double: TextView
init {
setContentView(R.layout.dialog_tx)
// 设置window属性
lp = window!!.attributes
lp.gravity = Gravity.CENTER
lp.width = WindowManager.LayoutParams.WRAP_CONTENT
lp.windowAnimations = R.style.DialogAnimBottom
window!!.attributes = lp
// 设置外部不可关闭
setCancelable(false)
setCanceledOnTouchOutside(false)
setOnKeyListener { _, i, _ ->
i == KeyEvent.KEYCODE_BACK
}
// 查找View
tv_cash = findViewById(R.id.tv_cash)
tv_double = findViewById(R.id.tv_double)
iv_Close = findViewById(R.id.iv_Close)
//设置文字底部下划线,不同android系统显示效果不同,未使用
// tv_subscribe.paint.setFlags(Paint.UNDERLINE_TEXT_FLAG)
// tv_subscribe.paint.setAntiAlias(true)//抗锯齿
tv_cash.setOnClickListener(listener)
tv_double.setOnClickListener(listener)
iv_Close.setOnClickListener(listener)
}
}
\ No newline at end of file
package com.mints.goodmoney.ui.widgets.dialog
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.view.KeyEvent
import android.view.WindowManager
import android.widget.ImageView
import android.widget.TextView
import com.mints.goodmoney.R
import org.w3c.dom.Text
class WinDialog(context: Context, private val listener: DialogListener, str1: String, str2: String) :
Dialog(context, R.style.dialog_two) {
private val lp: WindowManager.LayoutParams
private val tv_result_title: TextView
private val tv_result: TextView
private val tv_know: TextView
init {
setContentView(R.layout.dialog_win)
// 设置window属性
lp = window!!.attributes
lp.gravity = Gravity.CENTER
lp.width = WindowManager.LayoutParams.WRAP_CONTENT
lp.windowAnimations = R.style.DialogAnimBottom
window!!.attributes = lp
// 设置外部不可关闭
setCancelable(false)
setCanceledOnTouchOutside(false)
setOnKeyListener { _, i, _ ->
i == KeyEvent.KEYCODE_BACK
}
// 查找View
tv_result_title = findViewById(R.id.tv_result_title)
tv_know = findViewById(R.id.tv_know)
tv_result = findViewById(R.id.tv_result)
tv_result_title.text = str1
tv_result.text = str2
tv_know.setOnClickListener(listener)
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/transparent" />
<corners android:radius="8pt" />
<stroke android:width="0.5pt" android:color="#ffffff" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners android:radius="8pt" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:endColor="#F96637"
android:startColor="#FF8833" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="500dp"
android:layout_height="800dp"
android:layout_gravity="center"
android:background="@mipmap/bg_shaizi"
android:orientation="vertical">
<ImageView
android:id="@+id/shaiziback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="80dp"
android:paddingTop="55dp"
android:src="@mipmap/iv_tx_return" />
<ImageView
android:id="@+id/iv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/shaiziback"
android:layout_centerHorizontal="true"
android:src="@mipmap/iv_tx" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/shaiziback"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:text="猜大小,搏翻倍!"
android:textColor="#F9F9F9"
android:textSize="23dp" />
<ImageView
android:id="@+id/iv_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="19dp"
android:src="@mipmap/bg_tx_main" />
<ImageView
android:id="@+id/iv_zhaozi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="78dp"
android:src="@mipmap/bg_tx_main1" />
<ImageView
android:id="@+id/iv_saizi"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_below="@+id/iv_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="127dp"
android:src="@mipmap/iv_tx_shaizi" />
<Button
android:id="@+id/btn_big"
android:layout_width="84dp"
android:layout_height="84dp"
android:layout_below="@id/iv_zhaozi"
android:layout_marginLeft="148dp"
android:layout_marginTop="37dp"
android:background="@mipmap/btn_tx_up"
android:text="大"
android:textColor="#F9F9F9"
android:textSize="22dp" />
<Button
android:id="@+id/btn_small"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_below="@id/iv_zhaozi"
android:layout_centerHorizontal="true"
android:layout_marginLeft="47dp"
android:layout_marginTop="45dp"
android:layout_toRightOf="@id/btn_big"
android:background="@mipmap/btn_tx_up_small"
android:text="小"
android:textColor="#F9F9F9"
android:textSize="20dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_bg"
android:layout_centerInParent="true"
android:layout_marginTop="19dp"
android:src="@mipmap/bg_tx_main2" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_bg"
android:layout_centerInParent="true"
android:layout_marginTop="27dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_hd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:text="活动规则"
android:textColor="#EB5762"
android:textSize="17dp" />
<TextView
android:id="@+id/tv2"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:paddingLeft="0dp"
android:textColor="#EB5762"
android:textSize="13dp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/btn_small"
android:layout_marginTop="50dp"
android:layout_toRightOf="@+id/btn_small"
android:src="@mipmap/iv_tx_tizi" />
</RelativeLayout>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:background="@mipmap/bg_gzh">
<ImageView
android:id="@+id/iv_Close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:layout_marginTop="50dp"
android:layout_marginEnd="10dp"
android:padding="6dp"
android:src="@mipmap/ic_close" />
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_gravity="bottom|center_horizontal"
android:background="@mipmap/bg_gzh"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
android:id="@+id/iv_Close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginTop="35dp"
android:layout_marginRight="10dp"
android:src="@mipmap/iv_close_gzh" />
<TextView <TextView
android:id="@+id/tv_1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal|bottom"
android:layout_marginTop="186dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:text="参与最新赚钱活动、获取提现福利、VIP客服反馈..." android:layout_marginBottom="10dp"
android:textColor="@color/black"
android:gravity="center" android:gravity="center"
android:textSize="14sp" /> android:lineHeight="20dp"
android:textColor="@color/color_FF9837"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal|bottom"
android:layout_marginLeft="20dp" android:layout_marginLeft="10dp"
android:layout_marginRight="20dp" android:layout_marginRight="10dp"
android:text="更多惊喜等你来看!" android:layout_marginBottom="20dp"
android:textColor="@color/black"
android:gravity="center" android:gravity="center"
android:textSize="14sp" /> android:lineHeight="20dp"
android:text="最新赚钱活动,领取提现福利,VIP客服反馈...\n更多惊喜等你来看!"
android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_focus" android:id="@+id/tv_focus"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal|bottom"
android:layout_marginLeft="20dp"
android:layout_marginTop="36dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@mipmap/bg_btn_gzh" android:background="@drawable/shape_main"
android:gravity="center" android:gravity="center"
android:text="马上关注" android:text="马上关注"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -62,19 +60,10 @@ ...@@ -62,19 +60,10 @@
android:id="@+id/tv_subscribe" android:id="@+id/tv_subscribe"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal|bottom"
android:layout_marginLeft="20dp" android:layout_marginBottom="10dp"
android:layout_marginRight="20dp"
android:gravity="center"
android:text="我已订阅"
android:textColor="@color/black" /> android:textColor="@color/black" />
<View
android:layout_width="55dp"
android:layout_height="1px"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="60dp"
android:background="@color/black" />
</LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout> </FrameLayout>
\ No newline at end of file \ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/bg_tx"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_Close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_margin="10dp"
android:src="@mipmap/iv_close_tx"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="9dp"
android:layout_marginTop="129dp"
android:text="恭喜您!"
android:textColor="#F9F9F9"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="9dp"
android:layout_marginTop="20dp"
android:text="获得一次翻倍提现的机会,请问是否参加?"
android:textColor="#F9F9F9"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="37dp"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_cash"
android:layout_width="106dp"
android:layout_height="33dp"
android:layout_gravity="center_horizontal"
android:layout_marginRight="11dp"
android:layout_marginBottom="10dp"
android:background="@drawable/btn_tx_bg"
android:gravity="center"
android:text="不,直接提现"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_double"
android:layout_width="111dp"
android:layout_height="33dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="11dp"
android:background="@drawable/btn_tx_double_bg"
android:drawableLeft="@mipmap/bg_btn_tx"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="我要翻倍"
android:textColor="#F96637"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/bg_win"
android:orientation="vertical">
<TextView
android:id="@+id/tv_result_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20dp"
android:layout_marginTop="30dp"
android:layout_marginRight="20dp"
android:gravity="center"
android:text="恭喜您!"
android:textColor="#F46147"
android:textSize="20dp" />
<TextView
android:id="@+id/tv_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="20dp"
android:gravity="center"
android:textColor="#F46147"
android:textSize="15dp" />
<TextView
android:id="@+id/tv_know"
android:layout_width="120dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginTop="22dp"
android:layout_marginRight="20dp"
android:background="@mipmap/btn_win_bg"
android:gravity="center"
android:text="我知道了"
android:textColor="#F9F9F9"
android:textSize="16dp" />
</LinearLayout>
...@@ -16,6 +16,17 @@ ...@@ -16,6 +16,17 @@
<item name="android:gravity">bottom</item> <item name="android:gravity">bottom</item>
</style> </style>
<style name="dialog_two" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@color/color_0000</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowIsTranslucent">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:background">@null</item>
<item name="android:backgroundDimEnabled">true</item>
</style>
<style name="loading_small" parent="@android:style/Widget.ProgressBar.Small"> <style name="loading_small" parent="@android:style/Widget.ProgressBar.Small">
<item name="android:indeterminateDrawable">@drawable/ufo_loading</item> <item name="android:indeterminateDrawable">@drawable/ufo_loading</item>
<item name="android:layout_width">25dip</item> <item name="android:layout_width">25dip</item>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<paths>
<root-path
name="root"
path="" />
<files-path
name="files"
path="" />
<external-path
name="sdcard"
path="" />
<cache-path
name="cache"
path="" />
<external-files-path
name="exFiles"
path="" />
<external-cache-path
name="exCache"
path="" />
</paths>
</resources>
\ No newline at end of file
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m
android.injected.testOnly=false
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
DEBUG_URL="http://39.97.65.143:9082/api-gm/"
#DEBUG_URL="http://192.168.31.194:8101/"
RELEASE_URL="https://api.mints-id.com/api-gm/"
RELEASE_KEY_PASSWORD=mints.goodmoney
RELEASE_KEY_ALIAS=mints_goodmoney
RELEASE_STORE_PASSWORD=mints.goodmoney
RELEASE_STORE_FILE=mints_goodmoney.jks
#ShareSDK
RELEASE_SHARESDK_KEY=310fab7ce0f62
RELEASE_SHARESDK_SECRET=f35465ed0c6da5ce2f0e7ae96f2601c2
#TalkingData
DEBUG_TD_KEY=E6AFD6917D48441886EE62ACFF463576
RELEASE_TD_KEY=E6AFD6917D48441886EE62ACFF463576
DEBUG_TD_SCHEMA_KEY=talkingdata.e6afd6917d48441886ee62acff463576
RELEASE_TD_SCHEMA_KEY=talkingdata.e6afd6917d48441886ee62acff463576
#友盟
RELEASE_UMENG_KEY=5f83c3eb80455950e4a759d3
#JPush
RELEASE_JPUSH_KEY=d1fc227e2d3ec3c7a8cafa69
android.useAndroidX=true
android.enableJetifier=true
\ 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