xxh xxh2.0 的分支切换上来的代码

.idea/gradle.xml

@@ -5,15 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/datashare" />
-            <option value="$PROJECT_DIR$/view" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

app/src/main/java/com/sheep/gamegroup/IBase/IBasePresenter.java

@@ -8,6 +8,6 @@ import java.util.HashMap;
 
 public interface IBasePresenter {
 
-    void getTask(HashMap<String,Object> map);
+    void getTask(HashMap<String, Object> map);
 
 }

app/src/main/java/com/sheep/gamegroup/IBase/IBaseView.java

@@ -6,7 +6,7 @@ package com.sheep.gamegroup.IBase;
 
 public interface IBaseView {
 
-    void  NetSuccess(int code,String msg);
-    void  NetError(int code ,String  errorMsg);
+    void  NetSuccess(int code, String msg);
+    void  NetError(int code, String errorMsg);
 
 }

app/src/main/java/com/sheep/gamegroup/absBase/AppActivity.java

@@ -0,0 +1,50 @@
+package com.sheep.gamegroup.absBase;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+
+
+import org.greenrobot.eventbus.EventBus;
+
+/**
+ * Created by Administrator on 2018/1/7.
+ */
+
+public class AppActivity extends AppCompatActivity{
+    private String mName;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mName = this.getClass().getSimpleName();
+//        SheepApp.mActivitys.put(mName, this);
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+//        SheepApp.mActivitys.remove(mName);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+    }
+
+
+}

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -0,0 +1,95 @@
+package com.sheep.gamegroup.absBase;
+
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.KeyEvent;
+import android.widget.Toast;
+
+import butterknife.ButterKnife;
+
+/**
+ * Created by kemllor on 2017/12/15.
+ */
+
+public abstract class BaseActivity extends AppActivity  {
+
+    protected ProgressDialog  mPd;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(getLayoutId());
+        ButterKnife.bind(this);
+        initView();
+        initListener();
+        initData();
+
+    }
+
+    protected void  showProgress(){
+        if(mPd!=null){
+            hideProgress();
+        }
+        mPd = new ProgressDialog(this);
+//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
+//        mPd.setContentView(view);//自己定义布局
+        mPd.setMessage("数据加载中...");
+        mPd.setCancelable(true);//能否够被取消
+//        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
+        mPd.show();
+    }
+
+
+    protected void  hideProgress(){
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if(mPd!=null){
+                    mPd.dismiss();
+                }
+            }
+        });
+
+    }
+    protected   void  showToast(String msg){
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(BaseActivity.this,msg,Toast.LENGTH_LONG).show();
+            }
+        });
+
+
+    }
+
+
+
+
+
+
+
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        /*if (BuildConfig.DEBUG)
+            if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+                Intent intent = Chuck.getLaunchIntent(BaseActivity.this);
+                startActivity(intent);
+                return true;
+            }*/
+        return super.onKeyDown(keyCode, event);
+    }
+
+    protected abstract int getLayoutId();
+
+    public abstract void initView();
+
+    public abstract void initListener();
+
+    public abstract void initData();
+
+
+}

