修改各种bug

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

@@ -96,6 +96,7 @@ public class DownListAdapter extends BaseAdapter {
         private ImageView iv_remove;
         private ProgressBar pb_download;
         private TextView tv_prorgess;
+        private View ll_install;
 
         public DownloadItemViewHolder(View view, DownloadInfo downloadInfo) {
             super(view, downloadInfo);
@@ -105,6 +106,7 @@ public class DownListAdapter extends BaseAdapter {
             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);
+            ll_install = view.findViewById(R.id.ll_install);
             Glide.with(mContext)
                     .load(downloadInfo.getIcon())
                     .placeholder(R.drawable.icon)
@@ -113,6 +115,7 @@ public class DownListAdapter extends BaseAdapter {
             iv_state.setOnClickListener(this);
             iv_remove.setOnClickListener(this);
             tv_prorgess.setOnClickListener(this);
+            ll_install.setOnClickListener(this);
         }
 
         @Override
@@ -206,6 +209,7 @@ public class DownListAdapter extends BaseAdapter {
                     break;
             }
         }
+
         @Override
         public void onClick(View view) {
             switch (view.getId()) {
@@ -254,14 +258,17 @@ public class DownListAdapter extends BaseAdapter {
                     break;
 
                 case R.id.tv_prorgess:
+                case R.id.ll_install:
                     DownloadState states = downloadInfo.getState();
                     switch (states) {
                         case FINISHED:
-                            PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            if (!PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
+                                PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            }
                             break;
                     }
-
                     break;
+
             }
         }
     }

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

@@ -67,7 +67,5 @@ 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

@@ -86,13 +86,12 @@ 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) {
-                if (uerInviteInfo!=null&&uerInviteInfo.getUser()!=null){
+                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/BindWxActivity.java

@@ -14,6 +14,7 @@ import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.io.IOException;
 import java.util.HashMap;
 
 public class BindWxActivity extends BaseActivity implements View.OnClickListener {
@@ -28,11 +29,11 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void initView() {
-        mEtWx =(TextInputEditText) findViewById(R.id.et_wx);
+        mEtWx = (TextInputEditText) findViewById(R.id.et_wx);
         mTvWx = (TextView) findViewById(R.id.tv_wx);
         mRobot = (TextView) findViewById(R.id.tv_robot);
         TitleBarUtils.getInstance()
-                .setTitle(this,"绑定微信")
+                .setTitle(this, "绑定微信")
                 .setTitleFinish(this);
     }
 
@@ -64,7 +65,7 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
         String wxId = mEtWx.getText().toString().trim();
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (TextUtils.isEmpty(openId)) {
-//            startActivity(new Intent(this, LoginActivity.class));
+            //            startActivity(new Intent(this, LoginActivity.class));
         } else {
             HashMap<String, String> map = new HashMap<>();
             map.put("wx_id", wxId);
@@ -75,6 +76,11 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
                     Toast.makeText(BindWxActivity.this, s, Toast.LENGTH_SHORT).show();
                     finish();
                 }
+
+                @Override
+                public void failure(IOException e) {
+                    Toast.makeText(BindWxActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                }
             });
         }
     }

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.TASK_GUIDE_WEB);
+                intent.putExtra(WebActivity.INTENT_URL, mTask.getTask().getScreenshots());
                 intent.putExtra(WebActivity.INTENT_TITLE, "任务提交示意");
                 startActivity(intent);
             }

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

