添加公告界面；调试 极光推送的各种页面跳转

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -238,7 +238,7 @@ public class TabsHelper {
     }
 
     public void goToPostion(int postion) {
-        view_pager_container.setCurrentItem(postion);//
+        tabs.get(postion).performClick();
     }
 
 }

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.text.TextUtils;
 
 /**
  * Created by realicing on 2018/5/9.
@@ -25,7 +24,7 @@ public class ConsumptionLog {
 
     private int ReleaseTaskId;
 
-    private int From;
+    private int From1;
 
     private String DetailDesc;
 
@@ -83,12 +82,15 @@ public class ConsumptionLog {
     public int getReleaseTaskId(){
         return this.ReleaseTaskId;
     }
-    public void setFrom(int From){
-        this.From = From;
+
+    public int getFrom1() {
+        return From1;
     }
-    public int getFrom(){
-        return this.From;
+
+    public void setFrom1(int from1) {
+        From1 = from1;
     }
+
     public void setDetailDesc(String DetailDesc){
         this.DetailDesc = DetailDesc;
     }

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

@@ -9,6 +9,7 @@ public class JPushMessage {
     private String url;
     private String msg;
     private String title;
+    private long time;
     private int type;// 在MiddleAct中查看
 
     public int getId() {
@@ -50,4 +51,12 @@ public class JPushMessage {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    public long getTime() {
+        return time;
+    }
+
+    public void setTime(long time) {
+        this.time = time;
+    }
 }

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

@@ -57,7 +57,7 @@ public class BtStatusUtil {
 //  13 购买APP Store充值卡
     //只会使用 8，11，12，13
     public static String getConsumtionLog(ConsumptionLog item) {
-        switch (item.getType()){
+        switch (item.getFrom1()){
             case 8:
                 return String.format(Locale.CHINA,"充值金额%s元", item.getAmount());
             case 11:

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

@@ -691,10 +691,11 @@ public class Jump2View {
      * @param title
      * @param content
      */
-    public void goNotice(Context context, String title, String content) {
+    public void goNotice(Context context, String title, String content, long time) {
         Intent intent = new Intent(context, ActNotice.class);
         intent.putExtra("title", title);
         intent.putExtra("content", content);
+        intent.putExtra("time", time);
         context.startActivity(intent);
     }
 }

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

@@ -69,9 +69,13 @@ public class TestUtil {
         }
     }
 
-    private static void debugSysDownload(final Context context, final TaskEty taskEty) {
+    private static void debugSysDownload(final Context context, TaskEty taskEty) {
+        sysDownload(context, taskEty.getDownload_link(), taskEty.getTask_name(), "下载小绵羊任务中的apk："+taskEty.getPackage_names(), taskEty.getPackage_names()+".apk", "系统开始下载apk");
+    }
+
+    public static void sysDownload(final Context context, String downloadLink, String title, String description, String fileName, String toast) {
         // 创建下载请求
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(taskEty.getDownload_link()));
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(downloadLink));
 
         /*
          * 设置在通知栏是否显示下载通知(下载进度), 有 3 个值可选:
@@ -82,8 +86,8 @@ public class TestUtil {
         request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
 
         // 设置通知的标题和描述
-        request.setTitle(taskEty.getTask_name());
-        request.setDescription("下载小绵羊任务中的apk："+taskEty.getPackage_names());
+        request.setTitle(title);
+        request.setDescription(description);
 
         /*
          * 设置允许使用的网络类型, 可选值:
@@ -96,10 +100,11 @@ public class TestUtil {
 
         // 添加请求头
         // request.addRequestHeader("User-Agent", "Chrome Mozilla/5.0");
-
-        // 设置下载文件的保存位置
-        File saveFile = new File(DIR, taskEty.getTask_name()+".apk");
-        request.setDestinationUri(Uri.fromFile(saveFile));
+        if(fileName != null) {
+            // 设置下载文件的保存位置
+            File saveFile = new File(DIR, fileName);
+            request.setDestinationUri(Uri.fromFile(saveFile));
+        }
 
         /*
          * 2. 获取下载管理器服务的实例, 添加下载任务
@@ -108,15 +113,19 @@ public class TestUtil {
         if(manager != null) {
             // 将下载请求加入下载队列, 返回一个下载ID
             long downloadId = manager.enqueue(request);
-            G.showToast("系统开始下载apk");
+            if(toast != null)
+                G.showToast(toast);
         }
     }
     private static void debugWebDownload(final Context context, final TaskEty taskEty) {
+        webDownload(context, taskEty.getDownload_link());
+    }
+    public static void webDownload(final Context context, String downloadLink) {
         if(context instanceof Activity) {
             Intent intent = new Intent();
             intent.setAction(Intent.ACTION_VIEW);
             intent.addCategory(Intent.CATEGORY_BROWSABLE);
-            intent.setData(Uri.parse(taskEty.getDownload_link()));
+            intent.setData(Uri.parse(downloadLink));
             context.startActivity(intent);
             G.showToast("浏览器开始下载apk");
         }

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

@@ -16,9 +16,9 @@ public class TimeUtil {
         long ls = System.currentTimeMillis()/1000;
         return ls;
     }
-    public static String TimeStamp2Date(long timestampString, String formats) {
-        Long timestamp = timestampString * 1000;
-        String date = new SimpleDateFormat(formats, Locale.CHINA).format(new Date(timestamp));
+    public static String TimeStamp2Date(long time, String formats) {
+        time = time < 10_000_000_000L ? time * 1000 : time;//秒的时间戳为10位数,要x1000  10_000_000_000L对应时间为2286-11-21 01:46:40
+        String date = new SimpleDateFormat(formats, Locale.CHINA).format(new Date(time));
         return date;
     }
     public static String[] getCalendarShowTime(long paramLong)

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

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -12,19 +11,15 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.fragment.FgtCreditCardProgressQuery;
 import com.kfzs.duanduan.fragment.FgtMyMoney1;
 import com.kfzs.duanduan.fragment.FgtMyMoney2;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.kfzs.duanduan.utils.StatusBarUtils;
-import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.CreditCardProgressQuery;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -41,8 +36,7 @@ import rx.schedulers.Schedulers;
  * Created by realicing on 2018/5/8.
  */
 
