1.0.7发版

highgold/app/build.gradle

@@ -190,14 +190,6 @@ dependencies {
     implementation 'com.sunfusheng:MarqueeView:1.4.1'
     // 透明指示层
     implementation 'me.toptas.fancyshowcase:fancyshowcaseview:1.1.5'
-    // 极光推送
-    implementation 'cn.jiguang.sdk:jpush:3.0.9'
-    implementation 'cn.jiguang.sdk:jcore:1.1.7'
-    // 支付宝 SDK AAR 包所需的配置
-//    implementation(name: 'alipaySdk-15.6.8-20191021122514', ext: 'aar')
-    implementation(name: 'alipaySdk-15.7.4-20200228192319-noUtdid', ext: 'aar')
-    // 广点通广告 腾讯
-    implementation(name: 'GDTSDK.unionNormal.4.191.1061', ext: 'aar')
     // jsbridge
     implementation 'com.github.lzyzsd:jsbridge:1.0.4'
     // 阴影库-ShadowLayout
@@ -218,13 +210,18 @@ dependencies {
     implementation files('libs/sun.misc.BASE64Decoder.jar')
 
 
+
     // 三方接入
-    // 立言积分广告
-//    implementation(name: 'lycoin-release-v1.4.3', ext: 'aar')
     // 穿山甲广告
     implementation(name: 'open_ad_sdk', ext: 'aar')
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.6'
-
+    // 极光推送
+    implementation 'cn.jiguang.sdk:jpush:3.0.9'
+    implementation 'cn.jiguang.sdk:jcore:1.1.7'
+    // 支付宝 SDK AAR 包所需的配置
+    implementation(name: 'alipaySdk-15.7.4-20200228192319-noUtdid', ext: 'aar')
+    // 广点通广告 腾讯
+    implementation(name: 'GDTSDK.unionNormal.4.191.1061', ext: 'aar')
     // shareSdk
     implementation project(':shareSdkLib')
     // umeng
@@ -236,46 +233,34 @@ dependencies {
     implementation files('libs/smantifraud.aar')
     // 高德地图
     implementation files('libs/AMap_Location_V4.6.0_20190423.jar')
-
     // 移动安全联盟
     implementation(name: 'msa_mdid_1.0.13', ext: 'aar')
-
     // 猎豹游戏
     implementation(name: 'cmgame-sdk-tt2103-1.1.8', ext: 'aar')
     // 增加X5，可以提高在android5.0和5.1下的游戏体验，webview比默认的做了很多优化
     implementation(name: 'x5fit-1.1.8', ext: 'aar')
     implementation files("libs/qq_x5.jar")   // x5版本：20190429_175122
-
     // 鱼丸盒子
     implementation(name: 'xzzq_ywsdk_1.0.6', ext: 'aar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
     implementation 'com.liulishuo.filedownloader:library:1.6.8'
     implementation "org.greenrobot:eventbus:3.1.0-RC"
-
     // 愉悦推
 //    implementation(name: 'mduisdk_2.3.1.10', ext: 'aar')
     // 愉悦推 微信小程序sdk
 //    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-
-
     // 百度视频
 //    implementation(name: 'lib-bdvsdk-release', ext: 'aar')
 //    implementation 'com.android.support:support-v4:27.1.1'
 //    implementation 'com.githang:status-bar-compat:0.7'
 //    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'
 //    implementation 'com.baidu.mobstat:mtj-sdk-circle:latest.integration'
-
-
     // 一览视频
     implementation "com.yilan.sdk:ui:1.9.0.2"//修改为具体的sdk版本
     implementation "com.yilan.sdk:ad:1.9.0.2"//修改为具体的sdk版本,支持广点通、百度广告
     implementation('com.aliyun.ams:alicloud-android-httpdns:1.2.3@aar') {
         transitive true
     }
-//    implementation('com.aliyun.ams:alicloud-android-httpdns:1.2.3', {
-//        exclude group: 'com.ta.utdid2'
-//        exclude group: 'com.ut.device'
-//    })
     //支持ijkplayer进行播放，建议添加
     implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.8'
@@ -283,7 +268,6 @@ dependencies {
     implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.8.8'
-
     // Mintegral 广告
     implementation 'com.mintegral.msdk:videojs:10.2.41'
     implementation 'com.mintegral.msdk:mtgjscommon:10.2.41'
@@ -299,17 +283,12 @@ dependencies {
     implementation 'com.mintegral.msdk:nativeex:10.2.41'
     implementation 'com.mintegral.msdk:interstitialvideo:10.2.41'
     implementation 'com.mintegral.msdk:interactiveads:10.2.41'
-    // 开发者后台创建App勾选APK为YES则加上mtgdownloads依赖
     implementation 'com.mintegral.msdk:mtgdownloads:10.2.41'
-
-
     // 推啊广告
     implementation('com.tuia:sdk:2.0.1.0') {
         transitive = true
         exclude group: 'com.google.code.gson'
     }
-
-
     // 珊瑚广告
 //    implementation(name:'adapt-1.3.3', ext:'aar')
 //    implementation(name:'commonbase-1.0.2', ext:'aar')

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/DrawcashPresenter.java

@@ -122,9 +122,13 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
     /**
      * 金币/积分兑换
      */
-    public void addCashoutReq(double cash, String paymentType) {
+    public void addCashoutReq(double cash, String paymentType, int curBtnNum) {
 
         HashMap<String, Object> vo = new HashMap<>();
+        if (curBtnNum > 3) {
+            // 钻石
+            vo.put("useType", "useDiamonds");
+        }
         vo.put("cash", cash);
         if (TextUtils.equals(paymentType, "weixin")) {
             vo.put("payChannel", "WEIXIN");
@@ -176,8 +180,9 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
      *
      * @param context
      * @param curCash
+     * @param curBtnNum
      */
-    public void saveTerminalInfo(Context context, double curCash, String paymentType) {
+    public void saveTerminalInfo(Context context, double curCash, String paymentType, int curBtnNum) {
         view.showLoading("加载中...");
 
         HashMap<String, Object> vo = new HashMap<>();
@@ -261,7 +266,7 @@ public class DrawcashPresenter extends BasePresenter<DrawcashView> {
                                 String message = baseResponse.getMessage();
                                 switch (code) {
                                     case 200://成功
-                                        addCashoutReq(curCash, paymentType);
+                                        addCashoutReq(curCash, paymentType, curBtnNum);
                                         break;
                                     default:
                                         view.showToast(message);

highgold/app/src/main/java/com/mints/highgold/mvp/presenters/GoldTryPresenter.java

@@ -58,7 +58,7 @@ public class GoldTryPresenter extends BasePresenter<GoldTryView> {
      * 收入记录
      */
     public void getCoinRecords() {
-        view.showLoading("加载中...");
+//        view.showLoading("加载中...");
 
         AppHttpManager.getInstance(loanApplication)
                 .call(loanService.getCoinRecords(),

highgold/app/src/main/java/com/mints/highgold/ui/activitys/DrawcashActivity.java

@@ -120,6 +120,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
     private boolean cashOut1yuan = false;//true-提现过0.1元
     private boolean cashOut2yuan = false;//true-提现过100元
     private boolean cashOut4yuan = false;//true-提现过1元
+    private boolean cashOut5yuan = false;//true-提现过5元
 
     private String paymentType = "weixin";
     private WXInfo wxInfo = null;
@@ -251,6 +252,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
             DrawcashBean.CashOutMoneyArrBean moneyArrBean3 = cashOutDiamondsArr.get(2);
 
             cashOut4yuan = moneyArrBean1.isCanUseOnce();
+            cashOut5yuan = moneyArrBean2.isCanUseOnce();
 
             drawcash4 = moneyArrBean1.getMoney();
             drawcash5 = moneyArrBean2.getMoney();
@@ -300,6 +302,10 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
             btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
             btnDrawcashFour.setEnabled(false);
         }
+        if (!cashOut5yuan) {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
+            btnDrawcashFive.setEnabled(false);
+        }
 
         // 微信为默认支付方式
         if (TextUtils.equals(paymentType, "weixin")) {
@@ -577,7 +583,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
                                     }
                                 }
 
-                                drawcashPresenter.saveTerminalInfo(getContext(), curCash, paymentType);
+                                drawcashPresenter.saveTerminalInfo(getContext(), curCash, paymentType,curBtnNum);
                             } else {
                                 showMissingPermissionDialog("设备,地理位置");
                             }
@@ -632,7 +638,11 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         } else {
             btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
         }
-        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
+        if (cashOut5yuan) {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_none));
+        } else {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
+        }
         btnDrawcashSix.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
         btnDrawcashHint.setText("所需金币:" + (int) (drawcash1 * 10000));
 
@@ -654,7 +664,11 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         } else {
             btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
         }
-        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
+        if (cashOut5yuan) {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_none));
+        } else {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
+        }
         btnDrawcashSix.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
         btnDrawcashHint.setText("所需金币:" + (drawcash2 * 10000));
 
@@ -680,7 +694,11 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         } else {
             btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
         }
-        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
+        if (cashOut5yuan) {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_none));
+        } else {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
+        }
         btnDrawcashSix.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
         btnDrawcashHint.setText("所需金币:" + (drawcash3 * 10000));
         setDrawLayout(cash);
@@ -701,7 +719,11 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         }
         btnDrawcashThree.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
         btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_enable));
-        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
+        if (cashOut5yuan) {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_none));
+        } else {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
+        }
         btnDrawcashSix.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
         btnDrawcashHint.setText("所需钻石:" + (drawcash4 * 10000));
         setDrawLayout(cash);
