修复已经完成的任务可能会显示重新提交的bug;

添加h5支付宝支付功能

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

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.FindTag;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -53,8 +54,6 @@ public class FgtFind extends BaseCompatFragment {
     @BindView(R.id.pager)
     ViewPager pager;
 
-    private int awaken_on;//1显示
-
     private GiftpackListAdapter mAdapter;
 
     private void initView() {
@@ -138,11 +137,7 @@ public class FgtFind extends BaseCompatFragment {
         CommonUtil.getInstance().initUrlConfigByNet("awaken_on", new Action1<String>() {
             @Override
             public void call(String url) {
-                try {
-                    awaken_on = Integer.valueOf(url);
-                } catch (NumberFormatException e) {
-                    e.printStackTrace();
-                }
+                int awaken_on = NumberFormatUtils.parseInteger(url);
 
                 if (awaken_on == 1) {
                     mAdapter.add(new FgtRouser(), "看点");

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

@@ -83,8 +83,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     private int id;
 
-    private int k;
-    int width;
     /**
      * 视频全屏参数
      */
@@ -109,10 +107,9 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     @Override
     public void initView() {
         id = getIntent().getIntExtra("id", 0);
-        String title = getIntent().getStringExtra("title");
 
         TitleBarUtils.getInstance()
-                .setTitle(this, /*TextUtils.isEmpty(title) ? "详情" : title*/"详情")
+                .setTitle(this,"详情")
                 .setTitleFinish(this)
                 .setRightImgBotton(this, R.mipmap.share, new View.OnClickListener() {
                     @Override

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

@@ -56,7 +56,6 @@ public class ActNewAboutUs extends BaseActivity {
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, HelperUtils.BAR_HEIGH);
         status_height_view.setLayoutParams(params);
         GlideImageLoader.centerImage(about_us_iv, "http://cdngame.kuaifazs.com/icon_phone.png");
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar_act_game_details));
         /*
           标题显示和隐藏的监听
          */

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -9,6 +10,7 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 import com.tencent.smtt.sdk.DownloadListener;
@@ -230,23 +232,38 @@ public class ActWeb extends BaseCompatActivity {
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                try {
-                    //微信H5支付核心代码
-                    if (url.startsWith("weixin://wap/pay?")) {
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_VIEW);
-                        intent.setData(Uri.parse(url));
-                        startActivity(intent);
-                        return true;
-                    } else {
-                        Map<String, String> extraHeaders = new HashMap<>();
-                        extraHeaders.put("Referer", "http://17xmy.com");
-                        view.loadUrl(url, extraHeaders);
+                //微信H5支付核心代码
+                if (url.startsWith("weixin://wap/pay?")) {
+                    try {
+                    Intent intent = new Intent();
+                    intent.setAction(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(url));
+                    startActivity(intent);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return true;
+                } else if(url.startsWith("alipays:") || url.startsWith("alipay")) {
+                    try {
+                        startActivity(new Intent("android.intent.action.VIEW", Uri.parse(url)));
+                    } catch (Exception e) {
+                        new AlertDialog.Builder(ActWeb.this)
+                                .setMessage("未检测到支付宝客户端，请安装后重试。")
+                                .setPositiveButton("立即安装", new DialogInterface.OnClickListener() {
+
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Uri alipayUrl = Uri.parse("https://d.alipay.com");
+                                        startActivity(new Intent("android.intent.action.VIEW", alipayUrl));
+                                    }
+                                }).setNegativeButton("取消", null).show();
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    return true;
+                } else {
+                    Map<String, String> extraHeaders = new HashMap<>();
+                    extraHeaders.put("Referer", "http://17xmy.com");
+                    view.loadUrl(url, extraHeaders);
                 }
-
                 return true;
             }
 

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

@@ -337,7 +337,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     break;
                 default://试玩任务直接设置下载状态
                     setFirstBtnState();
-                    if (type == DownloadTaskService.STATUS_INSTALLED && gettaskAcceptedEty != null) {//已经安装并且有任务记录的情况下
+                    if (type == DownloadTaskService.STATUS_INSTALLED && gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() != 3) {//已经安装并且有任务未完成的情况下
                         if (TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0) {//没有提交过截图或者已经提交过一次 下线失败后提交
                         } else {//提交过一次，但是审核失败或者没有审核就下线了
                             String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";

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

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_light"
     android:orientation="vertical">
 
     <FrameLayout