app/src/main/java/com/sheep/gamegroup/absBase/BaseUMActivity.java

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.absBase;
 
 import android.content.Intent;
 
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+
 import com.umeng.socialize.UMShareAPI;
 
 /**

app/src/main/java/com/sheep/gamegroup/di/components/AskGetMoneyComponent.java

@@ -0,0 +1,18 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
+import com.sheep.gamegroup.di.modules.PhoneModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
+import com.sheep.gamegroup.view.activity.PhoneAct;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+@UserScope
+@Component(modules = AskGetMoneyModule.class, dependencies = NetComponent.class)
+public interface AskGetMoneyComponent {
+    void inject(AskGetMoneyAct phoneAct);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/AskGetMoneyModule.java

@@ -0,0 +1,23 @@
+package com.sheep.gamegroup.di.modules;
+
+import com.sheep.gamegroup.presenter.AskGetMoneyContract;
+import com.sheep.gamegroup.presenter.LoginContract;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by Administrator on 2018/3/10.
+ */
+@Module
+public class AskGetMoneyModule {
+    private AskGetMoneyContract.View view;
+
+    public AskGetMoneyModule(AskGetMoneyContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public AskGetMoneyContract.View provideView(){
+        return view;
+    }
+}

app/src/main/java/com/sheep/gamegroup/exception/ApiException.java

@@ -0,0 +1,19 @@
+package com.sheep.gamegroup.exception;
+
+/**
+ * Created by Administrator on 2018/3/22.
+ */
+
+public class ApiException  extends  Exception{
+
+
+    public int code;
+    public String message;
+
+    public ApiException(Throwable throwable, int code) {
+        super(throwable);
+        this.code = code;
+
+    }
+}
+

app/src/main/java/com/sheep/gamegroup/exception/ERROR.java

@@ -0,0 +1,26 @@
+package com.sheep.gamegroup.exception;
+
+/**
+ * Created by Administrator on 2018/3/22.
+ */
+
+public class ERROR {
+    /**
+     * 未知错误
+     */
+    public static final int UNKNOWN = 1000;
+    /**
+     * 解析错误
+     */
+    public static final int PARSE_ERROR = 1001;
+    /**
+     * 网络错误
+     */
+    public static final int NETWORD_ERROR = 1002;
+    /**
+     * 协议出错
+     */
+    public static final int HTTP_ERROR = 1003;
+
+
+}

app/src/main/java/com/sheep/gamegroup/exception/ExceptionEngine.java

@@ -0,0 +1,75 @@
+package com.sheep.gamegroup.exception;
+
+import com.alibaba.fastjson.JSONException;
+import com.google.gson.JsonParseException;
+
+
+
+import java.net.ConnectException;
+import java.text.ParseException;
+
+import retrofit2.adapter.rxjava.HttpException;
+
+/**
+ * Created by Administrator on 2018/3/22.
+ */
+
+public class ExceptionEngine {
+
+    //对应HTTP的状态码
+    private static final int UNAUTHORIZED = 401;
+    private static final int FORBIDDEN = 403;
+    private static final int NOT_FOUND = 404;
+    private static final int REQUEST_TIMEOUT = 408;
+    private static final int INTERNAL_SERVER_ERROR = 500;
+    private static final int BAD_GATEWAY = 502;
+    private static final int SERVICE_UNAVAILABLE = 503;
+    private static final int GATEWAY_TIMEOUT = 504;
+    private static final int SMS_ERROR = 422;
+
+    public static ApiException handleException(Throwable e){
+        ApiException ex;
+        if (e instanceof HttpException){             //HTTP错误
+            HttpException httpException = (HttpException) e;
+            ex = new ApiException(e, httpException.code());
+            switch(httpException.code()){
+                case UNAUTHORIZED:
+                case FORBIDDEN:
+                case NOT_FOUND:
+                case REQUEST_TIMEOUT:
+                case GATEWAY_TIMEOUT:
+                case INTERNAL_SERVER_ERROR:
+                case BAD_GATEWAY:
+                case SERVICE_UNAVAILABLE:
+                    ex.message = "网络错误";  //均视为网络错误
+                    break;
+                case  SMS_ERROR:
+                    ex.message = "验证码错误";  //均视为网络错误
+                    break;
+
+
+            }
+            return ex;
+        } else if (e instanceof ServerException){    //服务器返回的错误
+            ServerException resultException = (ServerException) e;
+            ex = new ApiException(resultException, resultException.code);
+            ex.message = resultException.message;
+            return ex;
+        } else if (e instanceof JsonParseException
+                || e instanceof JSONException
+                || e instanceof ParseException){
+            ex = new ApiException(e, ERROR.PARSE_ERROR);
+            ex.message = "解析错误";            //均视为解析错误
+            return ex;
+        }else if(e instanceof ConnectException){
+            ex = new ApiException(e, ERROR.NETWORD_ERROR);
+            ex.message = "连接失败";  //均视为网络错误
+            return ex;
+        }else {
+            ex = new ApiException(e, ERROR.UNKNOWN);
+            ex.message = "未知错误";          //未知错误
+            return ex;
+        }
+    }
+
+}

app/src/main/java/com/sheep/gamegroup/exception/ServerException.java

@@ -0,0 +1,12 @@
+package com.sheep.gamegroup.exception;
+
+/**
+ * Created by Administrator on 2018/3/22.
+ */
+
+public class ServerException extends RuntimeException {
+    public int code;
+    public String message;
+
+
+}

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -121,13 +121,6 @@ public interface ApiService {
     Observable<BaseMessage> releaseTask();
 
 
-    /**
-     * 获取正在运行的任务
-     */
-    @GET(V1+"/app/auth/login_by_we_chat")
-    Observable<BaseMessage> LoginByWX(@Body JSONObject jsonObject);
-
-
 
     /**
      * 邀请赚钱
@@ -141,4 +134,27 @@ public interface ApiService {
     Observable<BaseMessage> goWithdrawal(@Query("page") int page, @Query("per_page") int per_page, @Query("start_time ") String start_time , @Query("end_time ") String end_time );
 
 
+
+    /**
+     * 获取正在运行的任务
+     * @param jsonObject
+     */
+    @POST(V1+"/app/auth/login_by_we_chat")
+    Observable<BaseMessage> LoginByWX(@Body com.alibaba.fastjson.JSONObject jsonObject);
+
+
+
+    /**
+     * 获取正在运行的任务
+     * @param jsonObject
+     */
+    @POST(V1+"/app/auth/login_by_qq")
+    Observable<BaseMessage> LoginByQQ(@Body com.alibaba.fastjson.JSONObject jsonObject);
+
+
+
+    @GET(V1+"/app/user/friend_count_and_award")
+    Observable<BaseMessage> FriendCountAndAward();
+
+
 }

app/src/main/java/com/sheep/gamegroup/model/entity/FriendAndAwardEntity.java

@@ -0,0 +1,54 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by Administrator on 2018/3/23.
+ */
+
+public class FriendAndAwardEntity {
+
+    private   String   award;
+    private   int  frind_count;
+    private  String  share_desc;
+    private  String  share_link;
+    private  String  share_title;
+
+    public String getAward() {
+        return award;
+    }
+
+    public void setAward(String award) {
+        this.award = award;
+    }
+
+    public int getFrind_count() {
+        return frind_count;
+    }
+
+    public void setFrind_count(int frind_count) {
+        this.frind_count = frind_count;
+    }
+
+    public String getShare_desc() {
+        return share_desc;
+    }
+
+    public void setShare_desc(String share_desc) {
+        this.share_desc = share_desc;
+    }
+
+    public String getShare_link() {
+        return share_link;
+    }
+
+    public void setShare_link(String share_link) {
+        this.share_link = share_link;
+    }
+
+    public String getShare_title() {
+        return share_title;
+    }
+
+    public void setShare_title(String share_title) {
+        this.share_title = share_title;
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyContract.java

@@ -2,22 +2,22 @@ package com.sheep.gamegroup.presenter;
 
 import com.sheep.gamegroup.IBase.IBasePresenter;
 import com.sheep.gamegroup.IBase.IBaseView;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 
 /**
- * Created by Administrator on 2018/3/21.
+ * Created by Administrator on 2018/3/10.
  */
 
 public interface AskGetMoneyContract {
 
-
     interface Presenter extends IBasePresenter{
 
-
-
     }
+
     interface View extends IBaseView{
+       void   showTask(FriendAndAwardEntity entity);
 
-    }
 
 
+    }
 }

app/src/main/java/com/sheep/gamegroup/presenter/AskGetMoneyPresenter.java

@@ -1,57 +1,69 @@
 package com.sheep.gamegroup.presenter;
 
-import com.sheep.gamegroup.IBase.IBasePresenter;
-import com.sheep.gamegroup.IBase.IBaseView;
+import android.util.Log;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
+import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.util.FastJsonUtils;
-import com.sheep.gamegroup.util.ResposeCode;
-import com.sheep.gamegroup.util.XXTEA;
+import com.sheep.gamegroup.util.MyDbManager;
+
+import org.xutils.ex.DbException;
 
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
+import javax.inject.Inject;
+
 import rx.Observer;
 import rx.schedulers.Schedulers;
 
 /**
- * Created by Administrator on 2018/3/21.
+ * Created by Administrator on 2018/3/10.
  */
 
 public class AskGetMoneyPresenter implements AskGetMoneyContract.Presenter {
     private AskGetMoneyContract.View view;
     private ApiService apiService;
-    public  AskGetMoneyPresenter(AskGetMoneyContract.View view, ApiService apiService){
-         this.view=view;
-         this.apiService=apiService;
 
+    @Inject
+    public AskGetMoneyPresenter(AskGetMoneyContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
     }
 
+
     @Override
     public void getTask(HashMap<String, Object> map) {
 
-            apiService.askMakeMoney( FastJsonUtils.collectToString(map)).subscribeOn(Schedulers.io())
-                    .subscribe(new Observer<BaseMessage>() {
-                        @Override
-                        public void onCompleted() {
-
-                        }
-                        @Override
-                        public void onError(Throwable throwable) {
-                            view.NetError(ResposeCode.ERROR_NETWORK,throwable.getMessage().toString());
+        apiService.FriendCountAndAward()
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Observer<BaseMessage>() {
+                    @Override
+                    public void onCompleted() {
+                        Log.e("onCompleted--------","onCompleted");
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+                        Log.e("onError--------","onError:"+throwable);
+                         view.NetError(-1,ExceptionEngine.handleException(throwable).getMessage());
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+
+                        if(baseMessage!=null){
+                            FriendAndAwardEntity Ety = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),FriendAndAwardEntity.class);
+                            view.showTask(Ety);
+                        }else{
+                            view.NetError(-1,"数据解析出错");
                         }
-
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
+                    }
+                });
 
 
-
-                        }
-                    });
-
     }
-
-
-
-
 }