@@ -725,7 +747,7 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         } else {
             btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
         }
-        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_enable));
+        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_enable));
         btnDrawcashSix.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
         btnDrawcashHint.setText("所需钻石:" + (drawcash5 * 10000));
         setDrawLayout(cash);
@@ -750,7 +772,11 @@ public class DrawcashActivity extends BaseActivity implements DrawcashView, OnLo
         } else {
             btnDrawcashFour.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
         }
-        btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_none));
+        if (cashOut5yuan) {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_none));
+        } else {
+            btnDrawcashFive.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_new_dont));
+        }
         btnDrawcashSix.setBackground(getResources().getDrawable(R.mipmap.ic_drawcash_enable));
         btnDrawcashHint.setText("所需钻石:" + (drawcash6 * 10000));
         setDrawLayout(cash);

highgold/app/src/main/java/com/mints/highgold/ui/adapter/GoldRecordAdapter.java

@@ -87,10 +87,10 @@ public class GoldRecordAdapter extends BaseAdapter {
                 case 0://增加
                     if(data.getRewardType()==0){
                         // 0-金币
-                        viewHolder.tv_goldrecord_cash.setText("金币");
+                        viewHolder.tv_goldrecord_cash_type.setText("金币");
                         viewHolder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(context, R.color.main_mints));
                     }else{
-                        viewHolder.tv_goldrecord_cash.setText("钻石");
+                        viewHolder.tv_goldrecord_cash_type.setText("钻石");
                         viewHolder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(context, R.color.versus_task_play_text));
                     }
                     viewHolder.tv_goldrecord_cash.setText("+" + data.getUnitCoin());