-public class ActMyMoney extends AbsChooseImageActivity {
-
+public class ActMyMoney extends BaseActivity {
 
     @BindView(R.id.indicator)
     TabLayout indicator;
@@ -78,36 +72,10 @@ public class ActMyMoney extends AbsChooseImageActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this,"我的资产")
                 .setTitleFinish(this);
-//        String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
-//        tv.setText(Html.fromHtml(sr));
         mAdapter = new GiftpackListAdapter(getSupportFragmentManager(), getApplicationContext());
         mAdapter.add(new FgtMyMoney1(), "充值记录");
         mAdapter.add(new FgtMyMoney2(), "提现&消费记录");
         pager.setAdapter(mAdapter);
-//        indicator.setupWithViewPager(pager);
-        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int i, float v, int i1) {
-
-            }
-
-            @Override
-            public void onPageSelected(int i) {
-                switch (i){
-                    case 0:
-                        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_CREDIT_CARD_ACCEPT_LIST);
-                        break;
-                    case 1:
-                        UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_CREDIT_CARD_PROGRESS_QUERY_LIST);
-                        break;
-                }
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int i) {
-
-            }
-        });
         new_tab();
     }
     private void new_tab(){
@@ -143,13 +111,13 @@ public class ActMyMoney extends AbsChooseImageActivity {
                 Jump2View.getInstance().goWithdrawal(ActMyMoney.this, null);
                 break;
             case R.id.my_money_recharge_tv://充值
-                //TODO 添加充值入口
-                G.showToast(R.string.coming_soon);
+                Jump2View.getInstance().goRechargeQAct(ActMyMoney.this, null);
                 break;
         }
     }
     @Override
     public void initData() {
+        showProgress();
         resetData();
         SheepApp.getInstance().getNetComponent().getApiService().getMyAssets()
                         .subscribeOn(Schedulers.io())
@@ -161,6 +129,7 @@ public class ActMyMoney extends AbsChooseImageActivity {
                                     System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                                 UserAssets userAssets = baseMessage.getData(UserAssets.class);
                                 loadData(userAssets);
+                                hideProgress();
                             }
 
                             @Override
@@ -169,6 +138,7 @@ public class ActMyMoney extends AbsChooseImageActivity {
                                     System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
                                 G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
                                 resetData();
+                                hideProgress();
                             }
                         });
     }
@@ -188,58 +158,4 @@ public class ActMyMoney extends AbsChooseImageActivity {
         my_money_available_amount.setText(getString(R.string.available_amount, "0.00"));
     }
 