app/src/main/java/com/sheep/gamegroup/presenter/LoginContract.java

@@ -9,7 +9,7 @@ import com.sheep.gamegroup.IBase.IBaseView;
 public interface LoginContract {
 
     interface Presenter{
-        void logByAuther(String openid);
+        void logByAuther(int type, String access_token, String openid);
     }
 
     interface View extends IBaseView{

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -1,9 +1,26 @@
 package com.sheep.gamegroup.presenter;
 
+import android.util.Log;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.LoginEntity;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+
+import org.xutils.ex.DbException;
+
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -25,26 +42,77 @@ public class LoginPresenter implements LoginContract.Presenter {
     }
 
 
-
     @Override
-    public void logByAuther(String openid) {
-        //        apiService.LoginByWX().subscribeOn(Schedulers.io())
-//                .subscribe(new Observer<BaseMessage>() {
-//                    @Override
-//                    public void onCompleted() {
-//
-//                    }
-//
-//                    @Override
-//                    public void onError(Throwable throwable) {
-//                        view.NetError(-1,throwable.getMessage().toString());
-//                    }
-//
-//                    @Override
-//                    public void onNext(BaseMessage baseMessage) {
-//
-//
-//                    }
-//                });
+    public void logByAuther(int type, String access_token, String openid) {
+        JSONObject j = new JSONObject();
+        j.put("code",access_token);
+        j.put("username",openid);
+        j.put("scope","");
+        if(type==1){
+            apiService.LoginByWX(j).subscribeOn(Schedulers.io())
+                    .subscribe(new Observer<BaseMessage>() {
+                        @Override
+                        public void onCompleted() {
+
+                        }
+
+                        @Override
+                        public void onError(Throwable throwable) {
+                            view.NetError(-1,throwable.getMessage().toString());
+                        }
+
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+
+                            if(baseMessage!=null){
+
+
+                                LoginEntity loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
+                                SpUtils.login(SheepApp.mContext, loginEty.getToken());
+                                try {
+                                    MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
+                                } catch (DbException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+
+                            view.NetSuccess(1,"登录成功");
+
+
+                        }
+                    });
+
+        }else{
+            apiService.LoginByQQ(j).subscribeOn(Schedulers.io())
+                    .subscribe(new Observer<BaseMessage>() {
+                        @Override
+                        public void onCompleted() {
+
+                        }
+
+                        @Override
+                        public void onError(Throwable throwable) {
+                            view.NetError(-1, ExceptionEngine.handleException(throwable).getMessage());
+                        }
+
+                        @Override
+                        public void onNext(BaseMessage baseMessage) {
+                            if(baseMessage!=null){
+                                LoginEntity loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
+                                SpUtils.login(SheepApp.mContext, loginEty.getToken());
+                                try {
+                                    MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
+                                } catch (DbException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                            view.NetSuccess(1,"登录成功");
+
+                        }
+                    });
+
+        }
+
+
     }
 }

app/src/main/java/com/sheep/gamegroup/presenter/PhoneContract.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.presenter;
 
+import com.sheep.gamegroup.exception.ApiException;
+
 import org.json.JSONException;
 
 /**
@@ -19,6 +21,6 @@ public interface PhoneContract {
 
         void returnLogindata(Object o);
 
-        void loginFail(Object o);
+        void loginFail(ApiException o);
     }
 }

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -2,14 +2,28 @@ package com.sheep.gamegroup.presenter;
 
 import android.util.Log;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.orhanobut.logger.Logger;
+import com.sheep.gamegroup.exception.ExceptionEngine;
 import com.sheep.gamegroup.model.api.ApiService;
+import com.sheep.gamegroup.model.entity.BaseEntity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.util.XXTEA;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.inject.Inject;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import rx.Observable;
 import rx.Observer;
+import rx.functions.Func0;
+import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -24,14 +38,17 @@ public class PhonePresenter implements PhoneContract.Presenter {
     public PhonePresenter(PhoneContract.View view, ApiService apiService) {
         this.view = view;
         this.apiService = apiService;
-
     }
 
     @Override
     public void getCaptcha(String telphone){
         try{
+            Map map = new HashMap();
+            map.put("account", telphone);
+            Log.e("hash-map", map.toString());
             com.alibaba.fastjson.JSONObject j = new com.alibaba.fastjson.JSONObject();
             j.put("account", telphone);
+//        String encry = XXTEA.Encrypt(j.toString(),XXTEA.KEY);
             String encry = XXTEA.bytes2HexStr(XXTEA.Encrypt(j.toString(), XXTEA.KEY).getBytes("utf-8"));
             Log.e("encry----", com.alibaba.fastjson.JSONObject.toJSONString(encry));
             apiService.getCaptcha(j)
@@ -69,6 +86,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
         com.alibaba.fastjson.JSONObject m = new com.alibaba.fastjson.JSONObject();
         m.put("account",telphone);
         m.put("sec_code",code);
+
         apiService.loginByCaptcha(m)
                 .subscribeOn(Schedulers.io())
                 .subscribe(new Observer<BaseMessage>() {
@@ -81,7 +99,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
                     @Override
                     public void onError(Throwable throwable) {
                         Log.e("onError--------","onError:"+throwable);
-                        view.loginFail(null);
+                        view.loginFail(ExceptionEngine.handleException(throwable));
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/umeng/UMLogin.java

@@ -1,11 +0,0 @@
-package com.sheep.gamegroup.umeng;
-
-/**
- * Created by Administrator on 2018/3/19.
- */
-
-public class UMLogin {
-
-
-
-}

app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -6,8 +6,8 @@ package com.sheep.gamegroup.util;
 
 public class ConnectAddress {
 
-    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
-//    public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
+//    public static final String BASE_HTTP = "http://10.8.220.6:8080/";//何威
+     public static final String BASE_HTTP = "http://10.8.220.5:8080/";//张伟
 //    public static final String BASE_HTTP = "http://test.sheep.kfzs.com/";//测试服地址
 
     public static final String V1 = "/v1/";

app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -1,26 +1,51 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.graphics.Bitmap;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+
 import com.sheep.gamegroup.absBase.BaseUMActivity;
+
+import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
+import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.presenter.AskGetMoneyContract;
+import com.sheep.gamegroup.presenter.AskGetMoneyPresenter;
+
+import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.media.UMImage;
+import com.umeng.socialize.media.UMWeb;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
  * Created by Administrator on 2018/3/19.
  */
 
-public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener,AskGetMoneyContract.View {
+public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, AskGetMoneyContract.View {
 
 
+    @Inject
+    AskGetMoneyPresenter mPresenter;
     @BindView(R.id.tv_size)
     TextView tvSize;
     @BindView(R.id.tv_money)
@@ -34,10 +59,8 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener,As
     @BindView(R.id.rl_link)
     RelativeLayout rlLink;
 
-    /**
-     * 分享的链接地址
-     */
-    private  String  mShareLink;
+    private  FriendAndAwardEntity  mEntity;
+
     @Override
     protected int getLayoutId() {
         return R.layout.x_ask_getmoney_act_layout;
@@ -45,7 +68,10 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener,As
 
     @Override
     public void initView() {
-
+        DaggerAskGetMoneyComponent.builder().askGetMoneyModule(new AskGetMoneyModule(this))
+                .netComponent(SheepApp.get(this).getNetComponent())
+                .build()
+                .inject(this);
     }
 
     @Override
@@ -55,57 +81,84 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener,As
 
     @Override
     public void initData() {
-
+        showProgress();
+        mPresenter.getTask(null);
     }
 
-
-    @OnClick({R.id.rl_wx, R.id.rl_qq, R.id.rl_qr, R.id.rl_link})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.rl_wx:
-                shareToWX();
-                break;
-            case R.id.rl_qq:
-                shareToQQ();
-                break;
-            case R.id.rl_qr:
-                shareToQR();
-                break;
-            case R.id.rl_link:
-                shareToLink();
-                break;
-        }
+    private void shareToWX() {
+        shareToOther(1);
     }
 
-    private  void  shareToWX(){
-        new ShareAction(AskGetMoneyAct.this)
-                .setPlatform(SHARE_MEDIA.WEIXIN)//传入平台
-                .withText(mShareLink)//分享内容
-                .setCallback(this)//回调监听器
-                .share();
-
+    private void shareToQQ() {
+        shareToOther(2);
     }
 
-
-    private  void  shareToQQ(){
-        new ShareAction(AskGetMoneyAct.this)
-                .setPlatform(SHARE_MEDIA.QQ)//传入平台
-                .withText(mShareLink)//分享内容
-                .setCallback(this)//回调监听器
-                .share();
-
+    private void shareToOther(int code) {
+        UMImage thumb = new UMImage(this, R.drawable.icon);
+        UMWeb web = new UMWeb(mEntity.getShare_link());
+        web.setTitle(mEntity.getShare_title());//标题
+        web.setThumb(thumb);  //缩略图
+        web.setDescription(mEntity.getShare_desc());//描述
+        ShareAction shareAction = new ShareAction(AskGetMoneyAct.this);
+        if (code == 1) {
+            shareAction.setPlatform(SHARE_MEDIA.WEIXIN);
+        } else {
+            shareAction.setPlatform(SHARE_MEDIA.QQ);
+        }
+        shareAction.setCallback(this).withMedia(web).share();
     }
 
 
-    private  void  shareToQR(){
-
+    private void shareToQR() {
 
-    }
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+//        dialog.getWindow().setDimAmount(0.1f);
+//        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+        ImageView iv=view.findViewById(R.id.iv_close);
+        ImageView iv_qr=view.findViewById(R.id.iv_qr);
+         Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), G.WIDTH-40, G.HEIGHT/2, null);
+         iv_qr.setImageBitmap(mBitmap);
+         dialog.show();
+        iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
 
 
-    private  void  shareToLink(){
+    }
 
 
+    private void shareToLink() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = View.inflate(this, R.layout.x_ask_reward_dialog, null);
+        builder.setView(view);
+        final AlertDialog dialog = builder.create();
+//        dialog.getWindow().setDimAmount(0.1f);
+//        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+        TextView tv_link=view.findViewById(R.id.tv_link);
+        tv_link.setText(mEntity.getShare_link());
+        TextView withdrawal=view.findViewById(R.id.withdrawal);
+        ImageView iv=view.findViewById(R.id.iv_close);
+        dialog.show();
+        iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        withdrawal.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StringUtils.CopyText(AskGetMoneyAct.this,mEntity.getShare_link());
+                showToast("复制链接成功");
+                dialog.dismiss();
+            }
+        });
     }
 
 
@@ -136,6 +189,41 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener,As
 
     @Override
     public void NetError(int code, String errorMsg) {
+        hideProgress();
+        showToast(errorMsg);
+
+    }
+
+    @Override
+    public void showTask(FriendAndAwardEntity entity) {
+        hideProgress();
+        mEntity=entity;
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                tvSize.setText(mEntity.getFrind_count()+"");
+                tvMoney.setText(mEntity.getAward());
+            }
+        });
+
+    }
+
 
+    @OnClick({R.id.rl_wx, R.id.rl_qq, R.id.rl_qr, R.id.rl_link})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_wx:
+                shareToWX();
+                break;
+            case R.id.rl_qq:
+                shareToQQ();
+                break;
+            case R.id.rl_qr:
+                shareToQR();
+                break;
+            case R.id.rl_link:
+                shareToLink();
+                break;
+        }
     }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -3,22 +3,21 @@ package com.sheep.gamegroup.view.activity;
 import android.Manifest;
 import android.content.Intent;
 import android.os.Build;
