下载模块bug修复

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

@@ -16,13 +16,14 @@ public class Config {
     }
 
         public String mBaseUrl = "http://10.8.220.132:8088";
+//        public String mBaseUrl = "http://10.8.220.130:8088";
 //        public String mBaseUrl = "http://10.8.220.213:8088";
 //    public String mBaseUrl = "http://10.8.220.130:8088";
     //    public String mBaseUrl = "http://api.task.bandaimi.com";
     //      public String mBaseUrl = "http://test.ss.shouyouquan.com";
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
     public final static String BUGLY_APPID = "0dd998212c";
-    public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
+    public String[] mUrlList = new String[]{"http://10.8.220.213:8088","http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
 
     public void setBaseUrl(String url) {
         this.mBaseUrl = url;

app/src/main/java/com/sheep/jiuyan/samllsheep/adapter/DownListAdapter.java

@@ -33,15 +33,17 @@ public class DownListAdapter extends BaseAdapter {
     private Context mContext;
     private final LayoutInflater mInflater;
     private DownloadManager downloadManager;
+
     public DownListAdapter(Context context) {
-        mContext=context;
-        mInflater=LayoutInflater.from(mContext);
-        downloadManager=DownloadManager.getInstance();
+        mContext = context;
+        mInflater = LayoutInflater.from(mContext);
+        downloadManager = DownloadManager.getInstance();
     }
 
     @Override
     public int getCount() {
-        if (downloadManager == null) return 0;
+        if (downloadManager == null)
+            return 0;
         return downloadManager.getDownloadListCount();
     }
 
@@ -64,18 +66,18 @@ public class DownListAdapter extends BaseAdapter {
             view = mInflater.inflate(R.layout.down_item, null);
             holder = new DownloadItemViewHolder(view, downloadInfo);
             view.setTag(holder);
-            holder.refresh();
         } else {
             holder = (DownloadItemViewHolder) view.getTag();
             holder.update(downloadInfo);
         }
-
+        holder.refreshkem();
         if (downloadInfo.getState().value() < DownloadState.FINISHED.value()) {
             try {
                 downloadManager.startDownload(
+                        downloadInfo.getPkgName(),
                         downloadInfo.getUrl(),
                         downloadInfo.getLabel(),
-                        downloadInfo.getFileSavePath(),"",
+                        downloadInfo.getFileSavePath(), "",
                         downloadInfo.isAutoResume(),
                         downloadInfo.isAutoRename(),
                         holder);
@@ -86,24 +88,23 @@ public class DownListAdapter extends BaseAdapter {
         return view;
     }
 
-    class DownloadItemViewHolder extends DownloadViewHolder implements View.OnClickListener{
+    class DownloadItemViewHolder extends DownloadViewHolder implements View.OnClickListener {
 
         private ImageView ImageView;
-        private TextView  tv_game_name;
-        private ImageView  iv_state;
-        private ImageView  iv_remove;
+        private TextView tv_game_name;
+        private ImageView iv_state;
+        private ImageView iv_remove;
         private ProgressBar pb_download;
-        private TextView   tv_prorgess;
+        private TextView tv_prorgess;
 
         public DownloadItemViewHolder(View view, DownloadInfo downloadInfo) {
             super(view, downloadInfo);
-            ImageView=(ImageView) view.findViewById(R.id.img_icon);
-            tv_game_name=(TextView) view.findViewById(R.id.tv_game_name);
-            iv_state=(ImageView) view.findViewById(R.id.iv_state);
-            pb_download=(ProgressBar) view.findViewById(R.id.pb_download);
-            iv_remove=(ImageView)view.findViewById(R.id.iv_remove);
-            tv_prorgess=(TextView) view.findViewById(R.id.tv_prorgess);
-            refresh();
+            ImageView = (ImageView) view.findViewById(R.id.img_icon);
+            tv_game_name = (TextView) view.findViewById(R.id.tv_game_name);
+            iv_state = (ImageView) view.findViewById(R.id.iv_state);
+            pb_download = (ProgressBar) view.findViewById(R.id.pb_download);
+            iv_remove = (ImageView) view.findViewById(R.id.iv_remove);
+            tv_prorgess = (TextView) view.findViewById(R.id.tv_prorgess);
             Glide.with(mContext)
                     .load(downloadInfo.getIcon())
                     .placeholder(R.drawable.icon)
@@ -112,13 +113,11 @@ public class DownListAdapter extends BaseAdapter {
             iv_state.setOnClickListener(this);
             iv_remove.setOnClickListener(this);
             tv_prorgess.setOnClickListener(this);
-
         }
 
         @Override
         public void update(DownloadInfo downloadInfo) {
             super.update(downloadInfo);
-            refresh();
         }
 
         @Override
@@ -150,10 +149,11 @@ public class DownListAdapter extends BaseAdapter {
         public void onCancelled(Callback.CancelledException cex) {
             refresh();
         }
+
         public void refresh() {
             tv_game_name.setText(downloadInfo.getLabel());
             pb_download.setProgress(downloadInfo.getProgress());
-            tv_prorgess.setText(downloadInfo.getProgress()+"%");
+            tv_prorgess.setText(downloadInfo.getProgress() + "%");
             DownloadState state = downloadInfo.getState();
             switch (state) {
                 case WAITING:
@@ -165,9 +165,13 @@ public class DownListAdapter extends BaseAdapter {
                     iv_state.setImageResource(R.drawable.icon_begin);
                     break;
                 case FINISHED:
-                    PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
                     iv_state.setVisibility(View.GONE);
-                    tv_prorgess.setText("完成");
+                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
+                        tv_prorgess.setText("已安装");
+                    } else {
+                        tv_prorgess.setText("安 装");
+                        PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                    }
                     break;
                 default:
                     iv_state.setImageResource(R.drawable.icon_begin);
@@ -175,67 +179,95 @@ public class DownListAdapter extends BaseAdapter {
             }
         }
 
-
-
+        public void refreshkem() {
+            tv_game_name.setText(downloadInfo.getLabel());
+            pb_download.setProgress(downloadInfo.getProgress());
+            tv_prorgess.setText(downloadInfo.getProgress() + "%");
+            DownloadState state = downloadInfo.getState();
+            switch (state) {
+                case WAITING:
+                case STARTED:
+                    iv_state.setImageResource(R.drawable.icon_stop);
+                    break;
+                case ERROR:
+                case STOPPED:
+                    iv_state.setImageResource(R.drawable.icon_begin);
+                    break;
+                case FINISHED:
+                    iv_state.setVisibility(View.GONE);
+                    if (PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
+                        tv_prorgess.setText("已安装");
+                    } else {
+                        tv_prorgess.setText("安 装");
+                    }
+                    break;
+                default:
+                    iv_state.setImageResource(R.drawable.icon_begin);
+                    break;
+            }
+        }
         @Override
         public void onClick(View view) {
-             switch (view.getId()){
-                 case  R.id.iv_state:
-                     DownloadState state = downloadInfo.getState();
-                     switch (state) {
-                         case WAITING:
-                         case STARTED:
-                             downloadManager.stopDownload(downloadInfo);
-
-                             break;
-                         case ERROR:
-                         case STOPPED:
-                             try {
-                                 downloadManager.startDownload(
-                                         downloadInfo.getUrl(),
-                                         downloadInfo.getLabel(),
-                                         downloadInfo.getFileSavePath(),"",
-                                         downloadInfo.isAutoResume(),
-                                         downloadInfo.isAutoRename(),
-                                         this);
-                             } catch (DbException ex) {
-                                 Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
-                             }
-                             break;
-                         case FINISHED:
-                             Toast.makeText(x.app(), "已经下载完成", Toast.LENGTH_LONG).show();
-                             PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                             break;
-                         default:
-                             break;
-                     }
-                     break;
-                 case  R.id.iv_remove:
-                     try {
-                         downloadManager.removeDownload(downloadInfo);
-                          notifyDataSetChanged();
-                     } catch (DbException e) {
-                          Toast.makeText(x.app(), "移除任务失败", Toast.LENGTH_LONG).show();
-                     }
-                     break;
-
-                 case  R.id.tv_prorgess:
-                     DownloadState states = downloadInfo.getState();
-
-                     switch (states){
-                         case FINISHED:
-                             PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
-                             break;
-
-                     }
-
-                     break;
-             }
+            switch (view.getId()) {
+                case R.id.iv_state:
+                    DownloadState state = downloadInfo.getState();
+                    switch (state) {
+                        case WAITING:
+                        case STARTED:
+                            downloadManager.stopDownload(downloadInfo);
+
+                            break;
+                        case ERROR:
+                        case STOPPED:
+                            try {
+                                downloadManager.startDownload(
+                                        downloadInfo.getPkgName(),
+                                        downloadInfo.getUrl(),
+                                        downloadInfo.getLabel(),
+                                        downloadInfo.getFileSavePath(), "",
+                                        downloadInfo.isAutoResume(),
+                                        downloadInfo.isAutoRename(),
+                                        this);
+                            } catch (DbException ex) {
+                                Toast.makeText(x.app(), "添加下载失败", Toast.LENGTH_LONG).show();
+                            }
+                            break;
+                        case FINISHED:
+                            Toast.makeText(x.app(), "已经下载完成", Toast.LENGTH_LONG).show();
+                            PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case R.id.iv_remove:
+                    try {
+                        downloadManager.removeDownload(downloadInfo);
+                        File file = new File(downloadInfo.getFileSavePath());
+                        if (file.exists()) {
+                            file.delete();
+                        }
+                        notifyDataSetChanged();
+                    } catch (DbException e) {
+                        Toast.makeText(x.app(), "移除任务失败", Toast.LENGTH_LONG).show();
+                    }
+                    break;
+
+                case R.id.tv_prorgess:
+                    DownloadState states = downloadInfo.getState();
+                    switch (states) {
+                        case FINISHED:
+                            PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            break;
+                    }
+
+                    break;
+            }
         }
     }
 
 
-    }
+}
 
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadCallback.java

@@ -26,7 +26,8 @@ import java.lang.ref.WeakReference;
     }
 
     public boolean switchViewHolder(DownloadViewHolder viewHolder) {
-        if (viewHolder == null) return false;
+        if (viewHolder == null)
+            return false;
 
         synchronized (DownloadCallback.class) {
             if (downloadInfo != null) {
@@ -49,7 +50,8 @@ import java.lang.ref.WeakReference;
     }
 
     private DownloadViewHolder getViewHolder() {
-        if (viewHolderRef == null) return null;
+        if (viewHolderRef == null)
+            return null;
         DownloadViewHolder viewHolder = viewHolderRef.get();
         if (viewHolder != null) {
             DownloadInfo downloadInfo = viewHolder.getDownloadInfo();

app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadInfo.java

@@ -30,6 +30,9 @@ public class DownloadInfo {
     @Column(name = "label")
     private String label;
 
+    @Column(name = "pkgName")
+    private String pkgName;
+
     @Column(name = "fileSavePath")
     private String fileSavePath;
 
@@ -45,6 +48,15 @@ public class DownloadInfo {
     @Column(name = "autoRename")
     private boolean autoRename;
 
+
+    public String getPkgName() {
+        return pkgName;
+    }
+
+    public void setPkgName(String pkgName) {
+        this.pkgName = pkgName;
+    }
+
     public long getId() {
         return id;
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/download/DownloadManager.java

@@ -81,7 +81,7 @@ public final class DownloadManager {
         return downloadInfoList.get(index);
     }
 
-    public synchronized void startDownload(String url, String label, String savePath,String imageUrl,
+    public synchronized void startDownload(String pkg, String url, String label, String savePath, String imageUrl,
                                            boolean autoResume, boolean autoRename,
                                            DownloadViewHolder viewHolder) throws DbException {
 
@@ -114,6 +114,7 @@ public final class DownloadManager {
             downloadInfo.setFileSavePath(fileSavePath);
             downloadInfo.setIcon(imageUrl);
             downloadInfo.setState(DownloadState.STARTED);
+            downloadInfo.setPkgName(pkg);
             db.saveBindingId(downloadInfo);
         }
 

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

@@ -24,11 +24,13 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.event.FloatMsg;
 import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.page.ShotScreenActivity;
+import com.sheep.jiuyan.samllsheep.page.SplashActivity;
 import com.sheep.jiuyan.samllsheep.service.TopService;
 import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
 import com.sheep.jiuyan.samllsheep.utils.OpenService;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -182,7 +184,11 @@ public class FloatService extends Service implements View.OnClickListener {
         } else if (i == R.id.img_open_left || i == R.id.img_open_right) {
             mLeft.setVisibility(View.GONE);
             mRight.setVisibility(View.GONE);
-            intent = new Intent(getApplicationContext(), MainActivity.class);
+            if (!TextUtils.isEmpty(SpUtils.getOpenId(getApplicationContext()))) {
+                intent = new Intent(getApplicationContext(), MainActivity.class);
+            } else {
+                intent = new Intent(getApplicationContext(), SplashActivity.class);
+            }
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(intent);
 

app/src/main/java/com/sheep/jiuyan/samllsheep/net/NetManager.java

@@ -51,6 +51,9 @@ public class NetManager {
                 param += el.getKey() + "=" + el.getValue();
                 param += "&";
             }
+            if (param.endsWith("&")) {
+                param = param.substring(0, param.length() - 1);
+            }
             url += "?" + param;
         }
         Request request = new Request.Builder().url(url).get().build();

app/src/main/java/com/sheep/jiuyan/samllsheep/net/Url.java

@@ -48,9 +48,7 @@ public class Url {
     //提供微信号页面
     public static String ADD_CHILD_WX = Config.instance().mBaseUrl + "/static/apply3.html";
     //任务引导
-    public static String TASK_GUIDE = Config.instance().mBaseUrl + "/static/apply3.html";
-    //新手任务
-    public static String NEW_USER_GUIDE = Config.instance().mBaseUrl + "/static/apply3.html";
+    public static String TASK_GUIDE = Config.instance().mBaseUrl + "/static/task_guidance.html";
     //登录好玩
     public static String LOGIN = Config.instance().mBaseUrl + "/v1/user/login";
     //授权
@@ -69,5 +67,7 @@ public class Url {
     public static String GET_NEW_TASK_RED = Config.instance().mBaseUrl + "/v1/newbie/receive";
     //新手任务奖励
     public static String GET_NEW_TASK_MONEY = Config.instance().mBaseUrl + "/v1/newbie/know_the_sheep";
+    //提交任务指导
+    public static String TASK_GUIDE_WEB = Config.instance().mBaseUrl + "/static/task_guidance.html";
 
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java

@@ -1,6 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page;
 
 import android.app.AlertDialog;
+import android.media.MediaRouter;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
@@ -85,10 +86,13 @@ public class AskFriendActivity extends BaseActivity implements View.OnClickListe
         NetManager.get(Url.USER_INVITE_INFO, map, getApplicationContext(), new SheepCallback<UerInviteInfo>(this) {
             @Override
             public void success(UerInviteInfo uerInviteInfo) {
-                tv_reward_size.setText(uerInviteInfo.getUser().getCommission());
-                tv_friend_size.setText(uerInviteInfo.getUser().getInviteNum());
-                tv_proportion_size.setText(uerInviteInfo.getUser().getProportion());
-                tv_today_size.setText(uerInviteInfo.getUser().getTodayNum());
+                if (uerInviteInfo!=null&&uerInviteInfo.getUser()!=null){
+                    tv_reward_size.setText(uerInviteInfo.getUser().getCommission());
+                    tv_friend_size.setText(uerInviteInfo.getUser().getInviteNum());
+                    tv_proportion_size.setText(uerInviteInfo.getUser().getProportion());
+                    tv_today_size.setText(uerInviteInfo.getUser().getTodayNum());
+                }
+
             }
         });
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/DownloadActivity.java

@@ -32,7 +32,7 @@ import java.io.File;
 
 public class DownloadActivity extends BaseActivity {
 
-    private String DOWNLOAD_URL = "https://qiniu.kuaifazs.com/fszhskp_12493_haowan_2.1.2.apk";
+    private String DOWNLOAD_URL = "";
     //    private TextView mTvDownload;
     private ProgressBar mPbDownload;
     private ImageView mImgIcon;

app/src/main/java/com/sheep/jiuyan/samllsheep/page/GameDetailActivity.java

@@ -132,7 +132,7 @@ public class GameDetailActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(GameDetailActivity.this, WebActivity.class);
-                intent.putExtra(WebActivity.INTENT_URL, Url.REQUEST_HOOK);
+                intent.putExtra(WebActivity.INTENT_URL, Url.TASK_GUIDE_WEB);
                 intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
                 startActivity(intent);
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -90,7 +90,7 @@ public class LoginActivity extends BaseActivity {
             }
         });
         if (BuildConfig.DEBUG)
-            mImgLogin.setOnLongClickListener(new View.OnLongClickListener() {
+            mTvRegister.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
                     initDialog();
@@ -160,7 +160,12 @@ public class LoginActivity extends BaseActivity {
 
                     @Override
                     public void failure(IOException e) {
-                        Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                        String message = e.getMessage();
+                        if (message.contains("参数错误")) {
+                            message = message.replace("参数错误", "");
+                        }
+                        message = message.trim();
+                        Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show();
                         mTvWx.setEnabled(true);
                     }
                 });
@@ -169,6 +174,7 @@ public class LoginActivity extends BaseActivity {
             @Override
             public void failure(IOException e) {
                 Toast.makeText(LoginActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                mTvWx.setEnabled(true);
             }
         });
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -10,6 +10,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.TextInputEditText;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
@@ -23,6 +24,8 @@ import android.view.animation.RotateAnimation;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -30,6 +33,8 @@ import com.bumptech.glide.Glide;
 import com.mylhyl.acp.Acp;
 import com.mylhyl.acp.AcpListener;
 import com.mylhyl.acp.AcpOptions;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.download.DownloadManager;
@@ -84,6 +89,7 @@ public class MainActivity extends BaseActivity {
 
     private ImageButton btn;
     private AlertDialog mRedDialog;
+    private TextView mTvRedMoney;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -103,6 +109,15 @@ public class MainActivity extends BaseActivity {
 
     @Override
     public void initListener() {
+
+        if (BuildConfig.DEBUG)
+            mImgBag.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    initDialog();
+                    return true;
+                }
+            });
         //防止右滑一部分后，还能下拉刷新。
         mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
@@ -196,21 +211,14 @@ public class MainActivity extends BaseActivity {
                 .dontAnimate()
                 .into((CircleImageView) findViewById(R.id.img_user));
 
-        HashMap<String, String> map = new HashMap<>();
-        map.put("open_id", SpUtils.getOpenId(this));
-        NetManager.get(Url.USER_ISFINISH_NEW_TASK, map, getApplicationContext(), new SheepCallback<Boolean>(this) {
-            @Override
-            public void success(Boolean aBoolean) {
-                if (aBoolean) {
-                    mImgBag.clearAnimation();
-                    mImgBag.setVisibility(View.GONE);
-                }
-            }
+        if (G.mUser.getReceived_red_packet() == 1) {
+            mImgBag.clearAnimation();
+            mImgBag.setVisibility(View.GONE);
+        }else {
+            mImgBag.setVisibility(View.VISIBLE);
+            startAnimation(mImgBag);
+        }
 
-            @Override
-            public void failure(IOException e) {
-            }
-        });
     }
 
     private void showNewDialog() {
@@ -244,6 +252,41 @@ public class MainActivity extends BaseActivity {
         mDialog.show();
     }
 
+    private void initDialog() {
+        if (mDialog == null) {
+            final View view = View.inflate(this, R.layout.baseurl_dialog, null);
+            final RadioGroup mRgUrl = (RadioGroup) view.findViewById(R.id.rg_url);
+            final TextInputEditText mEtUrl = (TextInputEditText) view.findViewById(R.id.et_url);
+            TextView tvEnter = (TextView) view.findViewById(R.id.tv_enter);
+            for (String url : Config.instance().mUrlList) {
+                RadioButton button = new RadioButton(this);
+                button.setText(url);
+                mRgUrl.addView(button);
+            }
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            mDialog = builder.setView(view).create();
+            mDialog.setCanceledOnTouchOutside(true);
+            tvEnter.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    String url = mEtUrl.getText().toString().trim();
+                    if (TextUtils.isEmpty(url)) {
+                        int id = mRgUrl.getCheckedRadioButtonId();
+                        if (id != -1) {
+                            RadioButton btn = view.findViewById(id);
+                            url = btn.getText().toString().trim();
+                        }
+                    }
+                    if (!TextUtils.isEmpty(url)) {
+                        Config.instance().setBaseUrl(url);
+                    }
+                    mDialog.dismiss();
+                }
+            });
+        }
+        mDialog.show();
+    }
+
     @Override
     public void initView() {
         ((TextView) findViewById(R.id.txt_baseactivity_title)).setText("我的奖金");
@@ -267,7 +310,6 @@ public class MainActivity extends BaseActivity {
         mSwipeRefreshLayout.setProgressViewOffset(true,
                 getResources().getDimensionPixelOffset(R.dimen.layout_heigh_default),
                 G.getRealPix(80));
-
         mAdpMainPageViewPager = new AdpMainPageViewPager(getSupportFragmentManager());
         mFgtMainPageTask = new FgtMainPageTask();
         mAdpMainPageViewPager.add(mFgtMainPageTask);
@@ -324,8 +366,8 @@ public class MainActivity extends BaseActivity {
             map.put("open_id", SpUtils.getOpenId(this));
             NetManager.postForm(Url.GET_NEW_TASK_RED, map, getApplicationContext(), new SheepCallback<String>(this) {
                 @Override
-                public void success(String o) {
-                    showRedbagDialog();
+                public void success(String money) {
+                    showRedbagDialog(money);
                 }
 
                 @Override
@@ -342,7 +384,7 @@ public class MainActivity extends BaseActivity {
         mRappTabLayout.selectTab(tab.index);
     }
 
-    private void showRedbagDialog() {
+    private void showRedbagDialog(String money) {
         if (mRedDialog == null) {
             AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this, R.style.Theme_Transparent);
             View view = View.inflate(this, R.layout.new_user_red_dialog, null);
@@ -354,15 +396,17 @@ public class MainActivity extends BaseActivity {
                     mRedDialog.dismiss();
                 }
             });
-            view.findViewById(R.id.img_begin_new).setOnClickListener(new View.OnClickListener() {
+            view.findViewById(R.id.btn_get_money).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     mRedDialog.dismiss();
+                    mFgtMainPageTask.initData(false);
                 }
             });
-            TextView tvRedMoney = (TextView) view.findViewById(R.id.tv_money);
+            mTvRedMoney = (TextView) view.findViewById(R.id.tv_money);
             mRedDialog.setCanceledOnTouchOutside(false);
         }
+        mTvRedMoney.setText(money);
         mRedDialog.show();
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/NewUserGuideActivity.java

@@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -83,11 +84,12 @@ public class NewUserGuideActivity extends BaseActivity {
         HashMap<String, String> map = new HashMap<>();
         map.put("open_id", SpUtils.getOpenId(this));
         map.put("task_id", "" + id);
-        NetManager.get(Url.GET_NEW_TASK_MONEY, map, getApplicationContext(), new SheepCallback<String>(this) {
+        NetManager.postForm(Url.GET_NEW_TASK_MONEY, map, getApplicationContext(), new SheepCallback<String>(this) {
             @Override
             public void success(String s) {
                 if (TextUtils.equals(s, "OK")) {
                     initData();
+//                    Toast.makeText(NewUserGuideActivity.this, "领取成功！", Toast.LENGTH_SHORT).show();
                 }
             }
 
@@ -132,7 +134,7 @@ public class NewUserGuideActivity extends BaseActivity {
 
             @Override
             public void success(Boolean aBoolean) {
-                mBtnRed.setEnabled(true);
+                mBtnRed.setEnabled(aBoolean);
             }
 
             @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/page/RegisterActivity.java

@@ -103,7 +103,12 @@ public class RegisterActivity extends BaseActivity {
             @Override
             public void failure(IOException e) {
                 mBtnCode.setEnabled(true);
-                Toast.makeText(RegisterActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                String message = e.getMessage();
+                if (message.contains("参数错误")) {
+                    message = message.replace("参数错误", "");
+                }
+                message = message.trim();
+                Toast.makeText(RegisterActivity.this, message, Toast.LENGTH_SHORT).show();
             }
         });
     }
@@ -149,7 +154,12 @@ public class RegisterActivity extends BaseActivity {
 
             @Override
             public void failure(IOException e) {
-                Toast.makeText(RegisterActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                String message = e.getMessage();
+                if (message.contains("参数错误")) {
+                    message = message.replace("参数错误", "");
+                }
+                message = message.trim();
+                Toast.makeText(RegisterActivity.this, message, Toast.LENGTH_SHORT).show();
                 mTvWx.setEnabled(true);
             }
         });

app/src/main/java/com/sheep/jiuyan/samllsheep/page/ShotScreenActivity.java

@@ -3,9 +3,13 @@ package com.sheep.jiuyan.samllsheep.page;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.media.projection.MediaProjectionManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
+import android.text.TextUtils;
 import android.view.Window;
 import android.widget.Toast;
 
@@ -16,9 +20,16 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+
+import static java.security.AccessController.getContext;
 
 /**
  * Created by kemllor on 2017/12/13.
@@ -27,6 +38,8 @@ import java.util.HashMap;
 public class ShotScreenActivity extends Activity {
 
     public static final int REQUEST_MEDIA_PROJECTION = 0x2893;
+    private Bitmap mBitmap;
+    private String mPath;
 
 
     @Override
@@ -43,7 +56,13 @@ public class ShotScreenActivity extends Activity {
                     ((MediaProjectionManager) getSystemService(Context.MEDIA_PROJECTION_SERVICE))
                             .createScreenCaptureIntent(), REQUEST_MEDIA_PROJECTION);
         } else {
-            toast("版本过低,无法截屏");
+            String path = doCaptureScreeKITKAT();
+            if (path != null) {
+                commitTask(path);
+            } else {
+                toast("版本过低,无法自动截屏，请手动截图从任务攻略界面上传");
+                finish();
+            }
         }
     }
 
@@ -87,9 +106,67 @@ public class ShotScreenActivity extends Activity {
 
             @Override
             public void failure(IOException e) {
-                Toast.makeText(ShotScreenActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                toast("自动截屏失败，请手动截图从任务攻略界面上传");
+//                Toast.makeText(ShotScreenActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
                 finish();
             }
         });
     }
+
+    /**
+     * 截图
+     */
+    public String doCaptureScreeKITKAT() {
+        String dir = "/sdcard/Sheep";
+        File file = new File(dir);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        mPath = dir + "/task.png";
+        List<String> command = new ArrayList<>();
+        command.add("screencap -p /sdcard/test.png");
+        return getScreenShotStream(command.toArray(new String[]{}));
+    }
+
+    /**
+     * 获取截屏流，转换成位图
+     */
+    public String getScreenShotStream(String[] commands) {
+        if (commands == null || commands.length == 0)
+            return null;
+        Process process = null;
+        DataOutputStream os;
+        try {
+            process = Runtime.getRuntime().exec("screencap -p /sdcard/test.png");
+            os = new DataOutputStream(process.getOutputStream());
+            for (String command : commands) {
+                if (command == null) {
+                    continue;
+                }
+                os.write(command.getBytes());
+                os.writeBytes("/n");
+                os.flush();
+            }
+            os.writeBytes("exit/n");
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (process != null) {
+                    process.exitValue();
+                }
+            } catch (IllegalThreadStateException e) {
+                process.destroy();
+            }
+        }
+        File fileImage = new File(mPath);
+        if (fileImage.exists()) {
+            return mPath;
+        }
+        return null;
+    }
+
+
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java

@@ -6,6 +6,7 @@ import android.os.Build;
 import android.os.SystemClock;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.Toast;
 
 import com.mylhyl.acp.Acp;
@@ -38,16 +39,9 @@ public class SplashActivity extends BaseActivity {
 
     @Override
     public void initListener() {
-
-    }
-
-    @Override
-    public void initData() {
-        getSA();
-        new Thread(new Runnable() {
+        findViewById(R.id.btn_join).setOnClickListener(new View.OnClickListener() {
             @Override
-            public void run() {
-                SystemClock.sleep(3000);
+            public void onClick(View v) {
                 String openId = SpUtils.getOpenId(getApplicationContext());
                 if (!TextUtils.isEmpty(openId)) {
                     Intent intent = new Intent(SplashActivity.this, MainActivity.class);
@@ -59,17 +53,23 @@ public class SplashActivity extends BaseActivity {
                     finish();
                 }
             }
-        }).start();
+        });
+    }
 
+    @Override
+    public void initData() {
+        getSA();
     }
 
     /**
      * 申请读写权限6.0
      */
     private void getSA() {
-        boolean has = PremissUtils.hasPermission(this);
-        if (!has) {
-            PremissUtils.openUsageAccessPage(this);
+        if (Build.VERSION.SDK_INT >= 23) {
+            boolean has = PremissUtils.hasPermission(this);
+            if (!has) {
+                PremissUtils.openUsageAccessPage(this);
+            }
         }
         if (Build.VERSION.SDK_INT >= 23) {
             if (Settings.canDrawOverlays(SplashActivity.this)) {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/XDownLoadActivity.java

@@ -26,10 +26,10 @@ import java.io.IOException;
  * Created by Administrator on 2018/1/22.
  */
 
-public class XDownLoadActivity  extends BaseActivity {
+public class XDownLoadActivity extends BaseActivity {
 
-    private ListView  lv;
-    DownListAdapter  mAdapter;
+    private ListView lv;
+    DownListAdapter mAdapter;
 
     @Override
     protected int getLayoutId() {
@@ -38,9 +38,9 @@ public class XDownLoadActivity  extends BaseActivity {
 
     @Override
     public void initView() {
-        lv=(ListView)findViewById(R.id.lv);
+        lv = (ListView) findViewById(R.id.lv);
         TitleBarUtils.getInstance()
-                .setTitle(this,"任务下载")
+                .setTitle(this, "任务下载")
                 .setTitleFinish(this);
     }
 
@@ -55,18 +55,18 @@ public class XDownLoadActivity  extends BaseActivity {
         Task task = (Task) intent.getSerializableExtra("task");
         if (task != null) {
             ClassFileHelper.getInstance().createSDDirection();
-            File  mApkPath = new File(ClassFileHelper.DIR, task.getTitle()+ClassFileHelper.FILE_SUFFIX);
-            try {
-                DownloadManager.getInstance().startDownload(
-                        task.getDownLoadUrl(), task.getTitle(),
-                        mApkPath.getAbsolutePath(),task.getIcon(), true, false, null);
-            } catch (DbException e) {
-                e.printStackTrace();
+            File mApkPath = new File(ClassFileHelper.DIR, task.getTitle() + ClassFileHelper.FILE_SUFFIX);
+            if (!mApkPath.exists()) {
+                try {
+                    DownloadManager.getInstance().startDownload(task.getPkg(),
+                            task.getDownLoadUrl(), task.getTitle(),
+                            mApkPath.getAbsolutePath(), task.getIcon(), true, false, null);
+                } catch (DbException e) {
+                    e.printStackTrace();
+                }
             }
         }
-
-        mAdapter=new DownListAdapter(this);
+        mAdapter = new DownListAdapter(this);
         lv.setAdapter(mAdapter);
-
     }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpNewUserTask.java

@@ -47,7 +47,7 @@ public class AdpNewUserTask extends AdpCommonRecy<NewUserTask> {
     }
 
     @Override
-    public void convert(ViewHolder holder, final NewUserTask newTask) {
+    public void convert(final ViewHolder holder, final NewUserTask newTask) {
         holder.itemView.setTag(TAG_TASK, newTask);
         holder.getView(R.id.tv_task_title, TextView.class)
                 .setText(newTask.getTaskname());
@@ -57,6 +57,12 @@ public class AdpNewUserTask extends AdpCommonRecy<NewUserTask> {
         money.setText("+" + newTask.getMoney());
 
         TextView status = holder.getView(R.id.tv_status, TextView.class);
+        status.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                holder.itemView.callOnClick();
+            }
+        });
         if (newTask.getFlag() == 2) {
             status.setText("已领取");
             money.setVisibility(View.GONE);

app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/User.java

@@ -32,6 +32,16 @@ public class User implements Serializable {
     private String Balance;
     private String InvitationCode;
 
+    public int getReceived_red_packet() {
+        return received_red_packet;
+    }
+
+    public void setReceived_red_packet(int received_red_packet) {
+        this.received_red_packet = received_red_packet;
+    }
+
+    private int received_red_packet;
+
     public String getInvitationCode() {
         return InvitationCode;
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageOffline.java

@@ -83,6 +83,16 @@ public class FgtMainPageOffline extends BaseFragment {
                 startActivity(intent);
             }
         });
+        findViewById(R.id.img_add_wx).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getActivity(), WebActivity.class);
+                intent.putExtra(WebActivity.INTENT_URL, Url.ADD_CHILD_WX);
+                intent.putExtra(WebActivity.INTENT_TITLE, "添加微信号");
+                intent.putExtra(WebActivity.INTENT_LOAD_JS, true);
+                startActivity(intent);
+            }
+        });
     }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -19,7 +19,6 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
-import com.sheep.jiuyan.samllsheep.page.DownloadActivity;
 import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
 import com.sheep.jiuyan.samllsheep.page.MoneyHistroyActivity;
 import com.sheep.jiuyan.samllsheep.page.TaskRecordActivity;

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/PackageUtil.java

@@ -13,6 +13,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.v4.content.FileProvider;
 
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
 import java.io.File;
 import java.util.List;
 
@@ -81,7 +83,7 @@ public class PackageUtil {
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         if (Build.VERSION.SDK_INT >= 24) { //判读版本是否在7.0以上
-            Uri apkUri = FileProvider.getUriForFile(context, "com.jiuyan.sheep_children", file);
+            Uri apkUri = FileProvider.getUriForFile(context, SheepApp.mContext.getPackageName() + ".fileprovider", file);
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
         } else {

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

@@ -54,7 +54,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:text="3.拿我奖励"
+                    android:text="3.我拿奖励"
                     android:textColor="@color/black_dark"
                     android:textSize="15sp"
                     />

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

@@ -32,7 +32,6 @@
             android:id="@+id/tv_game_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2019-12-26"
             android:textColor="@color/black_dark"/>
 
         <TextView
@@ -41,7 +40,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            android:text="30%"
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
             />
@@ -82,7 +80,6 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:progress="3"
         />
 
 </LinearLayout>

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

@@ -57,10 +57,12 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recy_fgt_main_page_offline_task"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:paddingLeft="@dimen/content_padding_big"
         android:paddingRight="@dimen/content_padding_big">
 
     </android.support.v7.widget.RecyclerView>
 
+    <include
+        layout="@layout/foot_pop_change_user"/>
 </LinearLayout>

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

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/layout_heigh_large"
-    android:layout_marginTop="@dimen/content_padding_small"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/layout_heigh_large"
+              android:layout_marginLeft="@dimen/content_padding_big"
+              android:layout_marginTop="@dimen/content_padding_small"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/add" />
+        android:id="@+id/img_add_wx"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:src="@drawable/add"/>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="@dimen/layout_heigh_large"
-        android:gravity="center_vertical"
         android:layout_marginLeft="@dimen/content_padding_big"
+        android:gravity="center_vertical"
         android:text="添加新微信帐号"
         android:textColor="@color/colorPrimaryDark"
-        android:textSize="@dimen/text_size_5" />
+        android:textSize="@dimen/text_size_5"/>
 
 </LinearLayout>

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

@@ -11,12 +11,12 @@
         android:scaleType="centerCrop"
         android:src="@drawable/login_bg"/>
 
-    <LinearLayout
-        android:paddingLeft="@dimen/content_padding"
-        android:paddingRight="@dimen/content_padding"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding">
 
 
         <TextView
@@ -29,15 +29,13 @@
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_4"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="230dp"/>
 
         <EditText
             android:id="@+id/et_account"
             style="style_edt"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
+            android:layout_centerVertical="true"
             android:layout_margin="@dimen/content_padding_small"
             android:background="@drawable/sp_edt_background_login"
             android:hint="请输入帐号"
@@ -50,6 +48,7 @@
             style="style_edt"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
+            android:layout_below="@id/et_account"
             android:layout_margin="@dimen/content_padding_small"
             android:background="@drawable/sp_edt_background_login"
             android:hint="请输入密码"
@@ -67,23 +66,20 @@
             android:layout_gravity="center"
             android:src="@drawable/wx_logo"
             android:visibility="gone"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            />
+
         <TextView
             android:id="@+id/tv_wx"
             style="@style/style_btn"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
-            android:layout_margin="@dimen/content_padding_small"
+            android:layout_below="@id/et_psw"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_marginRight="@dimen/content_padding_small"
+            android:layout_marginTop="@dimen/layout_heigh_default"
             android:gravity="center"
             android:text="登 录"
             android:textSize="@dimen/text_size_4"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-    </LinearLayout>
+
+    </RelativeLayout>
 </FrameLayout>

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

@@ -76,7 +76,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/content_padding_small"
                                 android:textColor="@color/orange_text_light"
-                                android:textSize="@dimen/text_size_2"/>
+                                android:textSize="@dimen/text_size_3"/>
                         </LinearLayout>
 
 
@@ -93,7 +93,7 @@
                             android:paddingTop="@dimen/content_padding_small"
                             android:text="现金提现"
                             android:textColor="@color/orange_text_light"
-                            android:textSize="@dimen/text_size_2"
+                            android:textSize="@dimen/text_size_3"
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toTopOf="@+id/linearLayout"/>
 
@@ -155,6 +155,7 @@
         android:layout_height="40dp"
         android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
-        android:src="@drawable/hongbao"/>
+        android:src="@drawable/hongbao"
+        android:visibility="gone"/>
 
 </FrameLayout>

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

@@ -23,6 +23,7 @@
         style="@style/style_btn"
         android:layout_width="175dp"
         android:layout_height="40dp"
+        android:gravity="center"
         android:layout_alignBottom="@+id/imageView"
         android:layout_centerHorizontal="true"
         android:src="@drawable/begin_new"

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

@@ -11,7 +11,7 @@
         android:scaleType="centerCrop"
         android:src="@drawable/login_bg"/>
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -28,15 +28,15 @@
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_4"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="200dp"/>
+
 
         <EditText
             android:id="@+id/et_account"
             style="style_edt"
+            android:inputType="phone"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
+            android:layout_centerVertical="true"
             android:layout_margin="@dimen/content_padding_small"
             android:background="@drawable/sp_edt_background_login"
             android:hint="请输入手机号"
@@ -44,8 +44,10 @@
             android:textSize="@dimen/text_size_3"/>
 
         <LinearLayout
+            android:id="@+id/ll_code"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@id/et_account"
             android:layout_margin="@dimen/content_padding_small"
             android:orientation="horizontal"
             >
@@ -83,6 +85,7 @@
             style="style_edt"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
+            android:layout_below="@id/ll_code"
             android:layout_margin="@dimen/content_padding_small"
             android:background="@drawable/sp_edt_background_login"
             android:hint="请输入密码"
@@ -95,31 +98,28 @@
             style="style_edt"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
+            android:layout_below="@id/et_psw"
             android:layout_margin="@dimen/content_padding_small"
             android:background="@drawable/sp_edt_background_login"
             android:hint="请输入邀请码（选填）"
-            android:inputType="textPassword"
+            android:inputType="number"
             android:paddingLeft="@dimen/content_padding_big"
             android:textSize="@dimen/text_size_3"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            />
 
         <TextView
             android:id="@+id/tv_wx"
             style="@style/style_btn"
             android:layout_width="match_parent"
             android:layout_height="@dimen/edt_heigh_default"
-            android:layout_margin="@dimen/content_padding_small"
+            android:layout_below="@id/et_invite"
+            android:layout_marginTop="@dimen/layout_heigh_default"
+            android:layout_marginRight="@dimen/content_padding_small"
+            android:layout_marginLeft="@dimen/content_padding_small"
             android:gravity="center"
             android:text="注 册"
             android:textSize="@dimen/text_size_4"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-    </LinearLayout>
+
+    </RelativeLayout>
 </FrameLayout>

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

@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:orientation="vertical">
+
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:src="@drawable/splash_bg"/>
 
-</LinearLayout>
+    <TextView
+        android:id="@+id/btn_join"
+        style="@style/style_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center|bottom"
+        android:layout_marginBottom="25dp"
+        android:text="进入赚钱"
+        android:textSize="@dimen/text_size_5"/>
+
+</FrameLayout>

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

@@ -29,14 +29,22 @@
         android:textColor="@color/black_text_gray"/>
 
     <GridView
-        android:layout_marginLeft="@dimen/content_padding"
         android:id="@+id/gv_money"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginTop="@dimen/content_padding_big"
         android:numColumns="2">
     </GridView>
 
+    <TextView
+        android:layout_margin="@dimen/content_padding_big"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="注：每月25日开放提现"
+        android:textColor="@color/orange_text_light"
+        android:textSize="@dimen/text_size_3"/>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0dp"