@@ -137,8 +137,12 @@ public class LoginActivity extends BaseActivity {
     private void loginFromHw() {
         String account = mEtAccount.getText().toString().trim();
         String psw = mEtPsw.getText().toString().trim();
-        if (TextUtils.isEmpty(account) || TextUtils.isEmpty(psw)) {
-            Toast.makeText(this, "缺少参数", Toast.LENGTH_SHORT).show();
+        if (TextUtils.isEmpty(psw)) {
+            Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (TextUtils.isEmpty(account)) {
+            Toast.makeText(this, "请输入帐号", Toast.LENGTH_SHORT).show();
             return;
         }
         HashMap<String, String> map = new HashMap<>();

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

@@ -214,7 +214,7 @@ public class MainActivity extends BaseActivity {
         if (G.mUser.getReceived_red_packet() == 1) {
             mImgBag.clearAnimation();
             mImgBag.setVisibility(View.GONE);
-        }else {
+        } else {
             mImgBag.setVisibility(View.VISIBLE);
             startAnimation(mImgBag);
         }
@@ -335,7 +335,6 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-
         if (DownloadManager.getInstance().getDownloadListCount() > 0) {
             btn.setImageResource(R.drawable.icon_download_red);
 

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

@@ -15,9 +15,14 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.MoneyHistroy;
 import com.sheep.jiuyan.samllsheep.page.entry.MoneyRecord;
+import com.sheep.jiuyan.samllsheep.utils.FileUtil;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -152,12 +157,15 @@ public class MoneyHistroyActivity extends BaseActivity {
                 holder.mTvMoney.setTextColor(getResources().getColor(R.color.orange_text_light));
             }
             holder.mTvMoney.setText(record.getData().getMoney());
-            holder.mTvTime.setText(record.getData().getCreateTime());
-
+            String date = FileUtil.transForDate(record.getData().getCreateTime());
+            holder.mTvTime.setText(date);
             return convertView;
         }
     }
 
+
+
+
     class TablViewHolder {
         private TextView mTvIn;
         private TextView mTvOut;

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

@@ -89,7 +89,7 @@ public class NewUserGuideActivity extends BaseActivity {
             public void success(String s) {
                 if (TextUtils.equals(s, "OK")) {
                     initData();
-//                    Toast.makeText(NewUserGuideActivity.this, "领取成功！", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(NewUserGuideActivity.this, "获取奖励(^.^)", Toast.LENGTH_SHORT).show();
                 }
             }
 

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

@@ -136,8 +136,16 @@ public class RegisterActivity extends BaseActivity {
         String psw = mEtPsw.getText().toString().trim();
         String code = mEtCode.getText().toString().trim();
         String inviteCode = mEtInvite.getText().toString().trim();
-        if (TextUtils.isEmpty(moble) || TextUtils.isEmpty(psw) || TextUtils.isEmpty(code)) {
-            Toast.makeText(this, "缺少参数", Toast.LENGTH_SHORT).show();
+        if (TextUtils.isEmpty(code)) {
+            Toast.makeText(this, "请输入验证码", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (TextUtils.isEmpty(psw)) {
+            Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (TextUtils.isEmpty(moble)) {
+            Toast.makeText(this, "请输入手机号", Toast.LENGTH_SHORT).show();
             return;
         }
         HashMap<String, String> map = new HashMap<>();
@@ -177,6 +185,12 @@ public class RegisterActivity extends BaseActivity {
                 startActivity(intent);
                 finish();
             }
+
+            @Override
+            public void failure(IOException e) {
+                Toast.makeText(RegisterActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                mTvWx.setEnabled(true);
+            }
         });
     }
 

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

@@ -106,8 +106,8 @@ public class ShotScreenActivity extends Activity {
 
             @Override
             public void failure(IOException e) {
-                toast("自动截屏失败，请手动截图从任务攻略界面上传");
-//                Toast.makeText(ShotScreenActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+//                toast("自动截屏失败，请手动截图从任务攻略界面上传");
+                Toast.makeText(ShotScreenActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
                 finish();
             }
         });

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

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
@@ -89,7 +90,7 @@ public class WebActivity extends BaseActivity {
         @JavascriptInterface
         public void submit(String user, String pass, String phone) {
             HashMap<String, String> map = new HashMap<>();
-            map.put("wx_open_id", SpUtils.getOpenId(WebActivity.this));
+            map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
             map.put("wx_1", user);
             map.put("ps_1", pass);
             map.put("phone", phone);

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

@@ -3,6 +3,8 @@ package com.sheep.jiuyan.samllsheep.page;
 import android.content.Intent;
 import android.os.Environment;
 import android.os.SystemClock;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 
 import com.bumptech.glide.Glide;
@@ -15,6 +17,7 @@ import com.sheep.jiuyan.samllsheep.download.DownloadState;
 import com.sheep.jiuyan.samllsheep.page.entry.Task;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.FileUtil;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.xutils.ex.DbException;
@@ -46,7 +49,12 @@ public class XDownLoadActivity extends BaseActivity {
 
     @Override
     public void initListener() {
+        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 
+            }
+        });
     }
 
     @Override
@@ -64,6 +72,8 @@ public class XDownLoadActivity extends BaseActivity {
                 } catch (DbException e) {
                     e.printStackTrace();
                 }
+            } else {
+                PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
             }
         }
         mAdapter = new DownListAdapter(this);

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

@@ -75,7 +75,7 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
                 .setText(taskPublish.getTask().getBonus());
         Glide.with(mContext)
                 .load(taskPublish.getTask().getIcon())
-                .placeholder(R.drawable.sheep)
+                .placeholder(R.drawable.icon)
                 .dontAnimate()
                 .into(holder.getView(R.id.img_icon, ImageView.class));
 

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

@@ -11,7 +11,7 @@ public class MoneyHistroy {
     private  String Desc;
     private  String Money;
     private  String Balance;
-    private  String CreateTime;
+    private  Integer CreateTime;
 
 
     public int getId() {
@@ -54,11 +54,11 @@ public class MoneyHistroy {
         Balance = balance;
     }
 
-    public String getCreateTime() {
+    public Integer getCreateTime() {
         return CreateTime;
     }
 
-    public void setCreateTime(String createTime) {
+    public void setCreateTime(Integer createTime) {
         CreateTime = createTime;
     }
 }

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

@@ -29,6 +29,15 @@ public  class Task implements Serializable {
     private String Price;
     private String Bonus;
     private String Pkg;
+    private String Screenshots;
+
+    public String getScreenshots() {
+        return Screenshots;
+    }
+
+    public void setScreenshots(String screenshots) {
+        Screenshots = screenshots;
+    }
 
     public String getBonus() {
         return Bonus;

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

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
@@ -104,8 +105,8 @@ public class FgtMainPageOffline extends BaseFragment {
     public void initData(final boolean isLoadMore) {
         mIntLastPage = isLoadMore ? mIntLastPage + 1 : 1;
         HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
-        NetManager.get(Url.WXACCOUNT, map, getActivity(), new SheepCallback<List<WXAccount>>(getActivity()) {
+        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
+        NetManager.get(Url.WXACCOUNT, map, SheepApp.mContext, new SheepCallback<List<WXAccount>>(getActivity()) {
             @Override
             public void success(List<WXAccount> wxAccounts) {
                 mAdpTaskList.clear();

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

@@ -132,11 +132,16 @@ public class FgtMainPageTask extends BaseFragment {
 
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        initData(false);
+    }
 
     private void checkUserTask() {
         HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
-        NetManager.get(Url.USER_CHECK_REGISTER, map, getActivity(), new SheepCallback<String>(getActivity()) {
+        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
+        NetManager.get(Url.USER_CHECK_REGISTER, map, SheepApp.mContext, new SheepCallback<String>(getActivity()) {
             @Override
             public void success(String ok) {
                 if (TextUtils.equals(ok, "ok")) {
@@ -173,10 +178,10 @@ public class FgtMainPageTask extends BaseFragment {
     //获取任务
     private void registerTask() {
         HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
+        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
         map.put("task_id", mClickItem.getId() + "");
         map.put("imei", new DeviceUtils(getContext()).getIMEI());
-        NetManager.get(Url.USER_REGISTER_TASK, map, getActivity(), new SheepCallback<String>(getActivity()) {
+        NetManager.get(Url.USER_REGISTER_TASK, map, SheepApp.mContext, new SheepCallback<String>(getActivity()) {
             @Override
             public void success(String o) {
                 initData(false);
@@ -197,8 +202,8 @@ public class FgtMainPageTask extends BaseFragment {
 
     private void requestNewPeopleTask() {
         final HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
-        NetManager.get(Url.WXTASK, map, getActivity(), new SheepCallback<WXTask>(getActivity()) {
+        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
+        NetManager.get(Url.WXTASK, map, SheepApp.mContext, new SheepCallback<WXTask>(getActivity()) {
             @Override
             public void success(WXTask o) {
                 //                mWXTask = o;
@@ -237,9 +242,9 @@ public class FgtMainPageTask extends BaseFragment {
         mIntLastPage = isLoadMore ? mIntLastPage + 1 : 1;
         //        requestNewPeopleTask();
         HashMap<String, String> map = new HashMap<>();
-        map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
-        map.put("imei", new DeviceUtils(getContext()).getIMEI());
-        NetManager.get(Url.PUBLISH_TASKS, map, getActivity(), new SheepCallback<List<TaskPublish>>(getActivity()) {
+        map.put("wx_open_id", SpUtils.getOpenId(SheepApp.mContext));
+        map.put("imei", new DeviceUtils(SheepApp.mContext).getIMEI());
+        NetManager.get(Url.PUBLISH_TASKS, map, SheepApp.mContext, new SheepCallback<List<TaskPublish>>(getActivity()) {
             @Override
             public void success(List<TaskPublish> tasks) {
                 mAdapter.clear();
@@ -262,7 +267,7 @@ public class FgtMainPageTask extends BaseFragment {
                 mRecyleViewLoadMoreUtils.setmIsLoading(true);
             }
         });
-        NetManager.get(Url.USER_INFO, map, getActivity(), new SheepCallback<User>(getActivity()) {
+        NetManager.get(Url.USER_INFO, map, SheepApp.mContext, new SheepCallback<User>(getActivity()) {
             @Override
             public void success(User user) {
                 if (user != null) {
@@ -273,7 +278,7 @@ public class FgtMainPageTask extends BaseFragment {
                 }
             }
         });
-        NetManager.get(Url.USER_PULL_TASK, map, getActivity(), new SheepCallback<TaskPublish>(getActivity()) {
+        NetManager.get(Url.USER_PULL_TASK, map, SheepApp.mContext, new SheepCallback<TaskPublish>(getActivity()) {
             @Override
             public void success(final TaskPublish taskPublish) {
                 if (taskPublish != null) {
@@ -343,7 +348,7 @@ public class FgtMainPageTask extends BaseFragment {
                 mTlDoing.setVisibility(View.GONE);
             }
         });
-        NetManager.get(Url.GET_TASK_COUNT, map, getActivity(), new SheepCallback<TaskCount>(getActivity()) {
+        NetManager.get(Url.GET_TASK_COUNT, map, SheepApp.mContext, new SheepCallback<TaskCount>(getActivity()) {
             @Override
             public void success(TaskCount count) {
                 mTaskHistory.setText(count.getTaskCount() + "");

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Environment;
 
 import java.io.File;
+import java.text.SimpleDateFormat;
 
 /**
  * Created by kemllor on 2017/12/26.
@@ -39,4 +40,17 @@ public class FileUtil {
             file.delete();
         }
     }
+
+    public static String transForDate(Integer ms) {
+        if (ms == null) {
+            ms = 0;
+        }
+        long msl = (long) ms * 1000;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String str = "";
+        if (ms != null) {
+            str = format.format(msl);
+        }
+        return str;
+    }
 }

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

@@ -20,8 +20,10 @@
             android:src="@drawable/icon_sheep"
             />
       <LinearLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
+          android:id="@+id/ll_install"
+          android:layout_toLeftOf="@+id/ll_btn"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
           android:orientation="vertical"
           android:layout_centerVertical="true"
           android:layout_marginLeft="10dp"
@@ -40,12 +42,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
+            android:text="完成"
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
             />
       </LinearLayout>
 
        <LinearLayout
+           android:id="@+id/ll_btn"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:orientation="horizontal"

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

@@ -61,6 +61,6 @@
         android:layout_marginRight="10dp"
         android:gravity="center"
         android:text="如何做任务？"
-        android:textColor="@color/white"
+        android:textColor="@color/sheep_red"
         android:visibility="gone"/>
 </RelativeLayout>