+import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 import com.sheep.gamegroup.di.components.DaggerLoginComponent;
 import com.sheep.gamegroup.di.modules.LoginModule;
 import com.sheep.gamegroup.presenter.LoginContract;
 import com.sheep.gamegroup.presenter.LoginPresenter;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -46,6 +45,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     @BindView(R.id.iv_qq)
     ImageView ivQq;
 
+
     @Override
     protected int getLayoutId() {
         return R.layout.login_act_layout;
@@ -59,7 +59,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 .build()
                 .inject(this);
 
-
     }
 
 
@@ -90,9 +89,11 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
 
 
+
     private void goTelLogin() {
-        Jump2View.getInstance().goPhoneLoginView(LoginAct.this, false);
-//        finish();
+        Intent intent = new Intent(this, PhoneAct.class);
+        startActivity(intent);
+        finish();
     }
 
     private void goWeixin() {
@@ -103,7 +104,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-                mPresenter.logByAuther(data.get("openid"));
+                mPresenter.logByAuther(1,data.get("access_token"),data.get("openid"));
             }
 
             @Override
@@ -113,56 +114,62 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
-                showToast("微信授权取消");
 
+                showToast("微信授权失败");
             }
         });
 
     }
 
 
-    private  void  loginQQ(){
+    private void loginQQ() {
         UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.QQ, new UMAuthListener() {
             @Override
             public void onStart(SHARE_MEDIA platform) {
-
+                 showProgress();
             }
 
             @Override
             public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-                mPresenter.logByAuther(data.get("openid"));
+//                mPresenter.logByAuther(2,data.get("openid"));
+                mPresenter.logByAuther(2,data.get("access_token"),data.get("openid"));
+
             }
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("微信授权失败");
+                showToast("QQ授权失败");
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
-                showToast("微信授权取消");
+
 
             }
         });
 
 
