修复若干BUG

app/src/main/AndroidManifest.xml

@@ -60,9 +60,6 @@
             android:name=".page.WxAccountDetail"
             android:screenOrientation="portrait"/>
         <activity
-            android:name=".page.DownloadActivity"
-            android:screenOrientation="portrait"/>
-        <activity
             android:name=".page.LoginActivity"
             android:screenOrientation="portrait">
 

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

@@ -19,7 +19,9 @@ public class Config {
     //    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://10.8.220.6: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";

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

@@ -123,6 +123,11 @@ public class DownListAdapter extends BaseAdapter {
         @Override
         public void update(DownloadInfo downloadInfo) {
             super.update(downloadInfo);
+            Glide.with(mContext)
+                    .load(downloadInfo.getIcon())
+                    .placeholder(R.drawable.icon)
+                    .dontAnimate()
+                    .into(ImageView);
         }
 
         @Override
@@ -221,7 +226,6 @@ public class DownListAdapter extends BaseAdapter {
                         case WAITING:
                         case STARTED:
                             downloadManager.stopDownload(downloadInfo);
-
                             break;
                         case ERROR:
                         case STOPPED:
@@ -271,6 +275,8 @@ public class DownListAdapter extends BaseAdapter {
                         case FINISHED:
                             if (!PackageUtil.isAppInstalled(mContext, getDownloadInfo().getPkgName())) {
                                 PackageUtil.installApk(mContext, getDownloadInfo().getFileSavePath());
+                            }else{
+                                PackageUtil.startApp(SheepApp.mContext, getDownloadInfo().getPkgName());
                             }
                             break;
                     }

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

@@ -114,7 +114,6 @@ public class FloatService extends Service implements View.OnClickListener {
         floaticon = (ImageView) mFloatwindow.findViewById(R.id.floate_icon);
         mLeft = mFloatwindow.findViewById(R.id.ll_info_left);
         mRight = mFloatwindow.findViewById(R.id.ll_info_right);
-
         ImageView imgCommitRight = (ImageView) mFloatwindow.findViewById(R.id.img_commit_right);
         ImageView imgCommitLeft = (ImageView) mFloatwindow.findViewById(R.id.img_commit_left);
         ImageView imgOpenRight = (ImageView) mFloatwindow.findViewById(R.id.img_open_right);

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

@@ -56,6 +56,7 @@ public abstract class SheepCallback<T> implements Callback {
             });
 
         } else if (code == 401) {
+
         } else {
             mActivity.runOnUiThread(new Runnable() {
                 @Override

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

@@ -1,153 +0,0 @@
-package com.sheep.jiuyan.samllsheep.page;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.SystemClock;
-import android.support.annotation.Nullable;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.liulishuo.filedownloader.BaseDownloadTask;
-import com.liulishuo.filedownloader.FileDownloadListener;
-import com.liulishuo.filedownloader.FileDownloader;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.page.entry.Task;
-import com.sheep.jiuyan.samllsheep.utils.FileUtil;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import java.io.File;
-
-
-/**
- * 下载界面
- * Created by kemllor on 2017/12/14.
- */
-
-public class DownloadActivity extends BaseActivity {
-
-    private String DOWNLOAD_URL = "";
-    //    private TextView mTvDownload;
-    private ProgressBar mPbDownload;
-    private ImageView mImgIcon;
-    private TextView mTvTime;
-    private TextView mTvPercent;
-
-
-    private String mPath;
-    private String mApkPath;
-    private BaseDownloadTask mDownloadTask;
-    private ListView lv;
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.download_activity;
-    }
-
-    @Override
-    public void initListener() {
-
-    }
-
-    @Override
-    public void initData() {
-        Intent intent = getIntent();
-        Task task = (Task) intent.getSerializableExtra("task");
-        mPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/"
-                + SheepApp.mContext.getPackageName();
-        mApkPath = new File(mPath, SystemClock.currentThreadTimeMillis() + "_sheepTask.apk").getAbsolutePath();
-        if (task != null) {
-            DOWNLOAD_URL = task.getDownLoadUrl();
-            mTvTime.setText(task.getTitle());
-            Glide.with(this)
-                    .load(task.getIcon())
-                    .placeholder(R.drawable.icon)
-                    .dontAnimate()
-                    .into(mImgIcon);
-            File file = new File(mPath);
-            if (file.exists()) {
-                FileUtil.deleteFile(file);
-            }
-            file.mkdirs();
-        }
-        startDownload();
-    }
-
-    @Override
-    public void initView() {
-        findViews();
-        TitleBarUtils.getInstance()
-                .setTitle(this,"任务下载")
-                .setTitleFinish(this);
-        lv=(ListView)findViewById(R.id.lv);
-
-
-    }
-
-
-    private void findViews() {
-        mTvPercent = (TextView) findViewById(R.id.tv_percent);
-        mPbDownload = (ProgressBar) findViewById(R.id.pb_download);
-        mImgIcon = (ImageView) findViewById(R.id.img_icon);
-        mTvTime = (TextView) findViewById(R.id.tv_time);
-    }
-
-
-    private void startDownload() {
-        if (mDownloadTask == null)
-            mDownloadTask = FileDownloader.getImpl()
-                    .create(DOWNLOAD_URL)
-                    .setPath(mApkPath, false)
-                    .setCallbackProgressTimes(300)
-                    .setMinIntervalUpdateSpeed(400)
-                    .setListener(new FileDownloadListener() {
-                        @Override
-                        protected void pending(BaseDownloadTask task, int soFarBytes, int totalBytes) {
-                        }
-                        @Override
-                        protected void progress(BaseDownloadTask task, int soFarBytes, int totalBytes) {
-                            int percent = (int) ((double) soFarBytes / (double) totalBytes * 100);
-                            mPbDownload.setProgress(percent);
-                            mTvPercent.setText(percent + "%");
-                        }
-                        @Override
-                        protected void blockComplete(BaseDownloadTask task) {
-                        }
-                        @Override
-                        protected void completed(BaseDownloadTask task) {
-                            PackageUtil.installApk(getApplicationContext(),mApkPath);
-                            mTvPercent.setText("100%");
-                        }
-
-                        @Override
-                        protected void paused(BaseDownloadTask task, int soFarBytes, int totalBytes) {
-                        }
-
-                        @Override
-                        protected void error(BaseDownloadTask task, Throwable e) {
-                            e.printStackTrace();
-                        }
-
-                        @Override
-                        protected void warn(BaseDownloadTask task) {
-
-
-                        }
-                    });
-
-        mDownloadTask.start();
-    }
-
-}

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

@@ -255,13 +255,20 @@ public class GameDetailActivity extends BaseActivity {
         NetManager.upload(Url.UPLOAD_IMG, parma, new File(path), getApplicationContext(), new SheepCallback<String>(this) {
             @Override
             public void success(String s) {
+
                 Toast.makeText(GameDetailActivity.this, s, Toast.LENGTH_SHORT).show();
-                mPb.setVisibility(View.GONE);
+                if(mPb!=null) {
+                    mPb.setVisibility(View.GONE);
+                }
             }
 
             @Override
             public void failure(IOException e) {
-                mPb.setVisibility(View.GONE);
+                if(mPb!=null) {
+                    mPb.setVisibility(View.GONE);
+                }
+                Toast.makeText(GameDetailActivity.this, "上传截图失败", Toast.LENGTH_SHORT).show();
+
             }
         });
     }

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

@@ -52,6 +52,7 @@ import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageTask;
 import com.sheep.jiuyan.samllsheep.page.view.RappTabLayout;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -204,7 +205,7 @@ if (BuildConfig.DEBUG)
     @Override
     public void initData() {
         ((TextView) findViewById(R.id.txt_main_activity_money))
-                .setText("¥" + G.mUser.getBalance());
+                .setText("¥" + StringUtils.strToMoney(G.mUser.getBalance()) );
         ((TextView) findViewById(R.id.txt_main_activity_nick))
                 .setText(G.mUser.getNickName());
         Glide.with(this)

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

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

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

@@ -48,6 +48,7 @@ public class SplashActivity extends BaseActivity  implements View.OnClickListene
     @Override
     public void initListener() {
         fl.setOnClickListener(this);
+        findViewById(R.id.btn_join).setOnClickListener(this);
     }
 
     @Override
@@ -98,6 +99,7 @@ public class SplashActivity extends BaseActivity  implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()){
             case R.id.fl:
+            case R.id.btn_join:
                 goMain();
              break;
 
@@ -126,7 +128,7 @@ public class SplashActivity extends BaseActivity  implements View.OnClickListene
 
         new AlertDialog.Builder(this)
                 .setTitle("温馨提示！")
-                .setMessage("亲！要赚钱需要手动开启悬浮框和在其他上层显示权限 请逐一开启哟！")
+                .setMessage("亲！要赚钱需要手动在其他上层显示权限和有权查看其他应用权限 请逐一开启哟！")
                 .setPositiveButton("去开启", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {

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

@@ -204,7 +204,8 @@ public class TaskRecordActivity extends BaseActivity {
                                     .placeholder(R.drawable.icon)
                                     .dontAnimate()
                                     .into(viewHolder.<ImageView>getView(R.id.img_icon));
-                            viewHolder.setText(R.id.tv_money, "￥" + item.getTask().getPrice());
+                            String strMoney=TextUtils.isEmpty(item.getCompleteMoney())?item.getTask().getPrice():item.getCompleteMoney();
+                            viewHolder.setText(R.id.tv_money, "￥" + strMoney);
                             TextView failed = viewHolder.getView(R.id.tv_failed);
                             if (!TextUtils.isEmpty(item.getFailDesc())) {
                                 failed.setVisibility(View.VISIBLE);

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

@@ -16,6 +16,7 @@ import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.HashMap;
@@ -80,7 +81,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                 mUser = user;
                 G.mUser = user;
                 mTvNick.setText(user.getNickName());
-                mTvMoney.setText(user.getBalance());
+                mTvMoney.setText(StringUtils.strToMoney(user.getBalance()));
                 mTvCode.setText("我的邀请码  " + user.getInvitationCode());
                 Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
             }

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

@@ -2,7 +2,6 @@ package com.sheep.jiuyan.samllsheep.page.adapter;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
 import android.text.Html;
 import android.view.View;
 import android.widget.ImageView;
@@ -11,13 +10,10 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.page.DownloadActivity;
 import com.sheep.jiuyan.samllsheep.page.GameDetailActivity;
-import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.page.XDownLoadActivity;
 import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import java.io.File;
@@ -98,8 +94,6 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
                 public void onClick(View v) {
                   String path=ClassFileHelper.DIR+File.separator+taskPublish.getTask().getTitle()+".apk";
                   PackageUtil.installApk(mContext,path);
-
-
                 }
             });
         }else{

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

@@ -28,6 +28,8 @@ public class Commit implements Serializable {
     private String CreateTime;
     private String CheckTime;
     private String FailDesc;
+    private String  CompleteMoney;
+
 
     public int getTaskPublishId() {
         return TaskPublishId;
@@ -101,4 +103,11 @@ public class Commit implements Serializable {
         this.FailDesc = FailDesc;
     }
 
+    public String getCompleteMoney() {
+        return CompleteMoney;
+    }
+
+    public void setCompleteMoney(String completeMoney) {
+        CompleteMoney = completeMoney;
+    }
 }

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

@@ -31,12 +31,14 @@ import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.page.entry.WXTask;
 import com.sheep.jiuyan.samllsheep.utils.BackDo;
+import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.DeviceUtils;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.RecyleViewLoadMoreUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -290,7 +292,9 @@ public class FgtMainPageTask extends BaseFragment {
                     mImgComp.setVisibility(View.VISIBLE);
                     if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
                         mBtnTask.setText("开始游戏");
-                    } else {
+                    } else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getTitle())){
+                        mBtnTask.setText("安装游戏");
+                    }else{
                         mBtnTask.setText("下载游戏");
                     }
                     mTlDoing.setVisibility(View.VISIBLE);
@@ -314,7 +318,10 @@ public class FgtMainPageTask extends BaseFragment {
                             public void onClick(View v) {
                                 if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
                                     PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
-                                } else {
+                                }else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getTitle())){
+                                    String path=ClassFileHelper.DIR+ File.separator+taskPublish.getTask().getTitle()+".apk";
+                                    PackageUtil.installApk(getActivity(),path);
+                                } else{
                                     Intent intent = new Intent(getActivity(), XDownLoadActivity.class);
                                     intent.putExtra("task", taskPublish.getTask());
                                     startActivity(intent);
@@ -327,6 +334,9 @@ public class FgtMainPageTask extends BaseFragment {
                         public void onClick(View v) {
                             if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
                                 PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
+                            }else if(ClassFileHelper.getInstance().isInstallFile(taskPublish.getTask().getTitle())){
+                                String path=ClassFileHelper.DIR+ File.separator+taskPublish.getTask().getTitle()+".apk";
+                                PackageUtil.installApk(getActivity(),path);
                             } else {
                                 Intent intent = new Intent(getActivity(), XDownLoadActivity.class);
                                 intent.putExtra("task", taskPublish.getTask());

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

@@ -0,0 +1,37 @@
+package com.sheep.jiuyan.samllsheep.utils;
+
+import android.text.TextUtils;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+
+/**
+ * Created by Administrator on 2018/1/31.
+ */
+
+public class StringUtils {
+
+    public static String  strToMoney(String  str){
+        if(TextUtils.isEmpty(str)||str.equals("0"))  {
+            return "0";
+        }
+        DecimalFormat df = new DecimalFormat("###,###.##");
+        NumberFormat nf = NumberFormat.getInstance();
+        String  money="0";
+        try
+        {
+            money= df.format((nf.parse(str)));
+        }
+        catch (ParseException e)
+        {
+            e.printStackTrace();
+        }
+        return money;
+
+
+
+    }
+
+
+}

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

@@ -7,7 +7,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="10dp">
 
 

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

@@ -25,7 +25,7 @@
                 <RelativeLayout
                     android:id="@+id/dingwei1"
                     android:layout_width="match_parent"
-                    android:layout_height="80dp"
+                    android:layout_height="wrap_content"
                     android:layout_margin="@dimen/content_padding"
                     android:background="@color/backgroud">
 
@@ -159,6 +159,9 @@
                     android:textColor="@color/black_text_deep"
                     android:textSize="@dimen/text_size_4"/>
 
+
+
+
                 <WebView
                     android:id="@+id/web_text"
                     android:layout_width="match_parent"