1.2.3 添加小满科技

GoodMoney/app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.mints.goodmoney"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 23
-        versionName "1.2.2"
+        versionCode 24
+        versionName "1.2.3"
         flavorDimensions "default"
 
         // dex突破65535的限制

GoodMoney/app/src/main/java/com/mints/goodmoney/InitAppService.kt

@@ -9,7 +9,6 @@ import cn.jpush.android.api.JPushInterface
 import com.downloader.PRDownloader
 import com.downloader.PRDownloaderConfig
 import com.mints.goodmoney.manager.BxmManager.initBxm
-import com.mints.goodmoney.ui.widgets.CircleImageView
 import com.mob.MobSDK
 
 /**

GoodMoney/app/src/main/java/com/mints/goodmoney/common/AppConfig.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.common;
 /**
  * 描述：配置app设置开关
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public class AppConfig {
@@ -84,11 +83,11 @@ public class AppConfig {
     /**
      * csjFull 剩余广告播放数
      */
-    public static int csjFullVideoAdCount = 5;
+    public static int csjFullVideoAdCount = 0;
     /**
      * flVideo 剩余广告播放数
      */
-    public static int flVideoAdCount = 5;
+    public static int flVideoAdCount = 0;
     /**
      * shVideo 剩余广告播放数
      */

GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt

@@ -251,4 +251,8 @@ object Constant {
 
     // 蘑菇星球引导页
     const val MOKU_FLAG_GUIDE = "moku_flag_guide"
+
+    //page
+    const val ACTIVITY_ID = "activity_id"
+    const val ACTIVITY_TITLE = "activity_title"
 }

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java

