Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

# Conflicts:
#	app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

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

@@ -70,7 +70,7 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
                     my_money_item_recharge_amount.setText(item.getEventText());
                     my_money_item_recharge_amount_2.setText(item.getEventText());
                     my_money_item_recharge_status.setText(item.getStateText());
-                    my_money_item_recharge_amount.setTextColor(item.isEventSuccess() ? 0xff282828 : 0xffff2e4b);
+                    my_money_item_recharge_status.setTextColor(item.isEventSuccess() ? 0xff282828 : 0xffff2e4b);
                     my_money_item_recharge_time.setText(TimeUtil.TimeStamp2Date(item.getEventTime(), "yyyy/MM/dd HH:mm"));
                     boolean isFirst = position == 0;
                     boolean isLast = ListUtil.isLastPosition(list, position);
@@ -151,6 +151,8 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
                             baseMessage.setMsg(SheepApp.getInstance().getString(R.string.service_data_error));
                             onError(baseMessage);
                         } else {
+                            if(page == 1)
+                                list.clear();
                             ListUtil.addAll(list, newList);
                             notifyDataSetChanged();
                             if (BuildConfig.DEBUG)

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

@@ -260,6 +260,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 }
                 break;
             case R.id.version_layout://版本更新
+                SpUtils.saveIgnoreMd5(null);
                 SysAppUtil.showVersionInfo(activity, null);
                 break;
             case R.id.clear_layout://清除缓存

app/src/main/java/com/sheep/gamegroup/model/entity/CreditCard.java

