完善个人资料，离开修改页面提示弹窗，完成领取弹窗

main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java

@@ -13,6 +13,8 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.BasePopupView;
+import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.sahooz.library.Country;
 import com.sahooz.library.CountryPicker;
 import com.sahooz.library.OnPick;
@@ -27,6 +29,7 @@ import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.event.UpdateFieldEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.ActivityResultCallback;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.interfaces.ImageResultCallback;
@@ -37,7 +40,9 @@ import com.yunbao.common.utils.ProcessImageUtil;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.CompleteInformationPopup;
 import com.yunbao.common.views.UpdateSexPopup;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
 import com.yunbao.main.event.EditProfileEvent;
 import com.yunbao.main.http.MainHttpConsts;
@@ -165,6 +170,108 @@ public class EditProfileActivity extends AbsActivity {
                 }
             });
         }
+        ViewClicksAntiShake.clicksAntiShake(submit, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                LiveNetManager.get(mContext).
+                        userInfoTask(new com.yunbao.common.http.base.HttpCallback<String>() {
+                            @Override
+                            public void onSuccess(String data) {
+                                ToastUtil.show(data);
+                            }
+
+                            @Override
+                            public void onError(String error) {
+                                ToastUtil.show(error);
+                            }
+                        });
+                new XPopup.Builder(mContext)
+                        .setPopupCallback(new XPopupCallback() {
+                            @Override
+                            public void onCreated(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public void beforeShow(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public void onShow(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public void onDismiss(BasePopupView popupView) {
+                                submit.setText(R.string.live_task_item_complete_true);
+                                submit.setBackgroundResource(R.mipmap.bg_submit_cancel);
+                                submit.setTextColor(Color.parseColor("#FFFFFF"));
+                            }
+
+                            @Override
+                            public void beforeDismiss(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public boolean onBackPressed(BasePopupView popupView) {
+                                return false;
+                            }
+
+                            @Override
+                            public void onKeyBoardStateChanged(BasePopupView popupView, int height) {
+
+                            }
+
+                            @Override
+                            public void onDrag(BasePopupView popupView, int value, float percent, boolean upOrLeft) {
+
+                            }
+
+                            @Override
+                            public void onClickOutside(BasePopupView popupView) {
+
+                            }
+                        })
+                        .asCustom(new CompleteInformationPopup(mContext, false,
+                                new CompleteInformationPopup.CompleteInformationCallBack() {
+                                    @Override
+                                    public void onCancel() {
+
+                                    }
+
+                                    @Override
+                                    public void onSure() {
+
+                                    }
+                                }))
+                        .show();
+            }
+        });
+    }
+
+
+    @Override
+    public void onBackPressed() {
+        if (userModel.getUserInfoComplete() ==1) {
+            finish();
+        } else {
+            new XPopup.Builder(mContext)
+                    .asCustom(new CompleteInformationPopup(mContext, true, new CompleteInformationPopup.CompleteInformationCallBack() {
+                        @Override
+                        public void onCancel() {
+
+                        }
+
+                        @Override
+                        public void onSure() {
+                            finish();
+                        }
+                    }))
+                    .show();
+        }
+
     }
 
     private void getTaskType() {
@@ -524,6 +631,7 @@ public class EditProfileActivity extends AbsActivity {
             viewProgress3.setBackgroundColor(Color.parseColor("#FFE5D0"));
             submit.setText(R.string.to_receive);
             submit.setTextColor(Color.parseColor("#935902"));
+            submit.setEnabled(true);
         }
         ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
         mName.setText(u.getUserNiceName());
@@ -546,6 +654,24 @@ public class EditProfileActivity extends AbsActivity {
             tv_bind_phone.setHint(getResources().getString(R.string.bind_phone_text));
             isBind = "0";
         }
+        if (u.getUserInfoComplete() == 1) {
+            submit.setText(R.string.live_task_item_complete_true);
+            submit.setBackgroundResource(R.mipmap.bg_submit_cancel);
+            submit.setTextColor(Color.parseColor("#FFFFFF"));
+            submit.setEnabled(false);
+        } else {
+            if (index<4){
+                submit.setText(R.string.to_complete);
+                submit.setBackgroundResource(R.mipmap.bg_submit);
+                submit.setTextColor(Color.parseColor("#FFFFFF"));
+                submit.setEnabled(false);
+            }else {
+                submit.setText(R.string.to_receive);
+                submit.setBackgroundResource(R.mipmap.bg_submit);
+                submit.setTextColor(Color.parseColor("#935902"));
+            }
+
+        }
     }
 
 

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -498,17 +498,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         //获取指导员账号
         ConversationIMListManager.get(this).getUserInstructor(this);
         checkVersion();
-        //是否完善个人资料
-        MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
-            @Override
-            public void callback(UserBean bean) {
-                if (!TextUtils.equals(bean.getUserInfoComplete(), "1")) {
-                    v_table_redpoint_me.setVisibility(View.VISIBLE);
-                } else {
-                    v_table_redpoint_me.setVisibility(View.GONE);
-                }
-            }
-        });
+
     }
 
     @Override
@@ -538,6 +528,30 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
             }
         }, 1000);
+
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //是否完善个人资料
+                MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
+                    @Override
+                    public void callback(UserBean bean) {
+                        if (bean.getUserInfoComplete() == 0) {
+                            v_table_redpoint_me.setVisibility(View.VISIBLE);
+                        } else {
+                            v_table_redpoint_me.setVisibility(View.GONE);
+                        }
+                    }
+                });
+
+            }
+        }, 1000);
+
     }
 
     /**

main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java

@@ -36,6 +36,7 @@ import com.yunbao.common.bean.GoogleBean;
 import com.yunbao.common.bean.LevelBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.bean.UserItemBean;
+import com.yunbao.common.event.CompleteInformationEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.CommonCallback;
@@ -68,6 +69,8 @@ import com.yunbao.main.adapter.MainMeAdapter;
 import com.yunbao.main.http.MainHttpConsts;
 import com.yunbao.main.http.MainHttpUtil;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -185,12 +188,12 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             }
         });
         redPoint.setVisibility(APKManager.get().getApkVerNew() ? View.GONE : View.VISIBLE);
-       ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete_information), new ViewClicksAntiShake.ViewClicksCallBack() {
-           @Override
-           public void onViewClicks() {
-               mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
-           }
-       });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete_information), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
+            }
+        });
     }
 
     @Override
@@ -421,13 +424,14 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         }
         Constants.myUid = u.getGoodnum();
         Constants.myAvatar = u.getAvatar();
-        if (TextUtils.equals(u.getUserInfoComplete(), "1")) {
+        if (u.getUserInfoComplete() == 1) {
             findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
             findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
         } else {
             findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
             findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
         }
+        EventBus.getDefault().post(new CompleteInformationEvent().setCompleteInformation(findViewById(R.id.complete_information).getVisibility() == View.VISIBLE));
     }
 
     @Override

main/src/main/res/layout/view_homemain.xml

@@ -130,7 +130,7 @@
                         android:layout_marginTop="2dp"
                         android:layout_marginEnd="20dp"
                         android:background="@drawable/background_ff5075"
-                        android:visibility="visible" />
+                        android:visibility="gone" />
                 </LinearLayout>
             </LinearLayout>