@@ -44,6 +44,7 @@ public class TtCsjAdManager {
     public static String TT_AD_VEDIO_SMALLHOMEVEDIO = "945744186";// 短视频翻倍
     public static String TT_AD_VEDIO_KYLVEDIO = "945791766";// 来电秀视频
     public static String TT_AD_VEDIO_READ = "945997554";// 听读
+    public static String TT_AD_VEDIO_XIAOMAN = "946012845";// 小满科技
     /*全屏视频*/
     public static String TT_AD_FULLVEDIO_ALL = "945752969";// 通用
     /*信息流*/

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/YlhAdManager.kt

@@ -36,6 +36,7 @@ object YlhAdManager {
     var YLH_AD_VEDIO_HOMEVEDIO_POSTID= "4051451341464487" // 首页视频翻倍
     var YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID= "9051152341362610" // 短视频翻倍
     var YLH_AD_VEDIO_KYLVEDIO_POSTID= "8001950728967276" // 来电秀视频
+    var YLH_AD_VEDIO_XIAOMAN_POSTID= "3081971852112087" // 小满科技
 
     /*信息流*/
     var YLH_AD_NATIVEEXPRESS_JULEYUN = "8041941770890627" //聚乐云

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/BaseResponse.java

@@ -5,7 +5,6 @@ import java.io.Serializable;
 /**
  * 描述：BaseResponse
  * 作者：孟崔广
- * 时间：2017/10/10 10:51
  * 邮箱：mengcga@163.com
  */
 public class BaseResponse<T> implements Serializable {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/Presenter.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.mvp.presenters;
 /**
  * 描述：Presenter
  * 作者：孟崔广
- * 时间：2017/10/10 10:51
  * 邮箱：mengcga@163.com
  */
 public interface Presenter<V> {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/VersionUpdatePresenter.java

@@ -43,7 +43,6 @@ import rx.android.schedulers.AndroidSchedulers;
 /**
  * 描述：版本更新
  * 作者：孟崔广
- * 时间：2017/10/10 10:51
  * 邮箱：mengcga@163.com
  */
 public class VersionUpdatePresenter {

GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/BaseView.java

@@ -5,7 +5,6 @@ import com.mints.goodmoney.MintsApplication;
 /**
  * 描述：BaseView
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public interface BaseView {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt

@@ -318,9 +318,8 @@ class DrawcashActivity : BaseActivity(),
                 "ksWeight:${data.kS_VEDIO}"
         )
         // 广告视频数
-        AppConfig.csjVideoAdCount = 10
-        AppConfig.ylhAdCount = 10
-        AppConfig.csjFullVideoAdCount = 10
+        AppConfig.csjVideoAdCount = 5
+        AppConfig.ylhAdCount = 5
     }
 
     /**

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/BannerBaseAdapter.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 /**
  * @author Pinger
- * @since 2017/3/8 0008 下午 6:29
  * ViewPager基类适配器，需要传入Item视图和数据
  */
 public abstract class BannerBaseAdapter<T> extends PagerAdapter {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt

@@ -949,8 +949,8 @@ class MyFragment : BaseFragment(),
                     Constant.HOT_ACTIVITY_SHEEP -> {
                         XmManager.exprotClick(hotBean.xmPlaceId)
                         val bundle = Bundle()
-                        bundle.putString(Constant.MAIN_CARRIER_TITLE, hotBean.title)
-                        bundle.putString(Constant.MAIN_CARRIER_TYPE, hotBean.xmPlaceId)
+                        bundle.putString(Constant.ACTIVITY_TITLE, hotBean.title)
+                        bundle.putString(Constant.ACTIVITY_ID, hotBean.xmPlaceId)
                         readyGo(XiaomanActivity::class.java, bundle)
                     }
                     Constant.HOT_ACTIVITY_WATER -> {
@@ -1284,6 +1284,7 @@ class MyFragment : BaseFragment(),
         AppConfig.shVideoAdCount = data.vedioRules.corAl_VIDEO.surplus
         AppConfig.ksVideoAdCount = data.vedioRules.kS_VEDIO.surplus
         AppConfig.rtaVideoAdCount = data.vedioRules.rtA_VEDIO.surplus
+        AppConfig.csjFullVideoAdCount = data.vedioRules.csjfulL_VEDIO.surplus
         LogUtil.d(TAG, "首页视频数：csjCount:${AppConfig.csjVideoAdCount}    " +
                 "ylhCount:${AppConfig.ylhAdCount}    " +
                 "sdhzCount:${AppConfig.wnVideoAdCount}    " +

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/BannerView.java

@@ -3,7 +3,6 @@ package com.mints.goodmoney.ui.widgets;
 /*
  * Author:   renjinlong
  * Email:    chinarenlong@foxmail.com
- * Date:     2017/8/15
  * Description:
  */
 
@@ -38,7 +37,6 @@ import java.lang.reflect.Field;
 
 /**
  * @author Pinger
- * @since 2017/3/8 0008 下午 3:26
  * 自定义无限轮转的海报控件，抽离了适配器和滑动事件，更加轻便。
  * 请在布局使用当前类，相关属性可以通过布局或者代码设置，
  * 适配器继承BannerBaseAdapter，指定数据类型，填充布局即可

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/dialog/BaseDialog.java

@@ -10,7 +10,6 @@ import androidx.annotation.StyleRes;
 /**
  * 描述：dialog屏幕适配
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public abstract class BaseDialog extends Dialog {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/dialog/LoadingDialog.java

@@ -18,7 +18,6 @@ import com.mints.goodmoney.R;
 /**
  * 描述：加载中dialog
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public class LoadingDialog extends Dialog {

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/seekbar/BubbleConfigBuilder.java

@@ -11,7 +11,6 @@ import static com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils.sp2px;
 /**
  * config BubbleSeekBar's attributes
  * <p/>
- * Created by woxingxiao on 2017-03-14.
  */
 public class BubbleConfigBuilder {
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/wheelsruf/listener/RotateListener.java

@@ -4,7 +4,6 @@ import android.animation.ValueAnimator;
 import android.widget.ImageView;
 
 /**
- * Created by cretin on 2017/12/27.
  * 用于回调动画过程和结果
  */
 

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/wheelsruf/view/WheelSurfPanView.java

@@ -27,10 +27,6 @@ import com.mints.goodmoney.ui.widgets.wheelsruf.listener.RotateListener;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by cretin on 2017/12/26.
- */
-
 public class WheelSurfPanView extends View {
     private Context mContext;
     //记录视图的大小

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/wheelsruf/view/WheelSurfView.java

@@ -19,10 +19,6 @@ import com.mints.goodmoney.ui.widgets.wheelsruf.listener.RotateListener;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by cretin on 2017/12/26.
- */
-
 public class WheelSurfView extends RelativeLayout {
     //当前的圆盘VIew
     private WheelSurfPanView mWheelSurfPanView;

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/MiscUtil.java

@@ -4,10 +4,6 @@ import android.content.Context;
 import android.graphics.Paint;
 import android.view.View;
 
-/**
- * Created by littlejie on 2017/2/22.
- */
-
 public class MiscUtil {
 
     /**

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/PermissionUtils.java

@@ -15,8 +15,6 @@ import java.util.List;
 
 /**
  * Desction:授权工具类
- * Author:pengjianbo
- * Date:2017/1/15 AM2:39
  */
 public class PermissionUtils {
 

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ToastUtil.java

@@ -16,7 +16,6 @@ import com.mints.goodmoney.R;
 /**
  * 描述：Toast
  * 作者：孟崔广
- * 时间：2017/10/10 17:51
  * 邮箱：mengcga@163.com
  */
 public class ToastUtil {

GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ToolUtil.java

@@ -181,7 +181,6 @@ public class ToolUtil {
      * 数字格式化显示
      * 小于万默认显示 大于万以1.7万方式显示最大是9999.9万
      * 大于亿以1.1亿方式显示最大没有限制都是亿单位
-     * make by dongxh 2017年12月28日上午10:05:22
      * </pre>
      *
      * @param num   格式化的数字

GoodMoney/build.gradle

@@ -53,8 +53,8 @@ buildscript {
             url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
         }
 
+        // 添加小满科技
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven { url "https://jitpack.io" }
         maven { url "https://maven.google.com"}
         maven { url "https://maven.linzhuxin.com/repository/lzoom_read_sdk_prd/"}
     }