@@ -29,6 +29,16 @@ public class CreditCard implements Serializable{
 
     private String update_at;
 
+    private int release_id;
+
+    public int getRelease_id() {
+        return release_id;
+    }
+
+    public void setRelease_id(int release_id) {
+        this.release_id = release_id;
+    }
+
     public void setIcon(String icon){
         this.icon = icon;
     }

app/src/main/java/com/sheep/gamegroup/model/entity/DialogConfig.java

@@ -28,6 +28,18 @@ public class DialogConfig {
     private int msgGravity;
 
     private Map<String, String> colorMsgMap = new HashMap<>();
+
+    private boolean isShow;
+
+    public boolean isShow() {
+        return isShow;
+    }
+
+    public DialogConfig setShow(boolean show) {
+        isShow = show;
+        return this;
+    }
+
     public boolean isFinish() {
         return isFinish;
     }

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

@@ -24,11 +24,8 @@ import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.fragment.FgtSmallSheep;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
-import com.sheep.gamegroup.model.entity.AppUsage;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
@@ -36,31 +33,24 @@ import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
-import com.sheep.gamegroup.view.activity.RechargeAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.service.MonitorAppService;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
-import com.umeng.socialize.shareboard.SnsPlatform;
-import com.umeng.socialize.utils.ShareBoardlistener;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -376,8 +366,10 @@ public class CommonUtil {
             e.printStackTrace();
         }
     }
-
-    private void goNative(Context context, HomeListEntity entity){
+    /**
+     *
+     */
+    public void goNative(Context context, HomeListEntity entity){
 
         switch(Integer.valueOf(entity.getJump())){
             case 1://试玩赚钱
@@ -973,6 +965,8 @@ public class CommonUtil {
                     }
                 });
     }
+
+
     public void updateUserInfo(final Action1<UserEntity> action1) {
         SheepApp.get(SheepApp.getInstance())
                 .getNetComponent()

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

@@ -610,7 +610,7 @@ public class Jump2View {
 
 
     /**
-     * 跳转到验证界面
+     * 实名认证
      * @param context
      * @param o
      * @param whereFrom 0:不作处理 1：跳到充值页面
@@ -620,6 +620,7 @@ public class Jump2View {
         i.putExtra("info", o);
         i.putExtra("where_from", whereFrom);
         context.startActivity(i);
+        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION_ENTER);
     }
     /**
      * 跳转到未绑定微信界面
@@ -716,7 +717,7 @@ public class Jump2View {
      * @param context
      * @param id
      */
-    public void tryGoCreditCardWeb(final Context context, int id, final Action1<String> action1){
+    public void tryGoCreditCardWeb(final Context context, final int release_id, int id, final Action1<String> action1){
         SheepApp.getInstance().getNetComponent().getApiService().getCredit(id)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -724,7 +725,23 @@ public class Jump2View {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         final CreditCard creditCard = baseMessage.getData(CreditCard.class);
-                        Jump2View.getInstance().goCreditCardWeb(context, creditCard);
+                        if(release_id > 0){
+                            CommonUtil.getInstance().getTaskAllDetail(release_id, new Action1<BaseMessage>() {
+                                @Override
+                                public void call(BaseMessage baseMessages) {
+                                    if(baseMessages != null && baseMessages.getCode() == 0){
+                                        TaskAcceptedEty gettaskAcceptedEty = baseMessages.getData(TaskAcceptedEty.class);
+                                        if(gettaskAcceptedEty != null && creditCard != null)
+                                            creditCard.setRelease_id(gettaskAcceptedEty.getId());
+                                    }
+                                    Jump2View.getInstance().goCreditCardWeb(context, creditCard);
+                                }
+                            });
+                        }else {
+                            Jump2View.getInstance().goCreditCardWeb(context, creditCard);
+                        }
+
+
                         if(BuildConfig.DEBUG)
                             System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
                         if(action1 != null)
@@ -763,6 +780,9 @@ public class Jump2View {
      * @param title
      */
     public void goWeb(Context context, String url, String title){
+        goCardWeb(context, url, title, null);
+    }
+    public void goCardWeb(Context context, String url, String title, String id){
         if(TextUtils.isEmpty(url)){
             G.showToast(R.string.service_data_error);
             return;

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

@@ -33,6 +33,8 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.tencent.bugly.beta.Beta;
+import com.tencent.bugly.beta.UpgradeInfo;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.FileCallBack;
 
@@ -61,6 +63,8 @@ import rx.schedulers.Schedulers;
  * realicing@sina.com
  */
 public class SysAppUtil {
+
+    private static DialogConfig dialogConfig;
     public static void startAlermApp(Activity activity, String msg, int hour, int min){
         boolean notDone = true;
         if(Build.VERSION.SDK_INT > 18) {
@@ -373,6 +377,14 @@ public class SysAppUtil {
      * @param action1 动作完成后的回调
      */
     public static void showVersionInfo(final Activity activity, final String ignoreMd5, final Action1<Integer> action1) {
+        if(checkBuglyUpdate()){
+            return;
+        }
+        if(dialogConfig == null)
+            dialogConfig = new DialogConfig();
+        if(dialogConfig.isShow()){
+            return;
+        }
         SheepApp.getInstance().getNetComponent().getApiService().getNewVersion(SheepApp.getInstance().getConnectAddress().getVersionType())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -395,14 +407,15 @@ public class SysAppUtil {
                             return;
                         }
                         String fileMD5 = SysAppUtil.getConnectAdrressFileMD5();
-                        if(fileMD5 == null){
+                        int versionCode = SysAppUtil.getAppVersionCode();
+                        if(versionCode == 0){
                             if(ignoreMd5 == null)
                                 G.showToast(baseMessage);
                             if(action1 != null)
                                 action1.call(0);
                             return;
                         }
-                        if(fileMD5.equalsIgnoreCase(version.getMd5_address())){//已经是最新版本
+                        if(versionCode >= version.getVersion_number()){//已经是最新版本
                             if(ignoreMd5 == null)
                                 G.showToast("当前版本为最新版本，无需更新");
                             if(action1 != null)
@@ -410,7 +423,7 @@ public class SysAppUtil {
                         } else {//有新版本
                             final String fileName = version.getMd5_address()+".apk";
                             final File file = new File(ClassFileHelper.DIR, fileName);
-                            DialogConfig dialogConfig = new DialogConfig().setTitle("小绵羊V"+version.getVersion_name());
+                            dialogConfig.setTitle("小绵羊V"+version.getVersion_name());
                             dialogConfig.setMsg(TextUtils.isEmpty(version.getUpdate_content()) ? "当前版本小绵羊V"+getConnectAdrressPackageInfo().versionName : version.getUpdate_content()).setLayoutId(R.layout.x_msg_wv_dialog)
                                     .setBtnLeftText(file.exists() ? "立即安装" : "立即更新").setBtnLeftNotDissDialog(true).setBtnLeftOnClickListener(new View.OnClickListener() {
                                 private void installApk(File file){
@@ -420,6 +433,7 @@ public class SysAppUtil {
                                 }
                                 @Override
                                 public void onClick(final View view) {
+
                                     if(file.exists()){//直接安装
                                         installApk(file);
                                     } else if(TextUtils.isEmpty(version.getAddress())){//地址错误
@@ -493,4 +507,25 @@ public class SysAppUtil {
         LogUtil.println("FileMD5", fileMD5);
         return fileMD5;
     }
+
+    public static int getAppVersionCode() {
+        try {
+            PackageInfo info = getConnectAdrressPackageInfo();
+            return info.versionCode;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    /**
+     * bugly 检查更新
+     */
+    public static  boolean checkBuglyUpdate(){
+//        Beta.checkUpgrade();
+        UpgradeInfo upgradeInfo = Beta.getUpgradeInfo();
+        if(upgradeInfo != null)
+            return true;
+        return false;
+    }
 }

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

@@ -81,6 +81,7 @@ public class UMConfigUtils {
         SHEEP_GAME_TASK           ,//点击进入游戏任务界面 5051
         XIANWAN_WEBVIEW           ,//闲玩 5052
         ORDER_MANAGER           ,//订单管理 5053
+        USER_AUTHENTICATION_ENTER           ,//进入实名认证界面 5054
         ;
         private String key;
         Event(String key){

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

@@ -426,21 +426,22 @@ public class ViewUtil {
             else
                 dialog_close.setVisibility(View.GONE);
         }
-
-        if(dialogConfig.isFinish()) {
-            dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-                @Override
-                public void onDismiss(DialogInterface dialog) {
-                    try {
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                try {
+                    if(dialogConfig.isFinish()) {
                         if (mContext instanceof Activity) {
                             ((Activity) mContext).finish();
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
                     }
+                    dialogConfig.setShow(false);
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            });
-        }
+            }
+        });
+
         if(!(mContext instanceof Activity) && dialog.getWindow() != null) {
             dialog.getWindow().setType(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ? WindowManager.LayoutParams.TYPE_PHONE : WindowManager.LayoutParams.TYPE_TOAST);
         }
@@ -448,6 +449,7 @@ public class ViewUtil {
             dialog.setCancelable(false);
         try {
             dialog.show();
+            dialogConfig.setShow(true);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -211,8 +211,22 @@ public class WebviewJs {
             task.cancel(true);
             task.removeRecord();
         } else {
-            G.showToast("开始下载中!");
+            switch (downLoadInfo.getMStatus()){
+                case 2:
+                case 4:
+                    G.showToast("正在下载中...");
+                    break;
+                case 3:
+//                    G.showToast("下载完成");
+                    break;
+                default:
+                    G.showToast("开始下载中!");
+                    downLoadInfo.setMStatus(2);
+                    break;
+            }
+
             mDownloadTaskService.start(downLoadInfo);
+            mDownloadTaskService.addDownloadTask(downLoadInfo);
             final DownLoadInfo finalDownLoadInfo = downLoadInfo;
             new Thread(new Runnable() {
                 @Override
@@ -232,6 +246,8 @@ public class WebviewJs {
             mDownloadTaskService = new DownloadTaskService(activity);
         DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(downloadTask.getKey());
         if(downLoadInfo != null){
+            downLoadInfo.setMStatus(1);
+            mDownloadTaskService.addDownloadTask(downLoadInfo);
             G.showToast("下载失败");
         }
     }
@@ -243,9 +259,22 @@ public class WebviewJs {
         DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(downloadTask.getKey());
         if(downLoadInfo != null){
             G.showToast("下载成功");
+            downLoadInfo.setMStatus(3);
+            mDownloadTaskService.addDownloadTask(downLoadInfo);
             PackageUtil.installApk(activity, downloadTask.getDownloadPath());
         }
 
     }
+    @Download.onTaskRunning
+    protected void running(DownloadTask downloadTask) {
+        if(mDownloadTaskService == null)
+            mDownloadTaskService = new DownloadTaskService(activity);
+        DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(downloadTask.getKey());
+        if(downLoadInfo != null){
+            downLoadInfo.setMStatus(2);
+            mDownloadTaskService.addDownloadTask(downLoadInfo);
+//            G.showToast("下载中....");
+        }
+    }
 
 }

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

@@ -46,6 +46,8 @@ public class ActCreditCardWeb extends BaseCompatActivity {
         creditCard = (CreditCard) getIntent().getSerializableExtra(CreditCard.class.getSimpleName());
 
         ButterKnife.bind(this);
+        if(creditCard == null)
+            return;
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, creditCard.getName()+"-申请流程")
@@ -123,7 +125,7 @@ public class ActCreditCardWeb extends BaseCompatActivity {
         webViewSettings.setDatabasePath(getApplicationContext().getCacheDir().getAbsolutePath());
 
         webViewSettings.setJavaScriptEnabled(true);
-        mWebView.addJavascriptInterface(new WebviewJs(ActCreditCardWeb.this, 0), "kfzsjs");
+        mWebView.addJavascriptInterface(new WebviewJs(ActCreditCardWeb.this, creditCard.getRelease_id()), "kfzsjs");
         mWebView.loadUrl(creditCard.getLoadUrl());
     }
 

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

@@ -220,6 +220,11 @@ public class ActWeb extends BaseCompatActivity {
                 return true;
             }
 
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                imgReset();
+            }
         });
         webViewSettings.setJavaScriptEnabled(true);
         mWebView.addJavascriptInterface(new KFZSJs(), "kfzsjs");
@@ -418,4 +423,15 @@ public class ActWeb extends BaseCompatActivity {
         }
     }
 
+    private void imgReset(){
+        mWebView.loadUrl("javascript:(function(){" +
+                "var objs = document.getElementsByTagName('img'); " +
+                "for(var i=0;i<objs.length;i++)  " +
+                "{"
+                + "var img = objs[i];   " +
+                " img.style.maxWidth = '100%';" +
+                "}" +
+                "})()");
+    }
+
 }

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

@@ -84,7 +84,7 @@ public class MiddleAct extends Activity {
                             Jump2View.getInstance().goCreditCardTaskDetail(activity, msg.getId());
                             break;
                         case 33://跳转到信用卡web申请界面; id 信用卡信息的id
-                            Jump2View.getInstance().tryGoCreditCardWeb(activity, msg.getId(), new Action1<String>() {
+                            Jump2View.getInstance().tryGoCreditCardWeb(activity, 0, msg.getId(), new Action1<String>() {
                                 @Override
                                 public void call(String msg) {
                                     if(msg != null){

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

@@ -1124,23 +1124,14 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      */
     private void accepteTaskDetail(int id){
         showProgress();
-        SheepApp.getInstance()
-                .getNetComponent()
-                .getApiService()
-                .getAcceptedTaskDetail(id)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+        CommonUtil.getInstance()
+                .getTaskAllDetail(id, new Action1<BaseMessage>() {
                     @Override
-                    public void onError(BaseMessage baseMessage) {
-                        presenter.taskDesc(taskId);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
+                    public void call(BaseMessage baseMessage) {
                         presenter.taskDesc(taskId);
                         try{
-                            gettaskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
+                            if(baseMessage.getCode() == 0)
+                                gettaskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
 
                         }catch (Exception e){
                             e.printStackTrace();

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

@@ -11,6 +11,7 @@ import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -41,10 +42,6 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 
     @BindView(R.id.detail_item_layout_1)
     View detail_item_layout_1;
-    @BindView(R.id.detail_item_layout_2)
-    View detail_item_layout_2;
-    @BindView(R.id.detail_item_layout_3)
-    View detail_item_layout_3;
     @BindView(R.id.name_tv)
     TextView nameTv;
     @BindView(R.id.date_tv)
@@ -63,6 +60,14 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
     TextView btnUpImag;
     @BindView(R.id.bottom_btn_layout)
     LinearLayout bottom_btn_layout;
+    @BindView(R.id.detail_item_layout_2)
+    LinearLayout detail_item_layout_2;
+    @BindView(R.id.detail_item_layout_3)
+    LinearLayout detail_item_layout_3;
+    @BindView(R.id.detail_shrae_friend_layout)
+    LinearLayout detail_shrae_friend_layout;
+    @BindView(R.id.item_layout)
+    RelativeLayout item_layout;
     private Activity activity;
 
     private NewbieTask newbieTask;
@@ -95,6 +100,10 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
 //            finish();
             return;
         }
+        item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
+        detail_item_layout_2.setVisibility(View.VISIBLE);
+        detail_item_layout_3.setVisibility(View.VISIBLE);
+        detail_shrae_friend_layout.setVisibility(View.GONE);
         webText.setWebChromeClient(new WebChromeClient(){
 
         });

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

@@ -22,10 +22,12 @@ import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
@@ -191,6 +193,12 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     private void netTaskSchedule() {
         if (mPd == null || !mPd.isShowing())
             showProgress();
+
+        getDetail();
+    }
+
+    private void getDetail(){
+
         SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCardDesc(id)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -289,7 +297,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     }
 
     private void goWeb() {
-        Jump2View.getInstance().tryGoCreditCardWeb(activity, EntityUtils.getExtInfo(taskEty.getExt()).getId(), new Action1<String>() {
+        Jump2View.getInstance().tryGoCreditCardWeb(activity,taskReleaseEty.getId(), EntityUtils.getExtInfo(taskEty.getExt()).getId(), new Action1<String>() {
             @Override
             public void call(String msg) {
                 if (msg == null) {

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskdetailSonListviewAdp.java

@@ -217,18 +217,19 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                     screens_iv.setAdjustViewBounds(true);
                     screens_iv.setScaleType(ImageView.ScaleType.FIT_XY);
 
-                    viewHolder.itemView.setLayoutParams(new LinearLayout.LayoutParams(with, with));
+                    screens_iv.setLayoutParams(new LinearLayout.LayoutParams(with, with-50));
 
                     if(TextUtils.isEmpty(taskDescEntity.getDesc())){
                         screens_tv.setVisibility(View.GONE);
                     }else {
                         screens_tv.setVisibility(View.VISIBLE);
                         screens_tv.setText("" + taskDescEntity.getDesc());
+                        screens_tv.setMaxWidth(with);
                     }
 
                     Glide.with(context)
                             .load(taskDescEntity.getImg())
-                            .apply(new RequestOptions().override(with, with))
+                            .apply(new RequestOptions().override(with, with-50))
                             .into(screens_iv);
                     screens_iv.setOnClickListener(new View.OnClickListener() {
                         @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -25,6 +25,7 @@ import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.bugly.Bugly;
+import com.tencent.bugly.beta.Beta;
 
 import rx.functions.Action1;
 
@@ -90,6 +91,7 @@ public class SheepApp extends BaseApplication {
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initGoble();
             initNet();
+//            Beta.autoCheckUpgrade = false;
             Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
         }
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -250,7 +250,11 @@ public class FloatService extends Service {
         params = new WindowManager.LayoutParams();
 
         // 设置window type
-        params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){//6.0
+            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        }else {
+            params.type =  WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+        }
         /*
          * 如果设置为params.type = WindowManager.LayoutParams.TYPE_PHONE; 那么优先级会降低一些,
          * 即拉下通知栏不可见

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

@@ -39,7 +39,7 @@
                         android:id="@+id/ems_left_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="用户须知"
+                        android:text="平台·用户须知"
                         android:gravity="center"
                         android:ems="2"
                         android:textColor="#D3AF57"
@@ -51,25 +51,43 @@
                         android:layout_marginRight="@dimen/common_margin_10"
                         android:layout_marginBottom="@dimen/content_padding_20"
                         android:layout_centerVertical="true"/>
-                    <TextView
-                        android:id="@+id/user_know_one_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/user_know_one"
-                        android:layout_toRightOf="@+id/ems_left_tv"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/user_know_two"
-                        android:layout_below="@+id/user_know_one_tv"
-                        android:layout_toRightOf="@+id/ems_left_tv"
-                        android:layout_marginTop="@dimen/content_padding_20"/>
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/user_know_three"
+                        android:orientation="vertical"
                         android:layout_toRightOf="@+id/ems_left_tv"
-                        android:layout_alignParentBottom="true"/>
+                        android:layout_centerVertical="true">
+                        <TextView
+                            android:id="@+id/user_know_one_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_one"
+                            android:layout_toRightOf="@+id/ems_left_tv"/>
+                        <TextView
+                            android:id="@+id/user_know_two_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_two"
+                            android:layout_below="@+id/user_know_one_tv"
+                            android:layout_toRightOf="@+id/ems_left_tv"
+                            android:layout_marginTop="@dimen/content_padding_5"/>
+                        <TextView
+                            android:id="@+id/user_know_three_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_three"
+                            android:layout_below="@+id/user_know_two_tv"
+                            android:layout_toRightOf="@+id/ems_left_tv"
+                            android:layout_marginTop="@dimen/content_padding_5"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/user_know_four"
+                            android:layout_below="@+id/user_know_three_tv"
+                            android:layout_toRightOf="@+id/ems_left_tv"
+                            android:layout_marginTop="@dimen/content_padding_5"/>
+                    </LinearLayout>
+
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/detail_item_layout_1"

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

@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text=""
+        android:text="111"
         android:lines="1"
         android:ellipsize="end"
         android:layout_marginTop="@dimen/content_padding_small"

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

@@ -118,7 +118,7 @@
             android:layout_gravity="center_vertical"
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:visibility="visible"
-            android:layout_marginTop="@dimen/content_padding_1"
+            android:layout_marginTop="@dimen/content_padding_13"
             android:paddingTop="@dimen/content_padding_small"
             android:paddingBottom="@dimen/content_padding_15">
             <TextView

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

@@ -40,6 +40,7 @@
     <dimen name="content_padding_3">3dp</dimen>
     <dimen name="content_padding_1">1dp</dimen>
     <dimen name="content_padding_2">2dp</dimen>
+    <dimen name="content_padding_5">5dp</dimen>
     <dimen name="content_padding_small">6dp</dimen>
     <dimen name="content_padding_8">8dp</dimen>
     <dimen name="content_padding_big">18dp</dimen>

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

@@ -44,9 +44,10 @@
     <string name="real_name_know_start">为了保障您的用卡安全，请</string>
     <string name="real_name_know">了解安全保障</string>
 
-    <string name="user_know_one">1、用户需在平台首次下载该游戏并注册;</string>
-    <string name="user_know_two">2、任务奖励充值消费需要满足充值条件;</string>
-    <string name="user_know_three">3、用户充值不满足需求，平台将以绵羊币的方式退还给小绵羊用户。</string>
+    <string name="user_know_one">1、用户需在小绵羊首次下载本游戏并进行注册;</string>
+    <string name="user_know_two">2、任务奖励的金额消耗需要满足相应的充值条件;</string>
+    <string name="user_know_three">3、若用户的充值不能满足相应条件，则平台会以绵羊币的形式退还给用户，您仍然可以在下次充值继续使用;</string>
+    <string name="user_know_four">4、下载成功后，请进入游戏任务—我的游戏，点击充值进行消费;</string>
 
     <string name="supplement_explain">部分机型的用户需要去手机设置里开启允许平台监控的权限，方可点击 \"领取奖励\" 完成</string>
     <string name="supplement_explain_n">补充说明</string>

datashare/src/main/java/com/kfzs/duanduan/datashare/provider/download/DownLoadInfo.java

@@ -162,7 +162,7 @@ public class DownLoadInfo implements Serializable{
     }
 
     public Integer getMStatus() {
-        return this.mStatus;
+        return this.mStatus == null ? 0 : this.mStatus;
     }
 
     public void setMStatus(Integer mStatus) {