增加引导页

app/src/main/AndroidManifest.xml

@@ -62,11 +62,7 @@
         <activity
             android:name=".page.LoginActivity"
             android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
         </activity>
 
         <service
@@ -118,6 +114,15 @@
         <activity
             android:name=".page.XDownLoadActivity"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name=".page.SplashActivity"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
     </application>
 
 

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

@@ -140,6 +140,7 @@ public class FloatService extends Service implements View.OnClickListener {
                             params.x = 0;
                         }
                         mWm.updateViewLayout(mFloatwindow, params);
+                        break;
                 }
                 return false;
             }

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

@@ -7,30 +7,53 @@ import com.sheep.jiuyan.samllsheep.Config;
  */
 
 public class Url {
+    //上传图片&提交任务
     public static String UPLOAD_IMG = Config.instance().mBaseUrl + "/v1/up/";
+    //获取任务列表
     public static String PUBLISH_TASKS = Config.instance().mBaseUrl + "/v1/task_publish/getTasks/";
+    //绑定微信
     public static String BIND_WX = Config.instance().mBaseUrl + "/v1/user/bindWx";
+    //获取机器人
     public static String BIND_ROBOT = Config.instance().mBaseUrl + "/v1/user/getRobot";
+    //用户信息
     public static String USER_INFO = Config.instance().mBaseUrl + "/v1/user/getUserInfo";
+    //提交记录
     public static String USER_COMMIT = Config.instance().mBaseUrl + "/v1/user/getDoneTask";
+    //是否接受任务
     public static String USER_CHECK_REGISTER = Config.instance().mBaseUrl + "/v1/task_publish/getRegisterTask";
+    //接受任务
     public static String USER_REGISTER_TASK = Config.instance().mBaseUrl + "/v1/task_publish/registerTask";
+    //进行中的任务
     public static String USER_PULL_TASK = Config.instance().mBaseUrl + "/v1/task_publish/getDoingTask";
+    //提现记录
     public static String USER_WITHDRAW_RECORD = Config.instance().mBaseUrl + "/v1/withDraw/getHistroyCommit";
+    //提现
     public static String USER_WITHDRAW = Config.instance().mBaseUrl + "/v1/withDraw/withDraw";
+    //新手任务
     public static String WXTASK = Config.instance().mBaseUrl + "/v1/task_publish/getWxTask";
+    //资金记录
     public static String MONEYRECORD = Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
+    //任务数量
     public static String GET_TASK_COUNT = Config.instance().mBaseUrl + "/v1/user/getTaskCount";
-
+    //微信列表
     public static String WXACCOUNT = Config.instance().mBaseUrl + "/v1/user/userChildWxList";
+    //微信任务列表
     public static String TASK_LIST = Config.instance().mBaseUrl + "/v1/user/getChildTaskList";
+    //提交微信
     public static String COMMIT_WXACCOUNT = Config.instance().mBaseUrl + "/v1/user/commitWx";
 
     public static String BINGACCOUNT = Config.instance().mBaseUrl + "/v1/user/register";
+    //微信指导
     public static String REQUEST_HOOK = Config.instance().mBaseUrl + "/static/index.html";
+    //提供微信号页面
     public static String ADD_CHILD_WX = Config.instance().mBaseUrl + "/static/apply3.html";
+    //登录好玩
     public static String LOGIN = Config.instance().mBaseUrl + "/v1/user/login";
+    //授权
     public static String REGISTER_SHEEP = Config.instance().mBaseUrl + "/v1/user/register";
+    //注册好玩
     public static String REGISTER_HW = Config.instance().mBaseUrl + "/v1/user/registerHw";
+    //邀请链接
+    public static String USER_INVITE_URL = Config.instance().mBaseUrl + "/v1/user/getInviteUrl";
 
 }

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

@@ -121,6 +121,7 @@ public class GameDetailActivity extends BaseActivity {
         mBtnUpImag.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                mBtnUpImag.setEnabled(false);
                 checkIsRegisterTask();
             }
         });
@@ -138,6 +139,12 @@ public class GameDetailActivity extends BaseActivity {
                 } else {
                     showRecommitDialog("用户同时只能领取一个任务，是否领取此任务？");
                 }
+                mBtnUpImag.setEnabled(true);
+            }
+
+            @Override
+            public void failure(IOException e) {
+                mBtnUpImag.setEnabled(true);
             }
         });
     }

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

