优化开屏广告与弹窗广告

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -148,6 +148,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     private VersionInfo versionInfo;
 
     private void loadVersionInfo() {
+        if(version_item_tv == null){
+            return;
+        }
         String appVersonName = ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance());
         String serviceVersionName;
         if (versionInfo == null || TextUtils.isEmpty(serviceVersionName = versionInfo.getVersion_number())) {

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -44,6 +44,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -244,9 +245,12 @@ public class CommonUtil {
     public String getValue(String json){
         try{
             JSONObject jsonObject = JSONObject.parseObject(json);
-            for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
-                System.out.println(entry.getKey() + ":" + entry.getValue());
-                return (String)  entry.getValue();
+            if(jsonObject != null) {
+                Set<Map.Entry<String, Object>> set = jsonObject.entrySet();
+                for (Map.Entry<String, Object> entry : set) {
+                    System.out.println(entry.getKey() + ":" + entry.getValue());
+                    return (String) entry.getValue();
+                }
             }
         }catch (Exception e){
             e.printStackTrace();

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1138,6 +1138,7 @@ public class Jump2View {
     public void gotoUserLabelList(Activity activity, BaseMessage baseMessage) {
         Intent intent = new Intent(activity, ActUserLabelList.class);
         activity.startActivity(intent);
+        activity.finish();
     }
 
     public void checkLabel(final Activity activity, final Action1<BaseMessage> action1) {

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -369,7 +369,7 @@ public class ViewUtil {
             VideoView ad_video_view = view.findViewById(R.id.ad_video_view);
             TextView ad_msg = view.findViewById(R.id.ad_msg);
             final TextView ad_skip = view.findViewById(R.id.ad_skip);
-            TextView know_ad_tv = view.findViewById(R.id.know_ad_tv);
+            View dialog_rl = view.findViewById(R.id.dialog_rl);
 
 //            SurfaceHolder holder = ad_video_view.getHolder();
 //            holder.setFixedSize(ad_video_view.getWidth(), ad_video_view.getWidth()*3/4);
@@ -404,7 +404,7 @@ public class ViewUtil {
                                 dialog.setCancelable(true);
                                 dialog_close.setVisibility(View.VISIBLE);
                                 ad_skip.setEnabled(true);
-                                ad_skip.setText("跳过");
+                                ad_skip.setVisibility(View.GONE);
                             }
 
                             @Override
@@ -426,7 +426,7 @@ public class ViewUtil {
                 }
             });
 
-            know_ad_tv.setOnClickListener(new View.OnClickListener() {
+            dialog_rl.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     SplashAct.goAdLink(ActivityManager.getInstance().currentActivity(), advertising);

app/src/main/java/com/sheep/gamegroup/view/activity/ActUserLabelList.java

@@ -158,6 +158,7 @@ public class ActUserLabelList extends BaseActivity {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
                                 LogUtil.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                Jump2View.getInstance().goHomePageView(ActUserLabelList.this, null);
                                 finish();
                             }
 
@@ -169,9 +170,4 @@ public class ActUserLabelList extends BaseActivity {
                         });
     }
 
-    @Override
-    public void finish() {
-        Jump2View.getInstance().goHomePageView(ActUserLabelList.this, null);
-        super.finish();
-    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/RealNameAuthenAct.java

@@ -41,6 +41,7 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -151,6 +152,20 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
 
         }
         EventBus.getDefault().post(change);
+        updateUserInfo(new Action1<BaseMessage>(){
+
+            @Override
+            public void call(BaseMessage s) {
+                if(s != null)
+                    if (whereFrom == 1) {
+                        Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this, 1);
+                    }
+                finish();
+            }
+        });
+    }
+
+    private void updateUserInfo(final Action1<BaseMessage> action1) {
         SheepApp.get(RealNameAuthenAct.this)
                 .getNetComponent()
                 .getApiService()
@@ -161,22 +176,24 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage.getMsg() + "");
-                        finish();
+                        if(action1 != null)
+                            action1.call(null);
 
                     }
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         UserEntity userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
-                        try {
-                            MyDbManager.getInstance().saveOrUpdateUser(userEntity);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        if (whereFrom == 1) {
-                            Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this, 1);
+                        if(userEntity != null) {
+                            mEntity = userEntity;
+                            try {
+                                MyDbManager.getInstance().saveOrUpdateUser(userEntity);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                         }
-                        finish();
+                        if(action1 != null)
+                            action1.call(baseMessage);
                     }
                 });
     }
