9 年之前 · c6adadca12
--- a/member/models.py
+++ b/member/models.py
@@ -13,6 +13,7 @@ from TimeConvert import TimeConvert as tc
 
                 from coupon.models import CouponInfo
              
 
                 from kodo.basemodels import BrandInfoMixin
              
 
                 from mch.models import ModelInfo
              
 
                +from account.models import LensmanInfo
              
 
                 from simditor.fields import RichTextField
              
 
                 from utils.qiniucdn import qiniu_file_url
              
 
                 
              
@@ -997,6 +998,12 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):
 
                     def admindata(self):
              
 
                         unlock_welfares = MemberActivityContributionWelfareUnlockingInfo.objects.filter(activity_id=self.activity_id, user_id=self.user_id)
              
 
                         unlock_welfares = [unlock_welfare.data for unlock_welfare in unlock_welfares]
              
 
                +        act = MemberActivityInfo.objects.get(activity_id=self.activity_id, status=True)
              
 
                +
              
 
                +        if act.activity_type == 4:
              
 
                +            user_name = LensmanInfo.objects.get(user_id=self.user_id, status=True).name
              
 
                +        else:
              
 
                +            user_name = self.user_name
              
 
                         return {
              
 
                             'contribution_id': self.contribution_id,
              
 
                             'brand_id': self.brand_id,
              
@@ -1007,7 +1014,7 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):
 
                             'content_type': self.content_type,
              
 
                             'title': self.title,
              
 
                             'content': self.content,
              
 
                -            'user_name': self.user_name,
              
 
                +            'user_name': user_name,
              
 
                             'user_avatar': self.final_user_avatar,
              
 
                             'images': self.final_images,
              
 
                             'video_url': self.video_url or '',
              
--- a/app/src/main/java/ai/pai/lensman/login/LoginActivity.java
+++ b/app/src/main/java/ai/pai/lensman/login/LoginActivity.java
@@ -11,6 +11,7 @@ import com.android.views.progressbar.ProgressWheel;
 
                 
              
 
                 import ai.pai.lensman.R;
              
 
                 import ai.pai.lensman.base.BaseActivity;
              
 
                +import ai.pai.lensman.db.Preferences;
              
 
                 import ai.pai.lensman.upload.UploadActivity;
              
 
                 import butterknife.BindView;
              
 
                 import butterknife.ButterKnife;
              
@@ -29,7 +30,7 @@ public class LoginActivity extends BaseActivity implements LoginContract.View{
 
                         super.onCreate(savedInstanceState);
              
 
                         setContentView(R.layout.activity_login);
              
 
                         ButterKnife.bind(this);
              
 
                -        presenter = new LoginPresenter(this);
              
 
                +        presenter = new LoginPresenter(this,this);
              
 
                     }
              
 
                 
              
 
                 
              
--- a/app/src/main/java/ai/pai/lensman/login/LoginInteractor.java
+++ b/app/src/main/java/ai/pai/lensman/login/LoginInteractor.java
@@ -4,6 +4,8 @@ import android.os.AsyncTask;
 
                 
              
 
                 import com.android.common.executors.ThreadExecutor;
              
 
                 
              
 
                +import org.json.JSONObject;
              
 
                +
              
 
                 import java.util.HashMap;
              
 
                 
              
 
                 import ai.pai.lensman.base.BaseInteractor;
              
@@ -30,26 +32,41 @@ public class LoginInteractor implements BaseInteractor{
 
                     public void startJob() {
              
 
                         cancelJob();
              
 
                         HashMap<String,String> params = new HashMap<>();
              
 
                -        params.put("account",userName);
              
 
                +        params.put("username",userName);
              
 
                         params.put("password",password);
              
 
                 
              
 
                         loginTask = new HttpPostTask(params){
              
 
                 
              
 
                +            String lensmanId;
              
 
                +            String message;
              
 
                             @Override
              
 
                             protected boolean parseResponse(String response) {
              
 
                -                return super.parseResponse(response);
              
 
                +                try{
              
 
                +                    JSONObject json = new JSONObject(response);
              
 
                +                    int status = json.getInt("status");
              
 
                +                    if(status == 200){
              
 
                +                        JSONObject info = json.getJSONObject("data");
              
 
                +                        lensmanId = info.getString("user_id");
              
 
                +                        return true;
              
 
                +                    }else{
              
 
                +                        message = json.getString("message");
              
 
                +                    }
              
 
                +                }catch (Exception e){
              
 
                +                    e.printStackTrace();
              
 
                +                }
              
 
                +                return false;
              
 
                             }
              
 
                 
              
 
                             @Override
              
 
                             protected void onPostFail() {
              
 
                                 super.onPostFail();
              
 
                -                listener.onInteractFail("");
              
 
                +                listener.onInteractFail(message);
              
 
                             }
              
 
                 
              
 
                             @Override
              
 
                             protected void onPostSuccess() {
              
 
                                 super.onPostSuccess();
              
 
                -                listener.onInteractSuccess("");
              
 
                +                listener.onInteractSuccess(lensmanId);
              
 
                             }
              
 
                         };
              
 
                         loginTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.LOGIN_URL);
              
--- a/app/src/main/java/ai/pai/lensman/login/LoginPresenter.java
+++ b/app/src/main/java/ai/pai/lensman/login/LoginPresenter.java
@@ -1,17 +1,22 @@
 
                 package ai.pai.lensman.login;
              
 
                 
              
 
                +import android.content.Context;
              
 
                +
              
 
                 import ai.pai.lensman.base.BaseInteractor;
              
 
                +import ai.pai.lensman.db.Preferences;
              
 
                 
              
 
                 /**
              
 
                  * Created by chengzhenyu on 2016/8/11.
              
 
                  */
              
 
                 public class LoginPresenter implements LoginContract.Presenter,BaseInteractor.InteractorListener<String> {
              
 
                 
              
 
                +    private Context context;
              
 
                     private LoginContract.View view;
              
 
                     private LoginInteractor interactor;
              
 
                 
              
 
                -    public LoginPresenter(LoginContract.View view){
              
 
                +    public LoginPresenter(Context context,LoginContract.View view){
              
 
                         this.view = view;
              
 
                +        this.context = context;
              
 
                     }
              
 
                 
              
 
                     @Override
              
@@ -37,6 +42,8 @@ public class LoginPresenter implements LoginContract.Presenter,BaseInteractor.In
 
                     @Override
              
 
                     public void onInteractSuccess(String result) {
              
 
                         view.hideProgressView();
              
 
                +        Preferences.getInstance(context).setLensManId(result);
              
 
                +        view.jumpMain();
              
 
                     }
              
 
                 
              
 
                     @Override
              
@@ -44,4 +51,5 @@ public class LoginPresenter implements LoginContract.Presenter,BaseInteractor.In
 
                         view.hideProgressView();
              
 
                         view.showLoginHint(errorMsg);
              
 
                     }
              
 
                +
              
 
                 }