[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：合并巴巴农场的library

library/src/main/java/com/ym/library/Constant.java

@@ -21,9 +21,9 @@ public class Constant {
 
     //    public static final String WX_APPID = "wx4d3a3aa6fb634c17";//1.0.0版本使用的微信appid
 //    public static final String WX_APPKEY = "7c98910f81dc3cec4b992d722bdcbaf3";//1.0.0版本使用的微信key
-    public static String WX_APPID = "wx29c1884b0a06cdd5";
+    public static String WX_APPID = "wxe7a03eb52cce1b51";
     //    public static String WX_APPID = "wxcd4157d1e36f5cd8";
-    public static String WX_APPKEY = "a45ff15ec4d387fbd37740238689bd11";
+    public static String WX_APPKEY = "6fa72a89ea188c4dff5729cff328b587";
     public static String WX_SHARE_APPID = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static String WX_SHARE_APPKEY = "34fd25bb46e96eb3de04bd0c0e031e22";
     public static final String SHANYAN_KEY = "7QciptTf";
@@ -47,7 +47,7 @@ public class Constant {
 
     public static final String a = "2Lve43ngWzArs7Ql";
     public static String b;
-    public static String appLs = "5d4c121d3fe0b0e0";
+    public static String appLs= "afcbef40e31631d3";
     public static final String gender = "gender";
 
     public static int showSearch;
@@ -156,6 +156,7 @@ public class Constant {
     public static int isDialogActivity = 0; //是否弹出活动弹窗
     public static int kkz_award_render_type = 0;
     public static int qq = 0;//
+
     public static class Permission {
         public static final String PERMISSION_CAMERA = Manifest.permission.CAMERA;
 
@@ -332,6 +333,7 @@ public class Constant {
     public static int enable_global_ad = 0;//是否屏蔽广告   0关闭 1开启
 
     public static final String UPDATE_DOWNLOAD_FILE_PROGRESS = "update_download_file_progress";
+
     public static class Device {
         public static final String h = "h";
         public static final String w = "w";
@@ -366,7 +368,8 @@ public class Constant {
     }
 
     public static class Param {
-        public static String mPacketName = PhoneUtils.INSTANCE.getAppPackage();
+        //public static String mPacketName = PhoneUtils.INSTANCE.getAppPackage();
+        public static String mPacketName = "com.ym.ddcy";
         public static String vendor = Build.MANUFACTURER;
         public static String svn = Build.VERSION.SDK_INT + "";
         public static String androidId = "";
@@ -519,7 +522,7 @@ public class Constant {
     }
 
     public static class SlotId {
-         public static String withdraw_right_top_image = "withdraw_right_top_image";
+        public static String withdraw_right_top_image = "withdraw_right_top_image";
 
         /**
          * 大图codeid

library/src/main/java/com/ym/library/activity/NewWebActivity.kt

@@ -369,7 +369,7 @@ class NewWebActivity : BaseActivity(), NewWebContract.View, ScrollWebView.OnScro
     override fun onPause() {
         super.onPause()
         RxBusUtil.getDefault()
-            .send(RxBusConstant.RX_MAIN_HIGH_WATER_DROP_UPDATE)
+            .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST)
         MobclickAgent.onPause(this)
         EventUtils.onEvent("page_status", Utils.obj2Str(ReportEntity(Constant.ReportSessionId, "NewWebActivity", "onPause")))
         if (webview != null) {

library/src/main/java/com/ym/library/activity/WebActivity.kt

@@ -447,7 +447,7 @@ class WebActivity : BaseActivity(), View.OnClickListener {
         ))
         MobclickAgent.onPause(this)
         RxBusUtil.getDefault()
-            .send(RxBusConstant.RX_MAIN_HIGH_WATER_DROP_UPDATE)
+            .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST)
     }
 
     private fun queryTask() {

library/src/main/java/com/ym/library/activity/WebViewActivity.java

@@ -148,8 +148,8 @@ public class WebViewActivity extends BaseActivity {
             webView.loadUrl("javascript:onPause()");
         }
         MobclickAgent.onPause(this);
-//        RxBusUtil.getDefault()
-//                .send(RxBusConstant.RX_MAIN_HIGH_WATER_DROP_UPDATE);
+        RxBusUtil.getDefault()
+                .send(RxBusConstant.RX_SPEED_WATER_TASK_LIST);
     }
 
     @Override

library/src/main/java/com/ym/library/net/IUserApi.kt

@@ -15,7 +15,7 @@ interface IUserApi {
      *
      * @return
      */
-    @GET("api/v1/version/com.ym.xync")
+    @GET("api/v1/version/com.ym.ddcy")
     fun getVersion(): Observable<Response<VersionEntity>>
 
     /**

library/src/main/java/com/ym/library/net/NetConfig.java

@@ -176,7 +176,7 @@ public class NetConfig {
         public static final String URL_USER_GET_USERINFO_ = "app/v1/location/user/info";
         public static final String URL_TASK_ADD_COINS = "app/v2/novel/storeCoin";
         // public static final String URL_USER_WITHDRAW_BIND_WX = "app/v2/novel/setWithdrawWx";// 微信绑定
-         public static final String URL_USER_WITHDRAW_BIND_WX = "app/v1/auth/wxLogin";// 微信绑定
+        public static final String URL_USER_WITHDRAW_BIND_WX = "app/v1/auth/wxLogin";// 微信绑定
         public static final String URL_USER_ISBINDWITHDRAWWX = "/app/v1/novel/isBindWithdrawWx";// 微信是否绑定
         public static final String URL_USER_MIND = "app/v1/gs/mind";// 注意事项
         public static final String URL_USER_COIN2CASH_CHECK = "app/v1/gs/coin2cash_check";// 兑换接口
@@ -214,29 +214,34 @@ public class NetConfig {
 
     public static final String URL_GET_ADS_V3 = "v4/ads";
 
-    public static class Game{
-        public static final String URL_GAME_AD_VIDEO_REPORT="app/v1/game/report";//看视频上报
-
-        public static final String URL_GAME_BUY_SEED="app/v1/game/farm/buy_seed";//金币购买种子
-        public static final String URL_GAME_CLOUD_SPEED="app/v1/game/farm/cloud_speed";//云朵加速
-        public static final String URL_GAME_HOME_INFO="app/v1/game/farm/home_info";//首页信息
-        public static final String URL_GAME_LIST_LAND="app/v1/game/farm/list_land";//地块列表
-        public static final String URL_GAME_OPEN_BOX="app/v1/game/farm/open_box";//开宝箱
-        public static final String URL_GAME_ORDER_DATA="app/v1/game/farm/order_data";//订单数据
-        public static final String URL_GAME_ORDER_RECEIVE="app/v1/game/farm/order_receive";//订单领取
-        public static final String URL_GAME_UNLOCK_LAND="app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
-        public static final String URL_GAME_USE_ACCELERATORS="app/v1/game/farm/use_accelerators";//加速剂加速
-        public static final String URL_GAME_WAREHOUSE_DATA="app/v1/game/farm/warehouseData";//仓库列表
-        public static final String URL_GAME_TURNTABLE_LIST="app/v1/game/farm/turntable_list";//转盘列表
-        public static final String URL_GAME_FARM_LOTTERY="app/v1/game/farm/lottery";//转盘抽奖
-        public static final String URL_GAME_FARM_LIST="app/v1/game/farm/sign_list";//签到列表
-        public static final String URL_GAME_FARM_DAILY_TASK="app/v1/game/farm/daily_task";//每日任务
-
-        public static final String URL_GAME_INCR_SEED="app/v1/game/farm/incr_seed";//看视频获得种子
-        public static final String URL_GAME_INCR_ACCELERATORS="app/v1/game/farm/incr_accelerators";//看视频获得加速剂
-        public static final String URL_GAME_DAILY_TASK_RECEIVE="app/v1/game/farm/daily_task_receive";//看视频获得加速剂
-        public static final String URL_GAME_FARM_RANK_RECEIVE="app/v1/game/farm/rank_receive";//排行榜领取
-
-
+    public static class Game {
+        public static final String URL_GAME_AD_VIDEO_REPORT = "app/v1/game/report";//看视频上报
+
+        public static final String URL_GAME_BUY_SEED = "app/v1/game/farm/buy_seed";//金币购买种子
+        public static final String URL_GAME_CLOUD_SPEED = "app/v1/game/farm/cloud_speed";//云朵加速
+        public static final String URL_GAME_HOME_INFO = "app/v1/game/farm/home_info";//首页信息
+        public static final String URL_GAME_LIST_LAND = "app/v1/game/farm/list_land";//地块列表
+        public static final String URL_GAME_OPEN_BOX = "app/v1/game/farm/open_box";//开宝箱
+        public static final String URL_GAME_ORDER_DATA = "app/v1/game/farm/order_data";//订单数据
+        public static final String URL_GAME_ORDER_RECEIVE = "app/v1/game/farm/order_receive";//订单领取
+        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
+        public static final String URL_GAME_USE_ACCELERATORS = "app/v1/game/farm/use_accelerators";//加速剂加速
+        public static final String URL_GAME_WAREHOUSE_DATA = "app/v1/game/farm/warehouseData";//仓库列表
+        public static final String URL_GAME_TURNTABLE_LIST = "app/v1/game/farm/turntable_list";//转盘列表
+        public static final String URL_GAME_FARM_LOTTERY = "app/v1/game/ddcy/lottery";//转盘抽奖
+        public static final String URL_GAME_FARM_LIST = "app/v1/game/farm/sign_list";//签到列表
+        public static final String URL_GAME_FARM_DAILY_TASK = "app/v1/game/farm/daily_task";//每日金币任务
+        public static final String URL_GAME_ACCELERATORS_TASK = "app/v1/game/ddcy/accelerators_task ";//每日加速剂任务
+
+        public static final String URL_GAME_INCR_SEED = "app/v1/game/farm/incr_seed";//看视频获得种子
+        public static final String URL_GAME_INCR_ACCELERATORS = "app/v1/game/farm/incr_accelerators";//看视频获得加速剂
+        public static final String URL_GAME_DAILY_TASK_RECEIVE = "app/v1/game/farm/daily_task_receive";//看视频获得加速剂
+        public static final String URL_GAME_FARM_RANK_RECEIVE = "app/v1/game/farm/rank_receive";//排行榜领取
+        public static final String URL_GAME_THIRD_PARTY = "app/v1/game/third_party";//加速剂任务看视频
+
+        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
+        public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口
+        public static final String URL_GAME_WD_HISTORY = "app/v1/game/farm/wd_history";//兑换记录
+        public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receive";//兑换记录
     }
 }

library/src/main/java/com/ym/library/rxbus/RxBusConstant.java

@@ -40,4 +40,9 @@ public class RxBusConstant {
     public final static int RX_MAIN_WATER_DROP_UPDATE = 10008;
     //MainFragment 高额水滴领取后刷新
     public final static int RX_MAIN_HIGH_WATER_DROP_UPDATE = 10004;
+
+    //提现列表
+    public final static int RX_WITH_DRAW_LIST = 30001;
+    public final static int RX_SPEED_WATER_TASK_LIST = 30002;
+
 }

library/src/main/java/com/ym/library/utils/PhoneUtils.kt

@@ -853,7 +853,7 @@ object PhoneUtils {
 //        params.put("appLs", Constant.appLs)
         params.put(Constant.Device.uid, SettingPreference.getUid())
         params.put(Constant.Device.token, SettingPreference.getToken())
-        params.put(Constant.Device.pkg, AppliContext.get().packageName)
+        params.put(Constant.Device.pkg, Constant.Param.mPacketName)
         params.put(Constant.Device.aid, SettingPreference.getAndroidId())
         params.put(Constant.Device.imei, SettingPreference.getImei())
         params.put(Constant.Device.device, SettingPreference.getDevice())