@@ -184,6 +201,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @Override
     public void NetError(int code, String errorMsg) {
         hideProgress();
+        updateUserInfo(null);
         G.showToast(errorMsg);
     }
 
@@ -215,15 +233,8 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
             G.showToast(R.string.unknown_error);
             return;
         }
-        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA,"你已执行%d次实名认证操作",mEntity.getCertification_count()))
-                .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵阳币作为认证费用，请务必谨慎填写认证信息。")
-                .setBtnLeftText("返回修改").setBtnRightText("确认提交")
-                .setBtnRightOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        toNext();
-                    }
-                }));
+        map.clear();
+        toNext();
     }
 
     public void toNext() {
@@ -265,8 +276,16 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         }
         map.put("bank_card_mobile", bankCardMobile);
 
-        presenter.getTask(map);
-        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION);
+        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("重要提示").setMsgMore(String.format(Locale.CHINA,"你已执行%d次实名认证操作",mEntity.getCertification_count()))
+                .setMsg("实名认证首次免费。请务必确认您所提交的认证信息真实有效。若因信息填写错误造成认证失败。再次申请认证时需扣除您0.5元绵阳币作为认证费用，请务必谨慎填写认证信息。")
+                .setBtnLeftText("返回修改").setBtnRightText("确认提交")
+                .setBtnRightOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        presenter.getTask(map);
+                        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION);
+                    }
+                }));
     }
 
 

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -55,7 +55,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     ImageView splash_bg;
     @BindView(R.id.splash_skip)
     TextView splash_skip;
-    @BindView(R.id.splash_know_ad_tv)
+//    @BindView(R.id.splash_know_ad_tv)
     TextView splash_know_ad_tv;
 
 
@@ -92,6 +92,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     @Override
     protected void onStart() {
         super.onStart();
+        LogUtil.println("SplashAct onStart");
         requestCodePermissions();
     }
 
@@ -118,7 +119,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     };
 
     private void gotoNext() {
-        if (!isClick) {
+        if (!isClick && btnJoin.isEnabled()) {
             isClick = true;
             Jump2View.getInstance().gotoGuide(activity);
         }
@@ -205,15 +206,17 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         }
 
         splash_skip.setVisibility(View.VISIBLE);
-        splash_know_ad_tv.setVisibility(View.VISIBLE);
+        if(splash_know_ad_tv != null)
+            splash_know_ad_tv.setVisibility(View.VISIBLE);
         if(advertising.getShow_time() > 0)
             timer = RxjavaCountDownTimer.getInstance(advertising.getShow_time())
                     .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
                         @Override
                         public void onFinish() {
                             splash_skip.setEnabled(true);
-                            splash_skip.setText("跳过");
+                            splash_skip.setVisibility(View.GONE);
                             btnJoin.setVisibility(View.VISIBLE);
+                            mHandler.sendEmptyMessageDelayed(0, 1000);
                         }
 
                         @Override
@@ -272,22 +275,21 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         startActivity(intent);
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-    }
 
-    @OnClick({R.id.btn_join, R.id.splash_skip, R.id.splash_know_ad_tv})
+    @OnClick({R.id.btn_join, R.id.splash_skip, R.id.splash_know_ad_tv, R.id.splash_bg, R.id.splash_video_view,R.id.splash_click_view})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.btn_join:
             case R.id.splash_skip:
                 gotoNext();
                 break;
+            case R.id.splash_bg:
+            case R.id.splash_video_view:
             case R.id.splash_know_ad_tv:
-                Jump2View.getInstance().gotoMain(activity);
-                goAdLink(activity, advertising);
-                finish();
+            case R.id.splash_click_view:
+                if(advertising != null) {
+                    goAdLink(activity, advertising);
+                }
                 break;
         }
     }

