Bladeren bron

修改包名

zhaoyi 8 jaren geleden
bovenliggende
commit
e3033840d3
36 gewijzigde bestanden met toevoegingen van 121 en 225 verwijderingen
  1. 1 1
      app/src/main/java/com/jiuyan/sheep_children/Config.java
  2. 1 3
      app/src/main/java/com/jiuyan/sheep_children/SheepApp.java
  3. 5 10
      app/src/main/java/com/jiuyan/sheep_children/base/BaseActivity.java
  4. 1 2
      app/src/main/java/com/jiuyan/sheep_children/download/DownloadService.java
  5. 1 1
      app/src/main/java/com/jiuyan/sheep_children/event/FloatMsg.java
  6. 9 23
      app/src/main/java/com/jiuyan/sheep_children/floatwindow/FloatService.java
  7. 1 2
      app/src/main/java/com/jiuyan/sheep_children/floatwindow/FloatWindow.java
  8. 1 3
      app/src/main/java/com/jiuyan/sheep_children/floatwindow/ShotScreen.java
  9. 1 8
      app/src/main/java/com/jiuyan/sheep_children/net/NetManager.java
  10. 4 7
      app/src/main/java/com/jiuyan/sheep_children/net/SheepCallback.java
  11. 2 2
      app/src/main/java/com/jiuyan/sheep_children/net/Url.java
  12. 7 15
      app/src/main/java/com/jiuyan/sheep_children/page/BindWxActivity.java
  13. 7 7
      app/src/main/java/com/jiuyan/sheep_children/page/DownloadActivity.java
  14. 6 10
      app/src/main/java/com/jiuyan/sheep_children/page/LoginActivity.java
  15. 15 38
      app/src/main/java/com/jiuyan/sheep_children/page/MainActivity.java
  16. 7 14
      app/src/main/java/com/jiuyan/sheep_children/page/ShotScreenActivity.java
  17. 9 19
      app/src/main/java/com/jiuyan/sheep_children/page/TaskRecordActivity.java
  18. 8 11
      app/src/main/java/com/jiuyan/sheep_children/page/UserCenterActivity.java
  19. 8 13
      app/src/main/java/com/jiuyan/sheep_children/page/WithdrawActivity.java
  20. 8 10
      app/src/main/java/com/jiuyan/sheep_children/page/WithdrawRecordActivity.java
  21. 4 5
      app/src/main/java/com/jiuyan/sheep_children/page/adapter/TaskAdapter.java
  22. 1 1
      app/src/main/java/com/jiuyan/sheep_children/page/entry/Commit.java
  23. 1 1
      app/src/main/java/com/jiuyan/sheep_children/page/entry/Money.java
  24. 1 1
      app/src/main/java/com/jiuyan/sheep_children/page/entry/Order.java
  25. 1 1
      app/src/main/java/com/jiuyan/sheep_children/page/entry/Task.java
  26. 1 1
      app/src/main/java/com/jiuyan/sheep_children/page/entry/TaskPublish.java
  27. 1 1
      app/src/main/java/com/jiuyan/sheep_children/page/entry/User.java
  28. 1 1
      app/src/main/java/com/jiuyan/sheep_children/utils/DeviceInfo.java
  29. 1 1
      app/src/main/java/com/jiuyan/sheep_children/utils/FileUtil.java
  30. 1 4
      app/src/main/java/com/jiuyan/sheep_children/utils/GsonUtil.java
  31. 1 1
      app/src/main/java/com/jiuyan/sheep_children/utils/PackageUtil.java
  32. 1 2
      app/src/main/java/com/jiuyan/sheep_children/utils/PremissUtils.java
  33. 1 3
      app/src/main/java/com/jiuyan/sheep_children/utils/SpUtils.java
  34. 2 2
      app/src/main/java/com/jiuyan/sheep_children/wxapi/WXEntryActivity.java
  35. BIN
      app/src/main/res/drawable-hdpi/icon_app.png
  36. 1 1
      app/src/main/res/values/strings.xml

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/Config.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children;
+package com.sheep.jiuyan.samllsheep;
 
 /**
  * Created by kemllor on 2017/12/14.

+ 1 - 3
app/src/main/java/com/jiuyan/sheep_children/SheepApp.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children;
+package com.sheep.jiuyan.samllsheep;
 
 import android.app.Activity;
 import android.app.Application;
@@ -6,11 +6,9 @@ import android.content.Context;
 import android.os.Bundle;
 
 import com.liulishuo.filedownloader.FileDownloader;
-import com.liulishuo.filedownloader.connection.FileDownloadUrlConnection;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
-import java.net.Proxy;
 import java.util.HashMap;
 import java.util.Map;
 

+ 5 - 10
app/src/main/java/com/jiuyan/sheep_children/base/BaseActivity.java

@@ -1,19 +1,14 @@
-package com.jiuyan.sheep_children.base;
+package com.sheep.jiuyan.samllsheep.base;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.view.GestureDetector;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.jiuyan.sheep_children.BuildConfig;
-import com.jiuyan.sheep_children.SheepApp;
-import com.jiuyan.sheep_children.event.FloatMsg;
-import com.jiuyan.sheep_children.page.MainActivity;
-import com.jiuyan.sheep_children.utils.PackageUtil;
+
+import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.event.FloatMsg;
 import com.readystatesoftware.chuck.Chuck;
 
 import org.greenrobot.eventbus.EventBus;

+ 1 - 2
app/src/main/java/com/jiuyan/sheep_children/download/DownloadService.java

@@ -1,9 +1,8 @@
-package com.jiuyan.sheep_children.download;
+package com.sheep.jiuyan.samllsheep.download;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 
 /**

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/event/FloatMsg.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.event;
+package com.sheep.jiuyan.samllsheep.event;
 
 /**
  * Created by kemllor on 2017/12/20.

+ 9 - 23
app/src/main/java/com/jiuyan/sheep_children/floatwindow/FloatService.java

@@ -1,47 +1,33 @@
-package com.jiuyan.sheep_children.floatwindow;
+package com.sheep.jiuyan.samllsheep.floatwindow;
 
 import android.app.Activity;
-import android.app.ActivityManager;
 import android.app.Service;
-import android.app.usage.UsageEvents;
-import android.app.usage.UsageStatsManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
-import android.os.Build;
 import android.os.IBinder;
-import android.provider.Settings;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.SheepApp;
-import com.jiuyan.sheep_children.event.FloatMsg;
-import com.jiuyan.sheep_children.page.MainActivity;
-import com.jiuyan.sheep_children.page.ShotScreenActivity;
-import com.jiuyan.sheep_children.page.entry.Task;
-import com.jiuyan.sheep_children.utils.DeviceInfo;
-import com.jiuyan.sheep_children.utils.PackageUtil;
-import com.jiuyan.sheep_children.utils.PremissUtils;
+
+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.utils.DeviceInfo;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import java.util.List;
 import java.util.Map;
 
 

+ 1 - 2
app/src/main/java/com/jiuyan/sheep_children/floatwindow/FloatWindow.java

@@ -1,11 +1,10 @@
-package com.jiuyan.sheep_children.floatwindow;
+package com.sheep.jiuyan.samllsheep.floatwindow;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
 /**

+ 1 - 3
app/src/main/java/com/jiuyan/sheep_children/floatwindow/ShotScreen.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.floatwindow;
+package com.sheep.jiuyan.samllsheep.floatwindow;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.ImageFormat;
 import android.graphics.PixelFormat;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.VirtualDisplay;
@@ -17,7 +16,6 @@ import android.media.projection.MediaProjectionManager;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-import android.os.SystemClock;
 import android.support.v4.os.AsyncTaskCompat;
 import android.text.TextUtils;
 

+ 1 - 8
app/src/main/java/com/jiuyan/sheep_children/net/NetManager.java

@@ -1,19 +1,13 @@
-package com.jiuyan.sheep_children.net;
+package com.sheep.jiuyan.samllsheep.net;
 
 import android.content.Context;
 
-import com.jiuyan.sheep_children.SheepApp;
 import com.readystatesoftware.chuck.ChuckInterceptor;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.Call;
-import okhttp3.Callback;
 import okhttp3.FormBody;
 import okhttp3.Headers;
 import okhttp3.MediaType;
@@ -21,7 +15,6 @@ import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
 
 /**
  * Created by kemllor on 2017/12/14.

+ 4 - 7
app/src/main/java/com/jiuyan/sheep_children/net/SheepCallback.java

@@ -1,20 +1,17 @@
-package com.jiuyan.sheep_children.net;
+package com.sheep.jiuyan.samllsheep.net;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Looper;
 import android.widget.Toast;
 
 import com.google.gson.internal.$Gson$Types;
-import com.google.gson.reflect.TypeToken;
-import com.jiuyan.sheep_children.SheepApp;
-import com.jiuyan.sheep_children.page.LoginActivity;
-import com.jiuyan.sheep_children.utils.GsonUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.page.LoginActivity;
+import com.sheep.jiuyan.samllsheep.utils.GsonUtil;
 
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.List;
 
 import okhttp3.Call;
 import okhttp3.Callback;

+ 2 - 2
app/src/main/java/com/jiuyan/sheep_children/net/Url.java

@@ -1,6 +1,6 @@
-package com.jiuyan.sheep_children.net;
+package com.sheep.jiuyan.samllsheep.net;
 
-import com.jiuyan.sheep_children.Config;
+import com.sheep.jiuyan.samllsheep.Config;
 
 /**
  * Created by kemllor on 2017/12/14.

+ 7 - 15
app/src/main/java/com/jiuyan/sheep_children/page/BindWxActivity.java

@@ -1,8 +1,6 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
-import android.app.Activity;
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.design.widget.TextInputEditText;
 import android.text.TextUtils;
 import android.view.View;
@@ -10,21 +8,15 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.utils.SpUtils;
 
-import java.io.IOException;
 import java.util.HashMap;
 
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
 public class BindWxActivity extends BaseActivity implements View.OnClickListener {
     private ImageView mBack;
     private TextView mTitle;

+ 7 - 7
app/src/main/java/com/jiuyan/sheep_children/page/DownloadActivity.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -11,12 +11,12 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.SheepApp;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.page.entry.Task;
-import com.jiuyan.sheep_children.utils.FileUtil;
-import com.jiuyan.sheep_children.utils.PackageUtil;
+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.liulishuo.filedownloader.BaseDownloadTask;
 import com.liulishuo.filedownloader.FileDownloadListener;
 import com.liulishuo.filedownloader.FileDownloader;

+ 6 - 10
app/src/main/java/com/jiuyan/sheep_children/page/LoginActivity.java

@@ -1,9 +1,7 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Intent;
-import android.os.Build;
 import android.support.design.widget.TextInputEditText;
 import android.text.TextUtils;
 import android.view.View;
@@ -12,13 +10,11 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
-import com.jiuyan.sheep_children.BuildConfig;
-import com.jiuyan.sheep_children.Config;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.SheepApp;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.utils.SpUtils;
-import com.tencent.mm.opensdk.modelmsg.SendAuth;
+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.utils.SpUtils;
 
 /**
  * Created by kemllor on 2017/12/21.

+ 15 - 38
app/src/main/java/com/jiuyan/sheep_children/page/MainActivity.java

@@ -1,67 +1,44 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-import com.google.gson.reflect.TypeToken;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
-import com.jiuyan.sheep_children.BuildConfig;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.SheepApp;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.event.FloatMsg;
-import com.jiuyan.sheep_children.floatwindow.FloatService;
-import com.jiuyan.sheep_children.floatwindow.FloatWindow;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.page.adapter.TaskAdapter;
-import com.jiuyan.sheep_children.page.entry.Task;
-import com.jiuyan.sheep_children.page.entry.TaskPublish;
-import com.jiuyan.sheep_children.page.entry.User;
-import com.jiuyan.sheep_children.utils.DeviceInfo;
-import com.jiuyan.sheep_children.utils.GsonUtil;
-import com.jiuyan.sheep_children.utils.PackageUtil;
-import com.jiuyan.sheep_children.utils.PremissUtils;
-import com.jiuyan.sheep_children.utils.SpUtils;
-import com.readystatesoftware.chuck.Chuck;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.floatwindow.FloatWindow;
+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.adapter.TaskAdapter;
+import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
+import com.sheep.jiuyan.samllsheep.page.entry.User;
+import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
+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;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
 import de.hdodenhof.circleimageview.CircleImageView;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Response;
 
 public class MainActivity extends BaseActivity implements View.OnClickListener {
 

+ 7 - 14
app/src/main/java/com/jiuyan/sheep_children/page/ShotScreenActivity.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,26 +7,19 @@ import android.media.projection.MediaProjectionManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.Window;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.floatwindow.ShotScreen;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.utils.PackageUtil;
-import com.jiuyan.sheep_children.utils.SpUtils;
-import com.shark.screencapture.ScreenCapture;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.floatwindow.ShotScreen;
+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.utils.SpUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Response;
-
 /**
  * Created by kemllor on 2017/12/13.
  */

