增加个人资料

annotation_lib/src/main/java/com/app/annotation/apt/InstanceFactory.java

@@ -14,7 +14,7 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.SOURCE)
 @Retention(RetentionPolicy.SOURCE)
 @Target(ElementType.TYPE)
 @Target(ElementType.TYPE)
 /**
 /**
- * 实例化注解,会被主动添加到实例化工厂,自动生成new来替换掉反射的newInstance代码
+ * 实例化注解,会被主动添加到实例化工厂,自动生成newInstance代码
  */
  */
 public @interface InstanceFactory {
 public @interface InstanceFactory {
 }
 }

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -174,4 +174,6 @@ public class Constants {
 
 
     public final static String PICURL = "pic_url";
     public final static String PICURL = "pic_url";
     public final static String ENGINEERINFO = "engineer_info";
     public final static String ENGINEERINFO = "engineer_info";
+
+
 }
 }

app/src/main/java/com/dayu/bigfish/api/ServerException.java

@@ -105,6 +105,12 @@ public class ServerException extends Exception {
             case "GLOBAL0102":
             case "GLOBAL0102":
                 message = "未知错误GLOBAL0102";   // unknowable error type
                 message = "未知错误GLOBAL0102";   // unknowable error type
                 break;
                 break;
+            case "GLOBAL0103":
+                message = "验证码失败";
+                break;
+            case "GLOBAL0104":
+                message = "用户名和密码错误";
+                break;
             case "GLOBAL0400":
             case "GLOBAL0400":
                 message = "未知错误GLOBAL0400";   //Bad Request!
                 message = "未知错误GLOBAL0400";   //Bad Request!
                 break;
                 break;
@@ -114,6 +120,9 @@ public class ServerException extends Exception {
             case "GLOBAL0405":
             case "GLOBAL0405":
                 message = "未知错误GLOBAL0405";   //Method Not Allowed
                 message = "未知错误GLOBAL0405";   //Method Not Allowed
                 break;
                 break;
+            case "GLOBAL0500":
+                message = "未知错误GLOBAL0500";   //Method Not Allowed
+                break;
             case "GLOBAL1001":
             case "GLOBAL1001":
                 message = "未知错误GLOBAL1001";   //空指针异常
                 message = "未知错误GLOBAL1001";   //空指针异常
                 break;
                 break;

app/src/main/java/com/dayu/bigfish/bean/UserInfo.java

 package com.dayu.bigfish.bean;
 package com.dayu.bigfish.bean;
 
 
+import android.databinding.BaseObservable;
+import android.databinding.Bindable;
+
+import com.dayu.bigfish.BR;
+
 /**
 /**
  * 储存用户信息的类
  * 储存用户信息的类
  *
  *
@@ -7,7 +12,7 @@ package com.dayu.bigfish.bean;
  *         on 2017/8/28.
  *         on 2017/8/28.
  */
  */
 
 
-public class UserInfo {
+public class UserInfo extends BaseObservable{
     /**
     /**
      * 工程师账户id
      * 工程师账户id
      */
      */
@@ -70,12 +75,14 @@ public class UserInfo {
         this.accessToken = accessToken;
         this.accessToken = accessToken;
     }
     }
 
 
+    @Bindable
     public String getHeaderImg() {
     public String getHeaderImg() {
         return headerImg;
         return headerImg;
     }
     }
 
 
     public void setHeaderImg(String headerImg) {
     public void setHeaderImg(String headerImg) {
         this.headerImg = headerImg;
         this.headerImg = headerImg;
+        notifyPropertyChanged(BR.headerImg);
     }
     }
 
 
     public String getToken() {
     public String getToken() {
@@ -93,4 +100,5 @@ public class UserInfo {
     public void setStatus(int status) {
     public void setStatus(int status) {
         this.status = status;
         this.status = status;
     }
     }
+
 }
 }

app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java

 package com.dayu.bigfish.presenter.homefourtab;
 package com.dayu.bigfish.presenter.homefourtab;
 
 
+import android.databinding.ObservableField;
+
 import com.app.annotation.apt.InstanceFactory;
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.bean.AlipayInfo;
 import com.dayu.bigfish.bean.AlipayInfo;
@@ -17,6 +19,7 @@ import io.reactivex.functions.Consumer;
  */
  */
 @InstanceFactory
 @InstanceFactory
 public class HomePersonPresenter extends HomeFourContract.Presenter {
 public class HomePersonPresenter extends HomeFourContract.Presenter {
+    public ObservableField<String> mUrl = new ObservableField<>();
 
 
     @Override
     @Override
     public void onAttached() {
     public void onAttached() {

app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java

@@ -114,7 +114,6 @@ public class LoginPresenter extends LoginContract.Presenter {
             if (confirm) {
             if (confirm) {
                 startActivity(PersonInfoActivity.class);
                 startActivity(PersonInfoActivity.class);
             }
             }
-            dialog.dismiss();
         });
         });
     }
     }
 
 

app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonContract.java

@@ -29,7 +29,5 @@ public interface ModifyPersonContract {
         public abstract void uploadPic(String path);
         public abstract void uploadPic(String path);
 
 
         public abstract void modifyUserInfo(String realName, String identity, String identityUrl);
         public abstract void modifyUserInfo(String realName, String identity, String identityUrl);
-
-
     }
     }
 }
 }