app/src/main/res/layout/act_my_money.xml

@@ -92,7 +92,7 @@
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:padding="10dp"
-                    android:src="@mipmap/faq"/>
+                    android:src="@mipmap/question_mark"/>
             </LinearLayout>
 
             <TextView

app/src/main/res/layout/dialog_half_screen_ad.xml

@@ -4,30 +4,39 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/ad_skip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_margin="@dimen/content_padding_20"
-        android:background="@drawable/shape_ash_solid_rectangle_small"
-        android:paddingBottom="2dp"
-        android:paddingEnd="@dimen/content_padding_15"
-        android:paddingStart="@dimen/content_padding_15"
-        android:paddingTop="2dp"
-        android:text="跳过"
-        android:textColor="#918F8F"
-        android:textSize="14sp" />
-    <ImageView
-        android:id="@+id/ad_iv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"/>
-    <VideoView
-        android:id="@+id/ad_video_view"
+    <RelativeLayout
+        android:id="@+id/dialog_rl"
         android:layout_width="match_parent"
-        android:layout_height="300dp" />
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/ad_iv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY" />
+
+        <VideoView
+            android:id="@+id/ad_video_view"
+            android:layout_width="match_parent"
+            android:layout_height="300dp" />
+        <TextView
+            android:id="@+id/ad_skip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentTop="true"
+            android:layout_margin="@dimen/content_padding_10"
+            android:background="@drawable/shape_ash_solid_rectangle_small"
+            android:paddingBottom="2dp"
+            android:paddingEnd="@dimen/content_padding_15"
+            android:paddingStart="@dimen/content_padding_15"
+            android:paddingTop="2dp"
+            android:text="跳过"
+            android:textColor="#918F8F"
+            android:textSize="14sp" />
+    </RelativeLayout>
+
     <TextView
         android:id="@+id/ad_msg"
         android:layout_width="match_parent"
@@ -39,20 +48,4 @@
         android:textColor="#939393"
         android:textSize="13sp" />
 
-
-    <TextView
-        android:id="@+id/know_ad_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_margin="@dimen/content_padding_20"
-        android:background="@drawable/shape_ash_solid_rectangle_small"
-        android:paddingBottom="2dp"
-        android:paddingEnd="@dimen/content_padding_15"
-        android:paddingStart="@dimen/content_padding_15"
-        android:paddingTop="2dp"
-        android:text="查看详情"
-        android:textColor="#918F8F"
-        android:textSize="14sp" />
-
 </LinearLayout>

app/src/main/res/layout/splash_activity.xml

@@ -18,6 +18,10 @@
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
         android:src="@drawable/splash_bg_img" />
+    <View
+        android:id="@+id/splash_click_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
     <TextView
         android:id="@+id/splash_skip"
         android:layout_width="wrap_content"
@@ -60,6 +64,7 @@
         android:paddingBottom="@dimen/content_padding_small"
         android:text="进 入 赚 钱"
         android:textColor="@color/white"
+        android:visibility="gone"
         android:textSize="@dimen/text_size_3" />
 
 </FrameLayout>

app/src/main/res/layout/x_real_name_auther_layout.xml

@@ -20,7 +20,7 @@
         <ImageView
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:src="@mipmap/faq" />
+            android:src="@mipmap/alarm" />
 
         <TextView
             android:layout_width="match_parent"
@@ -73,7 +73,7 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_marginStart="8dp"
-                android:src="@mipmap/faq" />
+                android:src="@mipmap/exclamatory_mark" />
         </LinearLayout>
 
 

app/src/main/res/values/gamegroup_string.xml

@@ -25,7 +25,7 @@
     <string name="sheep_id">绵羊号</string>
     <string name="my_qr">我的二维码</string>
 
-    <string name="tip_skip">跳过（%1$d秒）</string>
+    <string name="tip_skip">（%1$d秒）后可关闭</string>
     <string name="tip_newbie_task_1">我知道了（%1$d秒）</string>
     <string name="friend_extract_count">共%1d条</string>
 </resources>