独立小绵羊系统

app/src/main/AndroidManifest.xml

@@ -73,8 +73,8 @@
         </service>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.jiuyan.sheep_children"
+            android:name=".provider.SheepFileProvider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 

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

@@ -15,11 +15,12 @@ public class Config {
         return mConfig;
     }
 
-    public String mBaseUrl = "http://10.8.220.213:8088";
-//    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://10.8.220.213:8089", "http://10.8.220.250:8088"};
+        public String mBaseUrl = "http://10.8.220.213: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://api.task.bandaimi.com"};
 
     public void setBaseUrl(String url) {
         this.mBaseUrl = url;

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

@@ -7,6 +7,8 @@ import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.os.IBinder;
+import android.support.v4.app.ActivityCompat;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -15,13 +17,16 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import com.sheep.jiuyan.samllsheep.R;
 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.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;
 
@@ -72,7 +77,8 @@ public class FloatService extends Service implements View.OnClickListener {
         //设置效果为背景透明.
         params.format = PixelFormat.RGBA_8888;
         //设置flags.不可聚焦及不可使用按钮对悬浮窗进行操控.
-        params.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+        params.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
 
         //设置窗口初始停靠位置.
         params.gravity = Gravity.LEFT | Gravity.TOP;
@@ -157,11 +163,16 @@ public class FloatService extends Service implements View.OnClickListener {
             mLeft.setVisibility(View.GONE);
             mRight.setVisibility(View.GONE);
             closeActivitys();
-            if(!PremissUtils.hasPermission(getApplicationContext())){
-                PremissUtils.openUsageAccessPage(getApplicationContext());
-                return;
-            }
             String pkg = PackageUtil.getLauncherTopApp(getApplicationContext());
+            if (TextUtils.isEmpty(pkg)) {
+                if (new OpenService().checkAccessibility(this)) {
+                    Intent intent2 = new Intent(this, TopService.class);
+                    startService(intent2);
+                } else {
+                    Toast.makeText(this, "未开启辅助功能任务提交有可能失败", Toast.LENGTH_LONG).show();
+                }
+                pkg = TopService.PackName;
+            }
             intent = new Intent(FloatService.this, ShotScreenActivity.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra("pkg", pkg);
@@ -171,7 +182,7 @@ public class FloatService extends Service implements View.OnClickListener {
             mLeft.setVisibility(View.GONE);
             mRight.setVisibility(View.GONE);
             intent = new Intent();
-            intent.setClassName(FloatService.this,"com.kfzs.duanduan.view.MainActivity");
+            intent.setClassName(FloatService.this, "com.kfzs.duanduan.view.MainActivity");
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(intent);
 

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

@@ -35,7 +35,6 @@ import java.util.HashMap;
 
 public class GameDetailActivity extends BaseActivity {
 
-
     private final static String HTML_FORMAT = "任务数量：<font color=\"#ef712c\">当前数量</font>/总数";
     private TaskPublish mTask;
     private RelativeLayout mDingwei1;
@@ -133,8 +132,8 @@ public class GameDetailActivity extends BaseActivity {
             @Override
             public void success(final TaskPublish taskPublish) {
                 if (taskPublish != null) {
-                    int thisId = mTask.getTask().getId();
-                    int pullId = taskPublish.getTask().getId();
+                    int thisId = mTask.getId();
+                    int pullId = taskPublish.getId();
                     if (thisId == pullId) {
                         mLlInfos.addView(getStep("领取任务", "已完成", 0));
                         if (PackageUtil.isAppInstalled(SheepApp.mContext, mTask.getTask().getPkg())) {

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

@@ -2,6 +2,8 @@ package com.sheep.jiuyan.samllsheep.page;
 
 import android.app.AlertDialog;
 import android.content.Intent;
+import android.os.Handler;
+import android.os.SystemClock;
 import android.support.design.widget.TextInputEditText;
 import android.text.TextUtils;
 import android.view.View;
@@ -41,9 +43,17 @@ public class LoginActivity extends BaseActivity {
     public void initView() {
         mImgLogin = (ImageView) findViewById(R.id.img_login);
         loginFromWx();
-        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-        startActivity(intent);
-        finish();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                SystemClock.sleep(3000);
+                Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        }).start();
+
+
     }
 
     @Override

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

@@ -14,6 +14,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
@@ -23,11 +24,15 @@ import com.sheep.jiuyan.samllsheep.page.adapter.AdpMainPageViewPager;
 import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageOffline;
 import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageTask;
 import com.sheep.jiuyan.samllsheep.page.view.RappTabLayout;
+import com.sheep.jiuyan.samllsheep.service.TopService;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.OpenService;
 import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -89,7 +94,6 @@ public class MainActivity extends BaseActivity {
         if (sa.size() < 1) {//如果都已经授权了，不能空列表去请求，否则报异常
             return;
         }
-        ActivityCompat.requestPermissions(this, sa.toArray(new String[]{}), INTENT_GET_PERMISSION);
     }
 
     @Override
@@ -217,9 +221,7 @@ public class MainActivity extends BaseActivity {
                 .setLineMargin(0, G.getRealPix(2), 0, 0)
                 .setLineColor(getResources().getColor(R.color.black_text_deep))
                 .setupWithViewPager(mViewPager, R.layout.tab_ripple);
-
-        TitleBarUtils.getInstance()
-                .setTitleFinish(this);
+        TitleBarUtils.getInstance().setTitleFinish(this);
         //                .setRightImgBotton(this, R.drawable.set, new View.OnClickListener() {
         //                    @Override
         //                    public void onClick(View view) {

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

@@ -18,6 +18,7 @@ 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.entry.Commit;
+import com.sheep.jiuyan.samllsheep.utils.DeviceUtils;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -121,6 +122,7 @@ public class TaskRecordActivity extends BaseActivity {
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         map.put("task_id", commit.getTaskPublishId() + "");
+        map.put("imei", new DeviceUtils(getApplicationContext()).getIMEI());
         NetManager.get(Url.USER_REGISTER_TASK, map, getApplicationContext(), new SheepCallback<String>(this) {
             @Override
             public void success(String o) {

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

@@ -11,6 +11,7 @@ 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.entry.TaskPublish;
@@ -75,8 +76,22 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
 
         if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
             holder.getView(R.id.btn_task_item, TextView.class).setText("开始游戏");
+            holder.getView(R.id.btn_task_item, TextView.class).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    PackageUtil.startApp(mContext, taskPublish.getTask().getPkg());
+                }
+            });
         } else {
             holder.getView(R.id.btn_task_item, TextView.class).setText("下载游戏");
+            holder.getView(R.id.btn_task_item, TextView.class).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(mContext, DownloadActivity.class);
+                    intent.putExtra("task", taskPublish.getTask());
+                    mContext.startActivity(intent);
+                }
+            });
         }
 
         holder.getView(R.id.tv_guide).setOnClickListener(new View.OnClickListener() {

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

@@ -32,7 +32,7 @@ public class AdpTaskList extends AdpCommonRecy<WXAccount> {
     }
 
     @Override
-    public void convert(ViewHolder holder, WXAccount wxAccount) {
+    public void convert(ViewHolder holder, final WXAccount wxAccount) {
         holder.itemView.setTag(TAG_WXID, wxAccount.getId() + "");
         holder.itemView.setTag(TAG_WXNAME, wxAccount.getWxId());
         holder.getView(R.id.txt_item_fgt_main_page_offline_task_user, TextView.class)
@@ -41,6 +41,17 @@ public class AdpTaskList extends AdpCommonRecy<WXAccount> {
                 .setText(getStatusStr(wxAccount.getStatus()));
         holder.getView(R.id.txt_item_fgt_main_page_offline_task_descp, TextView.class)
                 .setText(wxAccount.getAction());
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (wxAccount.getStatus()==1) {
+                    Intent intent = new Intent(mContext, WxAccountDetail.class);
+                    intent.putExtra(WxAccountDetail.INTENT_WXID_STR, view.getTag(TAG_WXID) + "");
+                    intent.putExtra(WxAccountDetail.INTENT_NAME, view.getTag(TAG_WXNAME) + "");
+                    mContext.startActivity(intent);
+                }
+            }
+        });
     }
 
     /**

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

@@ -6,7 +6,7 @@ package com.sheep.jiuyan.samllsheep.page.entry;
 
 public class WXAccount {
 
-    private Integer id;
+    private Integer Id;
 
     private String WxId;
 
@@ -20,11 +20,11 @@ public class WXAccount {
     private int Status;
 
     public Integer getId() {
-        return id == null ? 0 : id;
+        return Id == null ? 0 : Id;
     }
 
     public void setId(Integer id) {
-        this.id = id;
+        this.Id = id;
     }
 
     public String getWxId() {

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

@@ -30,6 +30,7 @@ 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.DeviceUtils;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.RecyleViewLoadMoreUtils;
@@ -166,6 +167,7 @@ public class FgtMainPageTask extends BaseFragment {
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(getActivity()));
         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()) {
             @Override
             public void success(String o) {
@@ -228,6 +230,7 @@ public class FgtMainPageTask extends BaseFragment {
         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()) {
             @Override
             public void success(List<TaskPublish> tasks) {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/view/MutiProgress.java

@@ -95,7 +95,7 @@ public class MutiProgress extends View{
         mPaint.setStrokeCap(Paint.Cap.ROUND); // 圆角
         mCanvas = new Canvas(mBitmap);
 
-        nodes = new ArrayList<MutiProgress.Node>();
+        nodes = new ArrayList<Node>();
         float nodeWidth = ((float)mWidth)/(nodesNum-1);
         for(int i=0;i<nodesNum;i++)
         {

app/src/main/java/com/sheep/jiuyan/samllsheep/page/view/RappTabLayout.java

@@ -12,6 +12,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.sheep.jiuyan.samllsheep.R;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/com/sheep/jiuyan/samllsheep/provider/SheepFileProvider.java

@@ -0,0 +1,10 @@
+package com.sheep.jiuyan.samllsheep.provider;
+
+import android.support.v4.content.FileProvider;
+
+/**
+ * Created by kemllor on 2018/1/19.
+ */
+
+public class SheepFileProvider extends FileProvider {
+}

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

@@ -0,0 +1,28 @@
+package com.sheep.jiuyan.samllsheep.service;
+
+import android.accessibilityservice.AccessibilityService;
+import android.util.Log;
+import android.view.accessibility.AccessibilityEvent;
+
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+/**
+ * Created by Administrator on 2018/1/18.
+ */
+
+public class TopService  extends AccessibilityService {
+    public static String  PackName="";
+
+    @Override
+    public void onAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
+
+        if(accessibilityEvent.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
+            PackName=accessibilityEvent.getPackageName().toString();
+        }
+    }
+
+    @Override
+    public void onInterrupt() {
+
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.sheep.jiuyan.samllsheep.utils;
+
+import android.content.Context;
+
+import android.net.wifi.WifiManager;
+
+import android.telephony.TelephonyManager;
+
+
+/**
+ * @ Created by Dlg
+ * @ <p>TiTle:  DeviceUtils</p>
+ * @ <p>Description:获取各种硬件信息</p>
+ * @ date:  2017/10/29 11:48
+ * @ QQ:    315096953
+ */
+
+public class DeviceUtils {
+
+    private Context mContext;
+    private TelephonyManager phone;
+    private WifiManager wifi;
+
+    public DeviceUtils(Context context) {
+        phone = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mContext = context;
+    }
+
+    public String getIMEI() {
+        try {
+            return phone.getDeviceId();
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+
+}

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

@@ -1,5 +1,8 @@
 package com.sheep.jiuyan.samllsheep.utils;
 
+import android.content.Context;
+import android.os.Environment;
+
 import java.io.File;
 
 /**
@@ -8,6 +11,21 @@ import java.io.File;
 
 public class FileUtil {
 
+
+    public static String getAppPath(Context context) {
+
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+
+
+            return Environment.getExternalStorageDirectory().toString();
+
+        } else {
+
+            return context.getFilesDir().toString();
+        }
+
+    }
+
     public static void deleteFile(File file) {
         if (file.exists()) { // 判断文件是否存在
             if (file.isFile()) { // 判断是否是文件

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

@@ -0,0 +1,55 @@
+package com.sheep.jiuyan.samllsheep.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+import android.widget.Toast;
+
+/**
+ * Created by Administrator on 2018/1/18.
+ */
+
+public class OpenService {
+
+    public boolean checkAccessibility(Context context) {
+        // 判断辅助功能是否开启
+        if (!isAccessibilitySettingsOn(context)) {
+            // 引导至辅助功能设置页面
+            context. startActivity(
+                    new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            );
+            Toast.makeText(context, "请先开启半袋米的辅助功能", Toast.LENGTH_LONG).show();
+            return false;
+        }
+        return true;
+    }
+    /**
+     * @return
+     * 判断是否开启辅助功能
+     */
+    private boolean isAccessibilitySettingsOn(Context context) {
+        int accessibilityEnabled = 0;
+        try {
+            accessibilityEnabled = Settings.Secure.getInt(context.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_ENABLED);
+        } catch (Settings.SettingNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        if (accessibilityEnabled == 1) {
+            String services = Settings.Secure.getString(context.getContentResolver(),
+                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+            if (services != null) {
+                return services.toLowerCase().contains(context.getPackageName().toLowerCase());
+            }
+        }
+
+        return false;
+    }
+
+
+
+}

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

@@ -22,7 +22,6 @@ import java.util.List;
 
 public class PackageUtil {
 
-
     public static String getLauncherTopApp(Context context) {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) {
             ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);

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

@@ -27,4 +27,19 @@ public class SpUtils {
         editor.putString("wx_openId", openId);
         editor.apply();
     }
+
+
+    public static void setPackAgeName(Context context, String vaule) {
+        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putString("package", vaule);
+        editor.apply();
+    }
+
+
+    public static String getPackAgeName(Context context) {
+        SharedPreferences user = context.getSharedPreferences("user", Context.MODE_PRIVATE);
+        return user.getString("package", "");
+    }
+
 }

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

@@ -1,20 +1,20 @@
 <?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="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/white"
+              android:orientation="vertical">
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="@dimen/layout_heigh_default"
         android:layout_gravity="center_vertical"
         android:background="@color/background_light_gray"
         android:gravity="center_vertical"
         android:paddingLeft="@dimen/content_padding_big"
         android:text="挂机微信号信息"
         android:textColor="@color/black_text_gray"
-        android:textSize="@dimen/text_size_4" />
+        android:textSize="@dimen/text_size_4"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -30,30 +30,28 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="left"
-            android:paddingLeft="@dimen/content_padding_big"
             android:text="账号"
             android:textColor="@color/black_text_gray"
-            android:textSize="@dimen/text_size_5" />
+            android:textSize="@dimen/text_size_4"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="left"
-            android:paddingLeft="@dimen/content_padding_big"
             android:text="账号状态"
             android:textColor="@color/black_text_gray"
-            android:textSize="@dimen/text_size_5" />
+            android:textSize="@dimen/text_size_4"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_weight="1"
             android:gravity="left"
-            android:paddingLeft="@dimen/content_padding_big"
             android:text="备注"
             android:textColor="@color/black_text_gray"
-            android:textSize="@dimen/text_size_5" />
+            android:textSize="@dimen/text_size_4"/>
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView
@@ -65,5 +63,4 @@
 
     </android.support.v7.widget.RecyclerView>
 
-
 </LinearLayout>

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

@@ -17,7 +17,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="128"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -30,7 +29,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="1218"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_income"
@@ -42,7 +40,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="128"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             android:visibility="gone"
@@ -55,7 +52,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="128"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_remain"

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

@@ -9,7 +9,7 @@
         android:layout_width="110dp"
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"
-        android:background="@drawable/floate_back"
+        android:background="@drawable/bg"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:visibility="gone">
@@ -29,7 +29,7 @@
             android:layout_height="40dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:src="@drawable/home"/>
+            android:src="@drawable/index"/>
     </LinearLayout>
 
     <ImageView
@@ -37,14 +37,14 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/icon_sheep"/>
+        android:src="@drawable/little_ship"/>
 
     <LinearLayout
         android:id="@+id/ll_info_right"
         android:layout_width="110dp"
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"
-        android:background="@drawable/floate_back"
+        android:background="@drawable/bg"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:visibility="gone">
@@ -64,7 +64,7 @@
             android:layout_height="40dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:src="@drawable/home"/>
+            android:src="@drawable/index"/>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -1,39 +1,53 @@
 <?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_default"
-    android:background="#FDE699"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/layout_heigh_default"
+              android:background="#FDE699"
+              android:gravity="center_vertical"
+              android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/txt_item_fgt_main_page_offline_task_user"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingLeft="@dimen/content_padding_big"
-        android:text="帐号1"
-        android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_4" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/layout_heigh_default"
+        android:background="#FDE699"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/txt_item_fgt_main_page_offline_task_statu"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingLeft="@dimen/content_padding_big"
-        android:text="挂机中"
-        android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_4" />
+        <TextView
+            android:id="@+id/txt_item_fgt_main_page_offline_task_user"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:paddingLeft="@dimen/content_padding_big"
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3"/>
 
-    <TextView
-        android:id="@+id/txt_item_fgt_main_page_offline_task_descp"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingLeft="@dimen/content_padding_big"
-        android:text="备注"
-        android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_4" />
+        <TextView
+            android:id="@+id/txt_item_fgt_main_page_offline_task_statu"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:paddingLeft="@dimen/content_padding_big"
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3"/>
+
+        <TextView
+            android:id="@+id/txt_item_fgt_main_page_offline_task_descp"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:paddingLeft="@dimen/content_padding_big"
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3"/>
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="10dp"
+        android:background="@color/white"/>
 
 </LinearLayout>

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

@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/content_padding_big">
+                                             xmlns:app="http://schemas.android.com/apk/res-auto"
+                                             xmlns:tools="http://schemas.android.com/tools"
+                                             android:layout_width="match_parent"
+                                             android:layout_height="wrap_content"
+                                             android:padding="@dimen/content_padding_big">
 
     <ImageView
         android:id="@+id/img_item_wx_account_detail_logo"
         android:layout_width="70dp"
-        android:layout_height="70dp" />
+        android:layout_height="70dp"
+        tools:layout_editor_absoluteX="0dp"
+        tools:layout_editor_absoluteY="0dp"/>
 
     <TextView
         android:id="@+id/txt_item_wx_account_detail_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/content_padding"
+        android:layout_marginStart="@dimen/content_padding"
         android:text="标题"
         android:textColor="@color/black_text_deep"
         android:textSize="@dimen/text_size_4"
-        app:layout_constraintLeft_toRightOf="@id/img_item_wx_account_detail_logo" />
+        app:layout_constraintLeft_toRightOf="@+id/img_item_wx_account_detail_logo"
+        tools:layout_editor_absoluteY="0dp"/>
 
     <TextView
-        android:visibility="gone"
         android:id="@+id/txt_item_wx_account_detail_task"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,8 +33,9 @@
         android:text="任务目标："
         android:textColor="@color/black_text_gray"
         android:textSize="@dimen/text_size_2"
-        app:layout_constraintLeft_toLeftOf="@id/txt_item_wx_account_detail_title"
-        app:layout_constraintTop_toBottomOf="@id/txt_item_wx_account_detail_title" />
+        android:visibility="gone"
+        app:layout_constraintLeft_toLeftOf="@+id/txt_item_wx_account_detail_title"
+        app:layout_constraintTop_toBottomOf="@+id/txt_item_wx_account_detail_title"/>
 
     <TextView
         android:id="@+id/txt_item_wx_account_detail_progress"
@@ -41,24 +46,24 @@
         android:textColor="@color/black_text_gray"
         android:textSize="@dimen/text_size_2"
         android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="@id/txt_item_wx_account_detail_task"
-        app:layout_constraintTop_toBottomOf="@id/txt_item_wx_account_detail_task" />
+        app:layout_constraintLeft_toLeftOf="@+id/txt_item_wx_account_detail_task"
+        app:layout_constraintTop_toBottomOf="@+id/txt_item_wx_account_detail_task"/>
 
     <ImageView
         android:id="@+id/img_item_wx_account_detail_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/narrow_down"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/img_item_wx_account_detail_logo"
+        android:src="@drawable/completed"
+        app:layout_constraintBottom_toBottomOf="@+id/img_item_wx_account_detail_logo"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@id/img_item_wx_account_detail_logo" />
+        app:layout_constraintTop_toTopOf="@+id/img_item_wx_account_detail_logo"/>
 
 
     <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_width="332dp"
+        android:layout_height="1dp"
         android:layout_marginTop="@dimen/content_padding"
         android:background="@color/divier"
-        app:layout_constraintTop_toBottomOf="@id/img_item_wx_account_detail_logo" />
+        app:layout_constraintTop_toBottomOf="@+id/img_item_wx_account_detail_logo"
+        tools:layout_editor_absoluteX="8dp"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/swipe_main_activity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:addStatesFromChildren="true"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+                                              xmlns:app="http://schemas.android.com/apk/res-auto"
+                                              android:id="@+id/swipe_main_activity"
+                                              android:layout_width="match_parent"
+                                              android:layout_height="match_parent"
+                                              android:addStatesFromChildren="true"
+                                              app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                     android:layout_width="match_parent"
+                                                     android:layout_height="match_parent">
 
         <android.support.design.widget.AppBarLayout
             android:id="@+id/app_layout_main_activity"
@@ -37,12 +37,11 @@
                         android:id="@+id/txt_main_activity_money"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="xxx元"
                         android:textColor="@color/black_text_gray"
                         android:textSize="@dimen/text_size_4"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"/>
 
                     <LinearLayout
                         android:id="@+id/linearLayout"
@@ -63,16 +62,15 @@
                             android:layout_width="20dp"
                             android:layout_height="20dp"
                             android:layout_centerVertical="true"
-                            android:src="@color/colorAccent" />
+                            android:src="@drawable/icon"/>
 
                         <TextView
                             android:id="@+id/txt_main_activity_nick"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/content_padding_small"
-                            android:text="陈大狗"
-                            android:textColor="@color/theme_sheep_dark"
-                            android:textSize="@dimen/text_size_2" />
+                            android:textColor="@color/orange_text_light"
+                            android:textSize="@dimen/text_size_2"/>
                     </LinearLayout>
 
 
@@ -88,10 +86,10 @@
                         android:paddingRight="@dimen/content_padding_small"
                         android:paddingTop="@dimen/content_padding_small"
                         android:text="现金提现"
-                        android:textColor="@color/theme_sheep_dark"
+                        android:textColor="@color/orange_text_light"
                         android:textSize="@dimen/text_size_2"
                         app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/linearLayout" />
+                        app:layout_constraintTop_toTopOf="@+id/linearLayout"/>
 
                 </android.support.constraint.ConstraintLayout>
 
@@ -104,7 +102,7 @@
                     app:contentInsetStart="0dp"
                     app:layout_collapseMode="pin">
 
-                    <include layout="@layout/title" />
+                    <include layout="@layout/title"/>
                 </android.support.v7.widget.Toolbar>
 
             </android.support.design.widget.CollapsingToolbarLayout>
@@ -112,7 +110,8 @@
             <com.sheep.jiuyan.samllsheep.page.view.RappTabLayout
                 android:id="@+id/tab_main_activity"
                 android:layout_width="match_parent"
-                android:layout_height="40dp" />
+                android:layout_height="40dp"
+                android:background="@color/colorPrimary"/>
         </android.support.design.widget.AppBarLayout>
 
         <android.support.v4.widget.NestedScrollView

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@color/translate">
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:background="@color/translate">
 
     <TextView
         android:layout_width="match_parent"
@@ -11,5 +11,5 @@
         android:gravity="center"
         android:padding="0dp"
         android:textColor="@color/black_text_deep"
-        android:textSize="@dimen/text_size_3" />
+        android:textSize="@dimen/text_size_4"/>
 </FrameLayout>

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

@@ -8,12 +8,13 @@
     <ImageView
         android:id="@+id/img_baseactivity_title"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="@dimen/layout_heigh_small"
         android:layout_centerVertical="true"
         android:gravity="center_vertical"
+        android:padding="@dimen/content_padding_small"
         android:minWidth="@dimen/layout_heigh_default"
         android:scaleType="centerInside"
-        android:src="@drawable/ic_arrow_back_24dp" />
+        android:src="@drawable/narrow_back_black" />
 
     <TextView
         android:id="@+id/txt_baseactivity_title"

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

@@ -2,8 +2,8 @@
 <resources>
 
     <color name="theme_bule">@color/theme_app_dark</color>
-    <color name="theme_app_dark">#fac208</color>
-    <color name="theme_sheep_dark">#b73701</color>
+    <color name="theme_app_dark">#f9a006</color>
+    <color name="theme_sheep_dark">#e4a185</color>
     <color name="theme">@color/theme_bule</color>
     <color name="theme_light">@color/theme_app_dark</color>
     <color name="translate">#00ffffff</color>

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

@@ -4,5 +4,5 @@
     <string name="start_download">开始下载</string>
     <string name="resume">继续</string>
     <string name="done">安装</string>
-
+    <string name="accessibility_service_description">开启观察权限</string>
 </resources>