[提交人]：王雪伟

[提交简述] ：今晚打老鼠
[实现方案] ：过审分支

app/src/main/assets/globalCfg.json

@@ -2,7 +2,7 @@
   "slotIds": {},
   "h5_url": {
     "cate": "http://www.baidu.com",
-    "aboutUs": "http://newspool.huolea.com/sspapiNovel/su/custom/guazixiaoshuoapp/aboutMe.html",
+    "aboutUs": "https://newspool.huolea.com/sspapiNovel/su/custom/jinwandalaoshu/aboutMe.html",
     "agreement": "http://newspool.huolea.com/sspapiNovel/su/custom/guazixiaoshuoapp/privacy.html",
     "big_award": "http://app-h5.zhangxinzhixun.com/NovelCheckAwards",
     "change_detail": "https://app-h5.zhangxinzhixun.com/WithDrawRecords",

app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt

@@ -60,14 +60,14 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
         EventUtils.onEvent("show_renwu_dialog", "金币任务弹窗曝光")
         init(view)
         initView()
-        mPresenter?.getOrchardSignTask()
-        mPresenter?.getRrchardDailyTask()
         showAtLocation(
             view,
             Gravity.CENTER,
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.MATCH_PARENT
         )
+        mPresenter?.getOrchardSignTask()
+        mPresenter?.getRrchardDailyTask()
     }
 
     private fun initView() {

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

@@ -24,8 +24,8 @@ public abstract class BaseObserver<T> implements Observer<Response<T>> {
 
     @Override
     public void onNext(@NonNull Response<T> result) {
-        HashMap mParam= new HashMap<String,String>();
-        PhoneUtils.INSTANCE.addOtherParams(mParam);
+//        HashMap mParam= new HashMap<String,String>();
+//        PhoneUtils.INSTANCE.addOtherParams(mParam);
         if (TextUtils.equals(result.status, "200")) {
             if (result.result != null) {
                 onSuccess(result.result.data);

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

@@ -57,7 +57,8 @@ object GameApiClient {
         .connectTimeout(10000, TimeUnit.MILLISECONDS)
         .readTimeout(10000, TimeUnit.MILLISECONDS)
         .addInterceptor(logInterceptor.apply {
-            level =  if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
+//            level =  if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
+            level = HttpLoggingInterceptor.Level.BODY
         })
 //        .retryOnConnectionFailure(false)
         .hostnameVerifier { hostname, session ->

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

@@ -67,7 +67,7 @@ public class NetConfig {
     public static class Other {
         public static final String APP_CONFIG = "app/v1/novel/lua";
         //关于我们
-        public static String ABOUT_US_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/aboutMe.html";
+        public static String ABOUT_US_URL = "https://newspool.huolea.com/sspapiNovel/su/custom/jinwandalaoshu/aboutMe.html";
         //隐私协议
         public static String PRIVACY_PROTOCOL_URL = "http://newspool.zhangxinhulian.com/sspapiNovel/su/custom/guazixiaoshuoapp/privacy.html";
 
@@ -114,13 +114,13 @@ public class NetConfig {
 
         public static String WEB_URL_ABOUT_US;//TODO 关于我们页面
 
-        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/privacy.html";//TODO 隐私协议
+        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/jinwandalaoshu/privacy.html";//TODO 隐私协议
 
         public static String WEB_URL_FEEDBACK;//TODO 用户反馈
 
         public static String WEB_URL_CLEARINSTRUCTIONS;//TODO
 
-        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/user.html\n";//TODO 用户协议
+        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/jinwandalaoshu/user.html\n";//TODO 用户协议
 
         public static String WEB_URL_SHARE_LAND; //TODO