-
     }
 
 
     @Override
     public void NetSuccess(int code, String msg) {
         showToast(msg);
+        hideProgress();
+        Jump2View.getInstance().goHomePageView(this, null);
+        finish();
+
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
         showToast(errorMsg);
-
+        hideProgress();
 
     }
 
 
+
     @OnClick({R.id.tel_login_tv, R.id.iv_wx, R.id.iv_qq})
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -170,6 +177,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 goTelLogin();
                 break;
             case R.id.iv_wx:
+//                Jump2View.getInstance().goHomePageView(this,null);
                 goWeixin();
                 break;
             case R.id.iv_qq:

app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -11,8 +11,11 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerPhoneComponent;
 import com.sheep.gamegroup.di.modules.PhoneModule;
+import com.sheep.gamegroup.exception.ApiException;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -20,17 +23,15 @@ import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.Config;
+
+import com.sheep.gamegroup.util.XXTEA;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.xutils.ex.DbException;
 
@@ -57,15 +58,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     @Inject
     PhonePresenter phonePresenter;
-    @BindView(R.id.phone_tip_tv)
-    TextView phoneTipTv;
 
     private SelfCountDownTimer selfCountDownTimer;
     private boolean canGetCaptchaPhone = true;
 
     private String etPhone;
     private String etCode;