+ 9 - 19
app/src/main/java/com/jiuyan/sheep_children/page/TaskRecordActivity.java

@@ -1,38 +1,28 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.event.FloatMsg;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.page.entry.Commit;
-import com.jiuyan.sheep_children.page.entry.TaskPublish;
-import com.jiuyan.sheep_children.utils.PackageUtil;
-import com.jiuyan.sheep_children.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.PackageUtil;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
-import org.greenrobot.eventbus.EventBus;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 

+ 8 - 11
app/src/main/java/com/jiuyan/sheep_children/page/UserCenterActivity.java

@@ -1,22 +1,19 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.page.entry.User;
-import com.jiuyan.sheep_children.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.User;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.HashMap;
 

+ 8 - 13
app/src/main/java/com/jiuyan/sheep_children/page/WithdrawActivity.java

@@ -1,30 +1,25 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.PersistableBundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.widget.BaseAdapter;
-import android.widget.GridLayout;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.bumptech.glide.Glide;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.page.entry.User;
-import com.jiuyan.sheep_children.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.User;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.HashMap;
 

+ 8 - 10
app/src/main/java/com/jiuyan/sheep_children/page/WithdrawRecordActivity.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page;
+package com.sheep.jiuyan.samllsheep.page;
 
 import android.text.TextUtils;
 import android.view.View;