@@ -99,9 +99,9 @@ public class GoldRecordAdapter extends BaseAdapter {
                 default://减少
                     if(data.getRewardType()==0){
                         // 0-金币
-                        viewHolder.tv_goldrecord_cash.setText("金币");
+                        viewHolder.tv_goldrecord_cash_type.setText("金币");
                     }else{
-                        viewHolder.tv_goldrecord_cash.setText("钻石");
+                        viewHolder.tv_goldrecord_cash_type.setText("钻石");
                     }
 
                     viewHolder.tv_goldrecord_cash.setText("-" + data.getUnitCoin());

highgold/app/src/main/res/layout/activity_drawcash.xml

@@ -267,13 +267,14 @@
                     </LinearLayout>
 
                     <LinearLayout
+                        android:visibility="gone"
                         android:id="@+id/ll_drawcash_diamond"
+                        android:paddingTop="50pt"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="#90000000"
+                        android:background="#50000000"
                         android:gravity="center"
-                        android:orientation="vertical"
-                        android:visibility="gone">
+                        android:orientation="vertical">
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -289,10 +290,10 @@
                             android:id="@+id/tv_drawcash_diamond_hint"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16pt"
+                            android:layout_marginTop="60pt"
                             android:text="观看任意5个广告视频即可激活(0/5)"
                             android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            android:textSize="16sp" />
                     </LinearLayout>
                 </FrameLayout>