[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：修改空指针

app/src/main/java/com/ym/game/activity/SplashActivity.kt

@@ -101,11 +101,11 @@ class SplashActivity : BaseActivity(), SplashContract.View {
                     }
 
                     override fun onAdClicked(data: NewsEntity) {
-
+                        Log.e("huang", "onAdClicked()")
                     }
 
                     override fun onAdShow(data: NewsEntity) {
-
+                        Log.e("huang", "onAdShow()")
                     }
 
                     override fun onAdSkip() {

app/src/main/java/com/ym/game/application/BaseApplication.kt

@@ -31,7 +31,7 @@ class BaseApplication : MultiDexApplication() {
         //第一步初始化 application
         AppliContext.init(this)
         Config.init(this)
-        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
 
         Constant.appLs = "a03d5320d905cf3b"//appls
         AdManager.init(//TODO 替换id

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

@@ -121,7 +121,6 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                     3 -> dismiss()
                     6 -> {
                         dismiss()
-                        EventUtils.onEvent("click_welfare_task_video_btn","福利任务视频")
                         JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false)
                     }
                     4 -> {

library/src/main/java/com/ym/library/utils/WxImplUtils.java

@@ -83,9 +83,11 @@ public class WxImplUtils implements UMAuthListener {
                         }
 
                         UserInfoEntity user = SettingPreference.getUserInfoData();
-                        user.setBind(true);
-                        user.setHeadimgurl(data.get("iconurl"));
-                        user.setNickname(data.get("screen_name"));
+                        if (user!=null){
+                            user.setBind(true);
+                            user.setHeadimgurl(data.get("iconurl"));
+                            user.setNickname(data.get("screen_name"));
+                        }
                         SettingPreference.saveUserInfo(user);
                         SettingPreference.saveUserInfoName(data.get("screen_name"));
                         mCallback.onWxSuccess(data.get("access_token"), data.get("openid"));

library/src/main/res/layout/activity_webview.xml

@@ -35,5 +35,9 @@
         android:id="@+id/activity_webview_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal" />
+        android:orientation="horizontal" >
+
+
+
+    </LinearLayout>
 </LinearLayout>