@@ -6,18 +6,16 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.base.BaseActivity;
-import com.jiuyan.sheep_children.net.NetManager;
-import com.jiuyan.sheep_children.net.SheepCallback;
-import com.jiuyan.sheep_children.net.Url;
-import com.jiuyan.sheep_children.page.entry.Commit;
-import com.jiuyan.sheep_children.page.entry.Order;
-import com.jiuyan.sheep_children.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.Order;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.zhy.adapter.abslistview.CommonAdapter;
 import com.zhy.adapter.abslistview.ViewHolder;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 

+ 4 - 5
app/src/main/java/com/jiuyan/sheep_children/page/adapter/TaskAdapter.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.adapter;
+package com.sheep.jiuyan.samllsheep.page.adapter;
 
 import android.app.Activity;
 import android.support.v7.widget.RecyclerView;
@@ -9,9 +9,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.jiuyan.sheep_children.R;
-import com.jiuyan.sheep_children.page.entry.Task;
-import com.jiuyan.sheep_children.page.entry.TaskPublish;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +55,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
     public void onBindViewHolder(ViewHolder viewHolder, final int position) {
         viewHolder.mTvTitle.setText(datas.get(position).getTask().getTitle());
         viewHolder.mTvCount.setText(datas.get(position).getSurplusCount() + "/" + datas.get(position).getTotalCouont());
-        viewHolder.mTvTime.setText(datas.get(position).getOverTime());
+        viewHolder.mTvTime.setText(String.format("截止日期:%s", datas.get(position).getOverTime()));
         viewHolder.mTvMoney.setText(datas.get(position).getTask().getPrice());
         Glide.with(mActivity)
                 .load(datas.get(position).getTask().getIcon())

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/page/entry/Commit.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.entry;
+package com.sheep.jiuyan.samllsheep.page.entry;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/page/entry/Money.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.entry;
+package com.sheep.jiuyan.samllsheep.page.entry;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/page/entry/Order.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.entry;
+package com.sheep.jiuyan.samllsheep.page.entry;
 
 /**
  * Created by kemllor on 2017/12/29.

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/page/entry/Task.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.entry;
+package com.sheep.jiuyan.samllsheep.page.entry;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/page/entry/TaskPublish.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.entry;
+package com.sheep.jiuyan.samllsheep.page.entry;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/page/entry/User.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.page.entry;
+package com.sheep.jiuyan.samllsheep.page.entry;
 
 import java.io.Serializable;
 

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/utils/DeviceInfo.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.utils;
+package com.sheep.jiuyan.samllsheep.utils;
 
 import android.content.Context;
 import android.graphics.Point;

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/utils/FileUtil.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.utils;
+package com.sheep.jiuyan.samllsheep.utils;
 
 import java.io.File;
 

+ 1 - 4
app/src/main/java/com/jiuyan/sheep_children/utils/GsonUtil.java

@@ -1,11 +1,8 @@
-package com.jiuyan.sheep_children.utils;
+package com.sheep.jiuyan.samllsheep.utils;
 
 import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.jiuyan.sheep_children.page.entry.Task;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 
 /**
  * Created by kemllor on 2017/12/15.

+ 1 - 1
app/src/main/java/com/jiuyan/sheep_children/utils/PackageUtil.java

@@ -1,4 +1,4 @@
-package com.jiuyan.sheep_children.utils;
+package com.sheep.jiuyan.samllsheep.utils;
 
 import android.app.ActivityManager;
 import android.app.usage.UsageEvents;

+ 1 - 2
app/src/main/java/com/jiuyan/sheep_children/utils/PremissUtils.java

@@ -1,10 +1,9 @@
-package com.jiuyan.sheep_children.utils;
+package com.sheep.jiuyan.samllsheep.utils;
 
 import android.app.Activity;
 import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Process;
 
 /**

+ 1 - 3
app/src/main/java/com/jiuyan/sheep_children/utils/SpUtils.java

@@ -1,11 +1,9 @@
-package com.jiuyan.sheep_children.utils;
+package com.sheep.jiuyan.samllsheep.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 
-import com.jiuyan.sheep_children.page.UserCenterActivity;
-
 /**
  * Created by kemllor on 2017/12/21.
  */

+ 2 - 2
app/src/main/java/com/jiuyan/sheep_children/wxapi/WXEntryActivity.java

@@ -1,6 +1,6 @@
-package com.jiuyan.sheep_children.wxapi;
+package com.sheep.jiuyan.samllsheep.wxapi;
 
-import com.jiuyan.sheep_children.SheepApp;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;

BIN
app/src/main/res/drawable-hdpi/icon_app.png


+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">SamllSheepPlugin</string>
+    <string name="app_name">小绵羊</string>
     <string name="pause">暂停</string>
     <string name="start_download">开始下载</string>
     <string name="resume">继续</string>