-    private boolean showNotice = false;//false：手机登录，true：绑定手机
 
     @Override
     protected int getLayoutId() {
@@ -75,16 +73,11 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     @Override
     public void initView() {
         activity = this;
-        showNotice = getIntent().getBooleanExtra("show_notice", false);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(this, "手机号登录")
-                .setTitleFinish(this);
         DaggerPhoneComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .phoneModule(new PhoneModule(this))
                 .build()
-                .inject(this);
+        .inject(this);
 //        testData();
     }
 
@@ -113,22 +106,16 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 
     @Override
     public void initData() {
-        if (!showNotice) {
-            phoneTipTv.setVisibility(View.GONE);
-            phoneTipTv.setVisibility(View.GONE);
-        } else {
-            phoneTipTv.setVisibility(View.VISIBLE);
 
-        }
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-//        phoneEtAccount.setText("17628083502");
-//        phoneEtCode.setText("123456");
+
+        phoneEtAccount.setText("17628083502");
+        phoneEtCode.setText("123456");
     }
 
     @OnClick({R.id.phone_et_account, R.id.phone_et_code, R.id.phone_btn_code, R.id.phone_sure_tv})
@@ -143,37 +130,31 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
                 getCaptcha();
                 break;
             case R.id.phone_sure_tv:
-                if(BuildConfig.DEBUG){
-                    goMain();
-                    return;
-                }
                 etPhone = phoneEtAccount.getText().toString().trim();
                 etCode = phoneEtCode.getText().toString().trim();
                 loginByPhoneGaptcha();
-
                 break;
         }
     }
 
     private boolean checkPhoneInput() {
         if (TextUtils.isEmpty(etPhone)) {
-            G.showToast(getString(R.string.input_your_phone));
+            showToast(getString(R.string.input_your_phone));
             return false;
         }
         if (etPhone.toString().length() != 11) {
-            G.showToast(getString(R.string.toast_warning_phone_number_size));
+            showToast(getString(R.string.toast_warning_phone_number_size));
             return false;
         }
         return true;
     }