-    @Override
-    protected void onNotGetImage(String msg) {
-        G.showToast(msg);
-    }
-
-    @Override
-    protected void onGetImage(String path) {
-
-    }
-    private CreditCardProgressQuery creditCardProgressQuery;
-
-    public void setCreditCardProgressQuery(CreditCardProgressQuery creditCardProgressQuery) {
-        this.creditCardProgressQuery = creditCardProgressQuery;
-    }
-
-    @Override
-    protected void onSetNetImageUrl(String url) {
-        setLoaddingText("提交中");
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("screenshots", url);
-        releaseTaskCreditCard(creditCardProgressQuery.getId(), jsonObject);
-    }
-
-    @Override
-    protected void onGetNetImageUrl(String url) {
-
-    }
-
-    public void releaseTaskCreditCardSuccess(BaseMessage baseMessage) {
-        setLoaddingText("完成");
-        dismissLoaddingDialog();
-        G.showToast("提交成功，等待审核!");
-        Fragment fragment = mAdapter.getItem(1);
-        if(fragment instanceof FgtCreditCardProgressQuery){
-            ((FgtCreditCardProgressQuery) fragment).initData();
-        }
-    }
-
-    public void releaseTaskCreditCard(int id, JSONObject jsonObject) {
-        SheepApp.getInstance().getNetComponent().getApiService().releaseTaskCreditCard(id, jsonObject)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        updateError(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        releaseTaskCreditCardSuccess(baseMessage);
-                    }
-                });
-    }
 }

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