app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java

@@ -73,7 +73,6 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
                     modifyUserInfo(mRealName.get(), mIdentity.get(), mIdentityUrl.get());
                     modifyUserInfo(mRealName.get(), mIdentity.get(), mIdentityUrl.get());
                 }
                 }
             }
             }
-            dialog.dismiss();
         });
         });
     }
     }
 
 

app/src/main/java/com/dayu/bigfish/ui/ModifyPersonInfoActivity.java

@@ -61,7 +61,7 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter
                 .synOrAsy(true)//同步true或异步false 压缩 默认同步、
                 .synOrAsy(true)//同步true或异步false 压缩 默认同步、
                 .enableCrop(true)//是否裁剪
                 .enableCrop(true)//是否裁剪
                 .withAspectRatio(1, 1)
                 .withAspectRatio(1, 1)
-                .freeStyleCropEnabled(true);
+                .freeStyleCropEnabled(false);
         selector.forResult(PictureConfig.CHOOSE_REQUEST);
         selector.forResult(PictureConfig.CHOOSE_REQUEST);
     }
     }
 
 

app/src/main/java/com/dayu/bigfish/ui/MyHeaderIvActivity.java

@@ -16,7 +16,6 @@ import com.luck.picture.lib.config.PictureMimeType;
 import com.luck.picture.lib.entity.LocalMedia;
 import com.luck.picture.lib.entity.LocalMedia;
 
 
 import java.io.File;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -25,8 +24,6 @@ import java.util.List;
 
 
 public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderActivityBinding> implements MyHeadContract.View {
 public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderActivityBinding> implements MyHeadContract.View {
 
 
-    private List<LocalMedia> mSelectList;
-
     @Override
     @Override
     public int getLayoutId() {
     public int getLayoutId() {
         return R.layout.my_header_activity;
         return R.layout.my_header_activity;
@@ -34,11 +31,11 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
 
 
     @Override
     @Override
     public void initView() {
     public void initView() {
-        mSelectList = new ArrayList<>();
         mBind.tvRightTitle.setOnClickListener(v -> showPicDialog());
         mBind.tvRightTitle.setOnClickListener(v -> showPicDialog());
         mBind.titleBack.setOnClickListener(v -> dumpBack());
         mBind.titleBack.setOnClickListener(v -> dumpBack());
     }
     }
 
 
+    @Override
     public void showPicDialog() {
     public void showPicDialog() {
         PictureSelectionModel selector = PictureSelector.create(mActivity)
         PictureSelectionModel selector = PictureSelector.create(mActivity)
                 .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
                 .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
@@ -59,7 +56,7 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
                 .synOrAsy(true)//同步true或异步false 压缩 默认同步、
                 .synOrAsy(true)//同步true或异步false 压缩 默认同步、
                 .enableCrop(true)//是否裁剪
                 .enableCrop(true)//是否裁剪
                 .withAspectRatio(1, 1)
                 .withAspectRatio(1, 1)
-                .freeStyleCropEnabled(true);
+                .freeStyleCropEnabled(false);
         selector.forResult(PictureConfig.CHOOSE_REQUEST);
         selector.forResult(PictureConfig.CHOOSE_REQUEST);
     }
     }
 
 
@@ -90,7 +87,7 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
         if (resultCode == RESULT_OK) {
         if (resultCode == RESULT_OK) {
             switch (requestCode) {
             switch (requestCode) {
                 case PictureConfig.CHOOSE_REQUEST:
                 case PictureConfig.CHOOSE_REQUEST:
-                    mSelectList = PictureSelector.obtainMultipleResult(data);
+                    List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
                     if (mSelectList != null) {
                     if (mSelectList != null) {
                         for (int a = 0; a < mSelectList.size(); a++) {
                         for (int a = 0; a < mSelectList.size(); a++) {
                             mPresenter.uploadPic(mSelectList.get(a).getCutPath());
                             mPresenter.uploadPic(mSelectList.get(a).getCutPath());

app/src/main/java/com/dayu/bigfish/ui/PersonInfoActivity.java

@@ -18,7 +18,6 @@ public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, Activi
 
 
     @Override
     @Override
     public void initView() {
     public void initView() {
-
     }
     }
 
 
     @Override
     @Override

app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java

@@ -55,7 +55,13 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
         UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
         UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
         userId = Integer.parseInt(userInfo.getAccountId());
         userId = Integer.parseInt(userInfo.getAccountId());
         siteId = Integer.parseInt(userInfo.getSiteId());
         siteId = Integer.parseInt(userInfo.getSiteId());
-        mBind.setImgurl(userInfo.getHeaderImg());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        UserInfo userInfo = UserManager.getInstance().getUser(mActivity);
+        mPresenter.mUrl.set(userInfo.getHeaderImg());
     }
     }
 
 
     @Override
     @Override
@@ -235,5 +241,4 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
         }
         }
 
 
     }
     }
-
 }
 }

app/src/main/java/com/dayu/bigfish/ui/views/CustomDialog.java

@@ -122,6 +122,7 @@ public class CustomDialog extends Dialog implements View.OnClickListener {
                 if (listener != null) {
                 if (listener != null) {
                     listener.onClick(this, true);
                     listener.onClick(this, true);
                 }
                 }
+                this.dismiss();
                 break;
                 break;
         }
         }
     }
     }

app/src/main/java/com/dayu/bigfish/utils/ProgressUtil.java

@@ -132,7 +132,6 @@ public class ProgressUtil {
      */
      */
     public static void startLoad(Context activity, String msg) {
     public static void startLoad(Context activity, String msg) {
         context = activity;
         context = activity;
-//            mContext = ActivityManager.newInstance().currentActivity();// 获取当前的activity的上下文
         if (context == null) {
         if (context == null) {
             return;
             return;
         }
         }
@@ -154,7 +153,6 @@ public class ProgressUtil {
      */
      */
     public static void startLoad(Context activity) {
     public static void startLoad(Context activity) {
         context = activity;
         context = activity;
-//            mContext = ActivityManager.newInstance().currentActivity();// 获取当前的activity的上下文
         if (context == null) {
         if (context == null) {
             return;
             return;
         }
         }

app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java

@@ -60,9 +60,8 @@ public class UserManager {
         UserInfo userInfo = getUser(context);
         UserInfo userInfo = getUser(context);
         if (userInfo != null) {
         if (userInfo != null) {
             //有数据
             //有数据
-            if ((!TextUtils.isEmpty(userInfo.getAccountId())) && (!TextUtils.isEmpty(userInfo.getSiteId()))
-                    && (!TextUtils.isEmpty(userInfo.getHxAccount()) && (!TextUtils.isEmpty(userInfo.getHxPwd()))
-                    && userInfo.getStatus() == 1)) {
+            if ((!TextUtils.isEmpty(userInfo.getAccountId())) && !TextUtils.isEmpty(userInfo.getSiteId())
+                    && userInfo.getStatus() == 1) {
                 return true;
                 return true;
             } else {
             } else {
                 return false;
                 return false;

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

@@ -3,6 +3,8 @@
 
 
     <data>
     <data>
 
 
+        <import type="android.view.View" />
+
         <variable
         <variable
             name="presenter"
             name="presenter"
             type="com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter" />
             type="com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter" />
@@ -49,6 +51,7 @@
             android:layout_height="70dp"
             android:layout_height="70dp"
             android:background="@color/white"
             android:background="@color/white"
             android:gravity="center_vertical"
             android:gravity="center_vertical"
+            android:onClick="@{()->presenter.dumpToHeader()}"
             android:orientation="horizontal">
             android:orientation="horizontal">
 
 
             <TextView
             <TextView
@@ -66,7 +69,6 @@
                 android:layout_height="50dp"
                 android:layout_height="50dp"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="10dp"
                 android:layout_marginLeft="10dp"
-                android:onClick="@{()->presenter.dumpToHeader()}"
                 android:src="@mipmap/user"
                 android:src="@mipmap/user"
                 app:border_color="@color/cl_home_circleimageview_bg"
                 app:border_color="@color/cl_home_circleimageview_bg"
                 app:border_width="@dimen/size_home_circleimageview_border" />
                 app:border_width="@dimen/size_home_circleimageview_border" />
@@ -130,7 +132,7 @@
                 android:id="@+id/tv_audite"
                 android:id="@+id/tv_audite"
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginRight="15dp"
                 android:text='@{presenter.info.aduitStatus == 3?@string/identity_unaudite:@string/identity_audited}'
                 android:text='@{presenter.info.aduitStatus == 3?@string/identity_unaudite:@string/identity_audited}'
                 android:textSize="15sp" />
                 android:textSize="15sp" />
 
 
@@ -138,7 +140,8 @@
                 android:layout_width="15dp"
                 android:layout_width="15dp"
                 android:layout_height="15dp"
                 android:layout_height="15dp"
                 android:layout_marginRight="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
-                android:src="@mipmap/icon_arrow_right" />
+                android:src="@mipmap/icon_arrow_right"
+                android:visibility="@{presenter.info.aduitStatus == 3?View.VISIBLE:View.GONE}" />
         </LinearLayout>
         </LinearLayout>
 
 
     </LinearLayout>
     </LinearLayout>

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

@@ -6,10 +6,6 @@
         <variable
         <variable
             name="presenter"
             name="presenter"
             type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter" />
             type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter" />
-
-        <variable
-            name="imgurl"
-            type="String" />
     </data>
     </data>
 
 
     <RelativeLayout
     <RelativeLayout
@@ -53,16 +49,15 @@
                 android:src="@mipmap/person_title_view" />
                 android:src="@mipmap/person_title_view" />
 
 
 
 
-            <com.dayu.bigfish.ui.views.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+            <com.dayu.bigfish.ui.views.CircleImageView
                 android:id="@+id/iv_header"
                 android:id="@+id/iv_header"
-                imageUrl="@{imgurl}"
+                imageUrl="@{presenter.mUrl}"
                 android:layout_width="86dp"
                 android:layout_width="86dp"
                 android:layout_height="86dp"
                 android:layout_height="86dp"
                 android:layout_centerHorizontal="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="83.3dp"
                 android:layout_marginTop="83.3dp"
                 android:onClick="@{()->presenter.dumpToPersonalInfo()}"
                 android:onClick="@{()->presenter.dumpToPersonalInfo()}"
-                android:src="@mipmap/user"
-                />
+                android:src="@mipmap/user" />
 
 
             <ImageView
             <ImageView
                 android:layout_width="73dp"
                 android:layout_width="73dp"