@@ -41,12 +41,6 @@ public class LoginActivity extends BaseActivity {
 
     @Override
     public void initData() {
-        String openId = SpUtils.getOpenId(this);
-        if (!TextUtils.isEmpty(openId)) {
-            Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-            startActivity(intent);
-            finish();
-        }
     }
 
     private EditText mEtAccount;

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

@@ -1,6 +1,7 @@
 package com.sheep.jiuyan.samllsheep.page;
 
 import android.Manifest;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -14,6 +15,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -29,11 +31,7 @@ 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.ClassFileHelper;
 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;
 
@@ -56,7 +54,6 @@ import static android.support.v4.view.ViewPager.SCROLL_STATE_IDLE;
 */
 public class MainActivity extends BaseActivity {
 
-    private final int INTENT_GET_PERMISSION = 1;
     private RappTabLayout mRappTabLayout;
     private ViewPager mViewPager;
     private AdpMainPageViewPager mAdpMainPageViewPager;
@@ -70,56 +67,31 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        showNewDialog();
         super.onCreate(savedInstanceState);
         Intent intent = new Intent(this, FloatWindow.class);
         startActivity(intent);
-        getSA();
     }
 
 
-    /**
-     * 申请读写权限6.0
-     */
-    private void getSA() {
 
-        Acp.getInstance(this).request(new AcpOptions.Builder()
-                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
-                                , Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.READ_PHONE_STATE
-                        )
-                        .build(),
-                new AcpListener() {
-                    @Override
-                    public void onGranted() {
-                        ClassFileHelper.getInstance().createSDDirection();
-                    }
-                    @Override
-                    public void onDenied(List<String> permissions) {
-                        Toast.makeText(MainActivity.this,"亲！权限拒绝可能会导致某些功能无法使用",Toast.LENGTH_LONG).show();
 
-                    }
-                });
-
-
-
-
-    }
-
-//    @Override
-//    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-//        if (requestCode == INTENT_GET_PERMISSION) {
-//            boolean isOk = true;
-//            for (int result : grantResults) {
-//                if (result == PackageManager.PERMISSION_DENIED) {
-//                    isOk = false;
-//                    break;//只要有一个拒绝，就退出并提示
-//                }
-//            }
-//            if (!isOk) {
-//                G.showToast("权限获取失败，部分功能可能无法正常工作。");
-//            }
-//        }
-//        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-//    }
+    //    @Override
+    //    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+    //        if (requestCode == INTENT_GET_PERMISSION) {
+    //            boolean isOk = true;
+    //            for (int result : grantResults) {
+    //                if (result == PackageManager.PERMISSION_DENIED) {
+    //                    isOk = false;
+    //                    break;//只要有一个拒绝，就退出并提示
+    //                }
+    //            }
+    //            if (!isOk) {
+    //                G.showToast("权限获取失败，部分功能可能无法正常工作。");
+    //            }
+    //        }
+    //        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    //    }
 
 
     @Override
@@ -238,12 +210,12 @@ public class MainActivity extends BaseActivity {
         ((TextView) findViewById(R.id.txt_baseactivity_title)).setText("我的奖金");
 
 
-        ImageButton btn= (ImageButton) findViewById(R.id.ibtn_baseactivity_right);
+        ImageButton btn = (ImageButton) findViewById(R.id.ibtn_baseactivity_right);
         btn.setImageResource(R.drawable.icon_download);
         btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent i=new  Intent(MainActivity.this,XDownLoadActivity.class);
+                Intent i = new Intent(MainActivity.this, XDownLoadActivity.class);
                 startActivity(i);
             }
         });

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

@@ -0,0 +1,90 @@
+package com.sheep.jiuyan.samllsheep.page;
+
+import android.Manifest;
+import android.content.Intent;
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.mylhyl.acp.Acp;
+import com.mylhyl.acp.AcpListener;
+import com.mylhyl.acp.AcpOptions;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import java.util.List;
+
+/**
+ * Created by kemllor on 2018/1/24.
+ */
+
+public class SplashActivity extends BaseActivity {
+    @Override
+    protected int getLayoutId() {
+        return R.layout.splash_activity;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @Override
+    public void initListener() {
+
+    }
+
+    @Override
+    public void initData() {
+        getSA();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                SystemClock.sleep(3000);
+                String openId = SpUtils.getOpenId(getApplicationContext());
+                if (!TextUtils.isEmpty(openId)) {
+                    Intent intent = new Intent(SplashActivity.this, MainActivity.class);
+                    startActivity(intent);
+                    finish();
+                }else {
+                    Intent intent = new Intent(SplashActivity.this, LoginActivity.class);
+                    startActivity(intent);
+                    finish();
+                }
+            }
+        }).start();
+
+    }
+
+    /**
+     * 申请读写权限6.0
+     */
+    private void getSA() {
+        boolean has = PremissUtils.hasPermission(this);
+        if (!has) {
+            PremissUtils.openUsageAccessPage(this);
+        }
+        Acp.getInstance(this).request(new AcpOptions.Builder()
+                        .setPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE
+                                , Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE
+                        )
+                        .build(),
+                new AcpListener() {
+                    @Override
+                    public void onGranted() {
+                        ClassFileHelper.getInstance().createSDDirection();
+                    }
+
+                    @Override
+                    public void onDenied(List<String> permissions) {
+                        Toast.makeText(SplashActivity.this, "亲！权限拒绝可能会导致某些功能无法使用", Toast.LENGTH_LONG).show();
+
+                    }
+                });
+
+
+    }
+}

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/icon"/>
+
+</LinearLayout>