@@ -1,18 +1,25 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.view.View;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 
 /**
  * Created by realicing on 2018/5/10.
  * realicing@sina.com
  */
 public class ActNotice extends BaseActivity {
+    @BindView(R.id.act_notice_title_tv)
+    TextView act_notice_title_tv;
+    @BindView(R.id.act_notice_time_tv)
+    TextView act_notice_time_tv;
     @BindView(R.id.act_notice_content_tv)
     TextView act_notice_content_tv;
     @Override
@@ -24,12 +31,31 @@ public class ActNotice extends BaseActivity {
     public void initView() {
         String title = getIntent().getStringExtra("title");
         String content = getIntent().getStringExtra("content");
+        String time = TimeUtil.TimeStamp2Date(getIntent().getLongExtra("time", System.currentTimeMillis()), "yyyy/MM/dd   HH:mm");
         TitleBarUtils.getInstance()
                 .setTitle(this, title)
                 .setTitleFinish(this);
-        act_notice_content_tv.setText(content);
-    }
 
+        act_notice_title_tv.setText(title);
+        act_notice_time_tv.setText(time);
+
+        String[] items = content.split("\n");
+        StringBuilder stringBuilder = new StringBuilder("\t\t\t\t");
+        for (int i = 0; i < items.length; i++) {
+            if(i != 0)
+                stringBuilder.append("\n\t\t\t\t");
+            stringBuilder.append(items[i]);
+        }
+        act_notice_content_tv.setText(stringBuilder.toString());
+    }
+    @OnClick(R.id.act_notice_back_tv)
+    public void onViewClicked(View view){
+        switch (view.getId()){
+            case R.id.act_notice_back_tv:
+                finish();
+                break;
+        }
+    }
     @Override
     public void initListener() {
 

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

@@ -10,7 +10,9 @@ import com.arialyy.aria.core.Aria;
 import com.kfzs.duanduan.react.MainTab;
 import com.sheep.gamegroup.model.entity.JPushMessage;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.Locale;
@@ -80,10 +82,10 @@ public class MiddleAct extends Activity {
                         case 31://办卡赚钱
                             Jump2View.getInstance().goCreditCardTaskList(activity, null);
                             break;
-                        case 32://跳转到信息卡详情界面: id 信息卡任务的id
+                        case 32://跳转到信用卡详情界面: id 信用卡任务的id
                             Jump2View.getInstance().goCreditCardTaskDetail(activity, msg.getId());
                             break;
-                        case 33://跳转到信息卡web申请界面; id 信用卡信息的id
+                        case 33://跳转到信用卡web申请界面; id 信用卡信息的id
                             Jump2View.getInstance().tryGoCreditCardWeb(activity, msg.getId(), new Action1<String>() {
                                 @Override
                                 public void call(String msg) {
@@ -140,13 +142,11 @@ public class MiddleAct extends Activity {
                             Jump2View.getInstance().goHomePageView(activity, msg.getId() % MainTab.values().length);
                             break;
                         case 2://公告: title 标题   msg 内容
-                            Jump2View.getInstance().goNotice(activity, TextUtils.isEmpty(msg.getTitle()) ? bundle.getString(JPushInterface.EXTRA_ALERT) : msg.getTitle(), msg.getMsg());
+                            Jump2View.getInstance().goNotice(activity, TextUtils.isEmpty(msg.getTitle()) ? bundle.getString(JPushInterface.EXTRA_ALERT) : msg.getTitle(), msg.getMsg(), msg.getTime() == 0 ? System.currentTimeMillis() : msg.getTime());
                             break;
                         case 3://下载: url 下载链接
                             if(msg.getUrl().startsWith("http"))
-                                Aria.download(activity).load(msg.getUrl());
-                            else if(msg.getUrl().startsWith("ftp"))
-                                Aria.download(activity).loadFtp(msg.getUrl());
+                                TestUtil.webDownload(activity, msg.getUrl());
                             break;
                         case 0://直接启动或者重启app
                         default:

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

@@ -38,6 +38,8 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.util.Locale;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -91,7 +93,9 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 .setTitleFinish(activity);
         btnUpImag.setVisibility(View.GONE);
     }
+
     private int id;
+
     @Override
     public void initListener() {
 
@@ -99,35 +103,37 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
 
     @Override
     public void initData() {
-        netTaskSchedule();
-        webText.setWebChromeClient(new WebChromeClient(){
+        if (taskEty == null) {
+            netTaskSchedule();
+            return;
+        }
+        webText.setWebChromeClient(new WebChromeClient() {
 
         });
         webText.getSettings().setJavaScriptEnabled(true);
-
 // 1、LayoutAlgorithm.NARROW_COLUMNS ： 适应内容大小
 // 2、LayoutAlgorithm.SINGLE_COLUMN:适应屏幕，内容将自动缩放
 //        webText.getSettings().setUseWideViewPort(true);
 //        webText.getSettings().setLoadWithOverviewMode(true);
 //        webText.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
 //        webText.setInitialScale(80);
-        webText.setWebViewClient(new WebViewClient(){
+        webText.setWebViewClient(new WebViewClient() {
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                view.loadDataWithBaseURL(null,request.getUrl().toString(), "text/html", "utf-8", null);
+                view.loadDataWithBaseURL(null, request.getUrl().toString(), "text/html", "utf-8", null);
                 return true;
             }
         });
         //封装头文件
-        String sHead=   "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
-                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />"+
+        String sHead = "<html><head><meta name=\"viewport\" content=\"width=device-width, " +
+                "initial-scale=1.0, minimum-scale=0.5, maximum-scale=2.0, user-scalable=yes\" />" +
                 "<style>img{max-width:100% !important;height:auto !important;}</style>"
-                +"<style>body{max-width:100% !important;}</style>"+"</head><body>";
-        webText.loadDataWithBaseURL(null,sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
-        nameTv.setText(taskEty.getName()+"");
-        priceTv.setText("+"+ taskEty.getBonus() +"元");
-        dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");
+                + "<style>body{max-width:100% !important;}</style>" + "</head><body>";
+        webText.loadDataWithBaseURL(null, sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
+        nameTv.setText(taskReleaseEty.getName());
+        priceTv.setText(String.format(Locale.CHINA, "+%s元", taskReleaseEty.getBonus()));
+        dateTv.setText(TimeUtil.TimeStamp2Date(Long.valueOf(taskEty.getUpdate_time()), "yyyy/MM/dd HH:mm"));
 
 
         Glide.with(SheepApp.mContext)
@@ -136,28 +142,26 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                         .dontAnimate())
                 .into(iconIv);
 
-        if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 1){
+        if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 1) {
             detailTaskTv.setVisibility(View.INVISIBLE);
             bottom_btn_layout.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             detailTaskTv.setVisibility(View.VISIBLE);
             bottom_btn_layout.setVisibility(View.VISIBLE);
 
         }
-        if(taskEty.getTask_type() == 2){
+        if (taskEty.getTask_type() == 2) {
             btnTaskItem.setText("信用卡注册");
-        }else
-        if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+        } else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
             btnTaskItem.setText("开始游戏");
-        }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
+        } else if (!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))) {
             btnTaskItem.setText("开始安装");
-        }
-        else {
+        } else {
             DownLoadInfo downLoadInfo = DDProviderHelper.getInstance()
                     .getDownloadTaskToPackname(activity, taskEty.getPackage_names());
-            if(downLoadInfo != null && !TextUtils.isEmpty(downLoadInfo.getMApkPath())){
+            if (downLoadInfo != null && !TextUtils.isEmpty(downLoadInfo.getMApkPath())) {
                 btnTaskItem.setText("开始安装");
-            }else {
+            } else {
                 btnTaskItem.setText("下载游戏");
             }
 
@@ -165,7 +169,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     }
 
     private void netTaskSchedule() {
-        if(mPd == null || !mPd.isShowing())
+        if (mPd == null || !mPd.isShowing())
             showProgress();
         SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCardDesc(id)
                 .subscribeOn(Schedulers.io())
@@ -173,20 +177,21 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                        if (BuildConfig.DEBUG)
+                            System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
                         taskEty = taskReleaseEty.getTask();
+                        initData();
                         taskSchedule();
                         hideProgress();
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                        if (BuildConfig.DEBUG)
+                            System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
                         hideProgress();
-                        G.showToast(baseMessage.getMsg()+"");
+                        G.showToast(baseMessage.getMsg() + "");
                     }
                 });
     }
@@ -202,7 +207,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.detail_task_tv://查看任务截图
-                if(TextUtils.isEmpty(taskEty.getScreenshots())){
+                if (TextUtils.isEmpty(taskEty.getScreenshots())) {
                     G.showToast("任务截图为空");
                     return;
                 }
@@ -214,7 +219,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
                 break;
             case R.id.btn_task_item:
                 showProgress();
-                if(taskReleaseEty == null || taskReleaseEty.getAccepted_task_id() == 0){
+                if (taskReleaseEty == null || taskReleaseEty.getAccepted_task_id() == 0) {
                     acceptTask();
                 } else {
                     goWeb();
@@ -230,38 +235,38 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     private void acceptTask() {
         JSONObject object = new JSONObject();
         object.put("device_id", DeviceUtil.getDeviceId(activity));
-        object.put("release_task_id", Integer.valueOf(taskReleaseEty.getId()+""));
+        object.put("release_task_id", Integer.valueOf(taskReleaseEty.getId() + ""));
         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_ACCEPT);
         SheepApp.getInstance().getNetComponent().getApiService().releaseTaskCreditCard(object)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                if(BuildConfig.DEBUG)
-                                    System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
-                                goWeb();
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                if (baseMessage.getCode() == 1001){//已经接受过该任务
-                                    onNext(baseMessage);
-                                } else {
-                                    if(BuildConfig.DEBUG)
-                                        System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                                    G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
-                                    hideProgress();
-                                }
-                            }
-                        });
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if (BuildConfig.DEBUG)
+                            System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
+                        goWeb();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if (baseMessage.getCode() == 1001) {//已经接受过该任务
+                            onNext(baseMessage);
+                        } else {
+                            if (BuildConfig.DEBUG)
+                                System.out.println("baseMessage onError " + JSON.toJSONString(baseMessage));
+                            G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                            hideProgress();
+                        }
+                    }
+                });
     }
 
     private void goWeb() {
         Jump2View.getInstance().tryGoCreditCardWeb(activity, EntityUtils.getExtInfo(taskEty.getExt()).getId(), new Action1<String>() {
             @Override
             public void call(String msg) {
-                if(msg == null){
+                if (msg == null) {
                     netTaskSchedule();
                 } else {
                     G.showToast(msg);
@@ -274,13 +279,13 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     /**
      * 任务进度
      */
-    private void taskSchedule(){
+    private void taskSchedule() {
         llInfos.removeAllViews();
         if (taskEty != null && taskReleaseEty != null && taskReleaseEty.getAccepted_task_id() != 0) {
             llInfos.addView(getStep("领取任务", "已完成", 0));
-            if(taskEty.getTask_type() == 2){//信用卡
+            if (taskEty.getTask_type() == 2) {//信用卡
                 llInfos.addView(getStep("信用卡注册", "待完成", 0));
-            }else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+            } else if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
                 llInfos.addView(getStep("下载游戏", "已完成", 0));
                 llInfos.addView(getStep("完成任务", "进行中", 1));
             } else {

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

@@ -6,14 +6,44 @@
 
     <include layout="@layout/title" />
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_margin="@dimen/content_padding_10"
+        android:padding="@dimen/content_padding_10"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:orientation="vertical">
 
         <TextView
+            android:id="@+id/act_notice_title_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:textSize="15sp"
+            android:textColor="#444444"
+            android:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/act_notice_time_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:layout_marginTop="8dp"
+            android:textSize="12sp"
+            android:textColor="#afafaf"
+            android:text="@string/app_name"/>
+        <TextView
             android:id="@+id/act_notice_content_tv"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-    </ScrollView>
-
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:lineSpacingExtra="5dp"
+            android:text="@string/app_name"
+            android:textSize="13sp"
+            android:textColor="#939393"/>
+    </LinearLayout>
+    <TextView
+        android:id="@+id/act_notice_back_tv"
+        style="@style/style_button"
+        android:text="返回小绵羊"/>
 </LinearLayout>

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

@@ -44,7 +44,7 @@
             android:id="@+id/my_money_item_recharge_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:gravity="end"
             android:singleLine="true"
             android:text="2018/05/07 20:59"