-
     private boolean checkCodeInput() {
         if (TextUtils.isEmpty(etCode)) {
-            G.showToast(getString(R.string.input_your_captcha));
+            showToast(getString(R.string.input_your_captcha));
             return false;
         }
         if (etCode.toString().length() != 6) {
-            G.showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
+            showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
             return false;
         }
         return true;
@@ -182,12 +163,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     /**
      * 获取验证码
      */
-    private void getCaptcha() {
+    private void getCaptcha(){
 
         if (!canGetCaptchaPhone) {
             return;
         }
-        if (!checkPhoneInput()) {
+        if(!checkPhoneInput()){
             return;
         }
         selfCountDownTimer.reset();
@@ -195,15 +176,14 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
         canGetCaptchaPhone = false;
         selfCountDownTimer.start();
     }
-
     /**
      * 登录
      */
-    private void loginByPhoneGaptcha() {
-        if (!checkPhoneInput()) {
+    private void loginByPhoneGaptcha(){
+        if(!checkPhoneInput()){
             return;
         }
-        if (!checkCodeInput()) {
+        if(!checkCodeInput()){
             return;
         }
 
@@ -220,47 +200,38 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     @Override
     public void returnLogindata(Object o) {
         hideProgress();
-        if (o == null) {
+        if(o == null){
             return;
         }
         BaseMessage baseMessage = (BaseMessage) o;
 //        JSONObject a = JSON.parseObject(o.toString());
-        Log.e("------data", baseMessage.getData() + "");
-        LoginEntity loginEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), LoginEntity.class);
+        Log.e("------data",baseMessage.getData()+"");
+
+        LoginEntity loginEty = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
         SpUtils.login(activity, loginEty.getToken());
         try {
             MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
             UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-            Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-            G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
+            Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
+            showToast(userEntity.getNickname()+"|"+userEntity.getMobile());
         } catch (DbException e) {
             e.printStackTrace();
         }
 
-        Jump2View.getInstance().goHomePageView(activity, null);
-        ActivityManager.getInstance().endActivity(LoginAct.class);
+        Jump2View.getInstance().goPersonnalCenterView(activity, null);
         finish();
         Log.e("---login_-", o.toString());
     }
 
     @Override
-    public void loginFail(Object o) {
+    public void loginFail(ApiException o) {
         hideProgress();
-        G.showToast("登录失败" + "");
-//        testData();
+        showToast(o.getMessage());
     }
 
-    private void goMain() {
-        // TODO: 2018/3/22  测试界面，过后删除s
-                SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
-//        startActivity(new Intent(this, ActMain.class));
-                Jump2View.getInstance().goHomePageView(this, null);
-                ActivityManager.getInstance().endActivity(LoginAct.class);
-                finish();
-    }
 
-    private void testData() {
-        try {
+    private void testData(){
+        try{
             String data = "{\n" +
                     "  \"data\": {\n" +
                     "    \"token\": \"12@38948cb4b6e74079615b154a80e3054b\",\n" +
@@ -290,14 +261,14 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             String showStr = "登录失败";
             Log.e("---login_-", data);
             JSONObject a = JSON.parseObject(data);
-            Log.e("------data", a.get("data") + "");
+            Log.e("------data",a.get("data")+"");
             LoginEntity loginEty = JSON.parseObject(a.get("data").toString(), LoginEntity.class);
             SpUtils.login(activity, loginEty.getToken());
             try {
                 MyDbManager.getInstance().saveOrUpdateUser(loginEty.getUser());
                 UserEntity userEntity = MyDbManager.getInstance().dbFindUser();
-                Log.e("------userEntity", userEntity.getNickname() + "|" + userEntity.getMobile() + "");
-                G.showToast(userEntity.getNickname() + "|" + userEntity.getMobile());
+                Log.e("------userEntity",userEntity.getNickname()+"|"+userEntity.getMobile()+"");
+                showToast(userEntity.getNickname()+"|"+userEntity.getMobile());
             } catch (DbException e) {
                 e.printStackTrace();
             }
@@ -312,7 +283,7 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
 //            Log.e("解密2--", XXTEA.bytes2HexStr(XXTEA.Encrypt(e1, XXTEA.KEY).getBytes("utf-8")));
 //            Log.e("解密3--", XXTEA.Decrypt(s1, XXTEA.KEY));
 //            Log.e("解密4--", XXTEA.Decrypt(s2, XXTEA.KEY));
-        } catch (Exception e) {
+        }catch (Exception e){
             e.printStackTrace();
         }
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/LieMakeMoneyAdp.java

@@ -185,7 +185,7 @@ public class LieMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
             public void onClick(View v) {
                 TaskEty taskEty = acceptedEty.getRelease_task().getTask();
                 taskEty.setRunTask(1);
-                taskEty.setRelease_task_id(acceptedEty.getRelease_task_id());
+//                taskEty.setRelease_task_id(acceptedEty.getRelease_task_id());
                 Jump2View.getInstance().goDialogActivityView(context, taskEty);
             }
         });

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

@@ -462,7 +462,7 @@
                 android:id="@+id/tv_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/share_qr_code"
+                android:text="@string/share_link"
                 android:layout_toRightOf="@id/iv_link"
                 style="@style/txt_style_15"
                 android:layout_marginLeft="5dp"

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

@@ -0,0 +1,29 @@
+<?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:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:layout_marginBottom="20dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_close_diaolog"
+        android:layout_gravity="right"
+        />
+
+     <ImageView
+         android:id="@+id/iv_qr"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="20dp"
+         android:layout_gravity="center"
+         />
+
+
+
+</LinearLayout>

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

@@ -14,28 +14,50 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
-        android:orientation="vertical"
-        android:background="@drawable/x_ll_bg"
+        android:layout_marginBottom="20dp"
         android:layout_marginTop="2dp"
         >
-      <TextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="通过连接即将成为好友"
-          android:textSize="@dimen/text_size_12"
-          android:layout_gravity="center_vertical"
-          />
         <TextView
+            android:id="@+id/tv_link"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="通过连接即将成为好友"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:textSize="@dimen/text_size_15"
-            android:textColor="@color/txt_black_404040"
-            android:layout_gravity="center_vertical"
+            android:textColor="@color/txt_black_9e9c9c"
+            android:layout_gravity="left"
+            android:lines="2"
             />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="通过连接加入小绵羊即可成为你的好友"
+            android:textSize="@dimen/text_size_15"
+            android:textColor="@color/txt_black_9e9c9c"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            />
+
+        <TextView
+            android:id="@+id/withdrawal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="160dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:text="复制链接"
+            android:textColor="@color/black_444444"
+            android:textSize="18dp"
+            android:background="@drawable/sp_bg_yellow"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:padding="7dp"/>
 
     </LinearLayout>
 </LinearLayout>

small_sheep_android.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>