优化流程 完成引导页 修复认证状态切换的bug

app/src/main/AndroidManifest.xml

@@ -97,6 +97,9 @@
             android:name=".ui.activity.LoginActivity"
             android:screenOrientation="portrait" />
         <activity
+            android:name=".ui.activity.GuideActivity"
+            android:screenOrientation="portrait" />
+        <activity
             android:name=".ui.activity.StartActivity"
             android:screenOrientation="portrait">
             <intent-filter>

app/src/main/java/com/webrain/dailypay/ui/activity/GuideActivity.java

@@ -4,11 +4,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.view.View;
-import android.widget.TextView;
-
+import android.widget.Button;
 
 import com.webrain.dailypay.AppCacheManager;
 import com.webrain.dailypay.R;
+import com.webrain.dailypay.ui.adapter.viewpager.GuidePageAdapter;
 import com.webrain.dailypay.ui.base.BaseActivity;
 import com.webrain.dailypay.ui.base.IPresenter;
 
@@ -22,16 +22,14 @@ import butterknife.OnPageChange;
 public class GuideActivity extends BaseActivity {
     @BindView(R.id.vp_guide)
     ViewPager vpGuide;
-    @BindView(R.id.tv_jump)
-    TextView tvJump;
-    @BindView(R.id.tv_next)
-    TextView tvNext;
     @BindView(R.id.v_1)
     View v1;
     @BindView(R.id.v_2)
     View v2;
     @BindView(R.id.v_3)
     View v3;
+    @BindView(R.id.btn_jump)
+    Button btnJump;
 
     @Override
     public int getLayoutId() {
@@ -60,23 +58,16 @@ public class GuideActivity extends BaseActivity {
     }
 
     private void initView() {
-//        vpGuide.setAdapter(new GuidePageAdapter(mContext));
+        vpGuide.setAdapter(new GuidePageAdapter(mContext));
         initPageStrip();
     }
 
-    @OnClick({R.id.tv_jump, R.id.tv_next})
+    @OnClick({R.id.btn_jump})
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_jump:
+            case R.id.btn_jump:
                 goJump();
                 break;
-            case R.id.tv_next:
-                if (vpGuide.getCurrentItem() < 2) {
-                    vpGuide.setCurrentItem(vpGuide.getCurrentItem() + 1);
-                } else {
-                    goJump();
-                }
-                break;
         }
     }
 

app/src/main/java/com/webrain/dailypay/ui/activity/MainActivity.java

@@ -12,9 +12,6 @@ import com.webrain.baselibrary.widget.TouchViewPager;
 import com.webrain.dailypay.R;
 import com.webrain.dailypay.bean.TabItemBean;
 import com.webrain.dailypay.event.StringEvent;
-import com.webrain.dailypay.ui.activity.identity.IdentityCompanyActivity;
-import com.webrain.dailypay.ui.activity.identity.IdentityHeadActivity;
-import com.webrain.dailypay.ui.activity.identity.IdentityRecruitersActivity;
 import com.webrain.dailypay.ui.activity.position.PositionReleaseActivity;
 import com.webrain.dailypay.ui.adapter.viewpager.FragmentPageTabAdapter;
 import com.webrain.dailypay.ui.base.BaseActivity;
@@ -49,6 +46,8 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
     TouchViewPager vpContent;
     @BindView(R.id.cv_release)
     CardView cvRelease;
+    @BindView(R.id.v_release)
+    View vRelease;
 
     private FragmentPageTabAdapter mAdapter;
 
@@ -152,8 +151,10 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
     public void onUserAuthentication(int authentication) {
         if (authentication == AppConstant.APPROVE_SUCCESS) {
             cvRelease.setEnabled(true);
+            vRelease.setEnabled(true);
         } else {
             cvRelease.setEnabled(false);
+            vRelease.setEnabled(false);
         }
     }
 }

app/src/main/java/com/webrain/dailypay/ui/activity/StartActivity.java

@@ -78,8 +78,7 @@ public class StartActivity extends BaseActivity {
                 startActivity(new Intent(mContext, MainActivity.class));
             } else {
                 if (SharedPreferencesUtils.isHistoryFirstLogin(mContext)) {
-//                    startActivity(new Intent(mContext, GuideActivity.class));
-                    startActivity(new Intent(mContext, LoginActivity.class));
+                    startActivity(new Intent(mContext, GuideActivity.class));
                 } else {
                     startActivity(new Intent(mContext, LoginActivity.class));
                 }

app/src/main/java/com/webrain/dailypay/ui/adapter/listview/ResumeAdapter.java

@@ -77,7 +77,7 @@ public class ResumeAdapter extends BaseAdapter implements AdapterView.OnItemClic
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        if (position == 0 && position > getCount())
+        if (position == 0 || position > getCount())
             return;
         Intent intent = new Intent(mContext, ResumeDetailActivity.class);
         intent.putExtra(IntentConstant.BEAN, getItem(position - 1));

app/src/main/java/com/webrain/dailypay/ui/adapter/viewpager/GuidePageAdapter.java

@@ -0,0 +1,52 @@
+package com.webrain.dailypay.ui.adapter.viewpager;
+
+import android.content.Context;
+import android.support.v4.view.PagerAdapter;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+
+import com.webrain.dailypay.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GuidePageAdapter extends PagerAdapter {
+    List<ImageView> viewList;
+
+    public GuidePageAdapter(Context context) {
+        viewList = new ArrayList<>();
+        ImageView imageView1 = new ImageView(context);
+        imageView1.setImageResource(R.mipmap.ic_guide_1);
+        ImageView imageView2 = new ImageView(context);
+        imageView2.setImageResource(R.mipmap.ic_guide_2);
+        ImageView imageView3 = new ImageView(context);
+        imageView3.setImageResource(R.mipmap.ic_guide_3);
+        viewList.add(imageView1);
+        viewList.add(imageView2);
+        viewList.add(imageView3);
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {//当前滑动到的ViewPager页面
+        View view = viewList.get(position);
+        container.addView(view);
+        return view;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {//每次划出当前页面的时候就销毁
+        container.removeView(viewList.get(position));
+    }
+
+    @Override
+    public int getCount() {//设置ViewPager有几个滑动页面
+        return viewList.size();
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view == object;//官方固定写法
+    }
+}

app/src/main/java/com/webrain/dailypay/ui/fragment/MeFragment.java

@@ -139,7 +139,7 @@ public class MeFragment extends BaseFragment<MeFragmentPresenter> implements MeF
             } else {
                 tvState.setVisibility(View.GONE);
                 tvName.setText(!TextUtils.isEmpty(userBean.getPhone()) ? userBean.getPhone() : "");
-                ImageLoaderUtil.getInstance().loadCircleImage(userBean.getHeadImgUrl(), R.mipmap.ic_default_header, ivHeader);
+                ImageLoaderUtil.getInstance().loadCircleImage(R.mipmap.ic_default_header, ivHeader);
                 tvDesc.setText(R.string.no_real_authentication_click);
             }
         }

app/src/main/java/com/webrain/dailypay/ui/fragment/PositionFragment.java

@@ -76,6 +76,7 @@ public class PositionFragment extends BaseFragment<PositionFragmentPresenter> im
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = super.onCreateView(inflater, container, savedInstanceState);
+        EventBus.getDefault().register(this);
         setLoadingVisible(true);
         rgState.setOnCheckedChangeListener(onCheckedChangeListener);
         prlRefresh.setOnRefreshListener(onRefreshListener);
@@ -141,17 +142,22 @@ public class PositionFragment extends BaseFragment<PositionFragmentPresenter> im
      */
     @Override
     public void onNoRealAuthentication(int state) {
-        setLoadingVisible(false);
-        if (mHolder == null) {
-            mHolder = new RealAuthenticationHolder(mContext);
-            llAuthentication.addView(mHolder.getView());
-            llAuthentication.setVisibility(View.VISIBLE);
-        }
-        if (state == AppConstant.APPROVE_NONE || state == AppConstant.APPROVE_FAIL) {
-            mHolder.initAuthenticationState();
+        if (state == AppConstant.APPROVE_SUCCESS) {
+            llAuthentication.setVisibility(View.GONE);
         } else {
-            mHolder.initGoingAuthenticationState();
+            setLoadingVisible(false);
+            if (mHolder == null) {
+                mHolder = new RealAuthenticationHolder(mContext);
+                llAuthentication.addView(mHolder.getView());
+                llAuthentication.setVisibility(View.VISIBLE);
+            }
+            if (state == AppConstant.APPROVE_NONE || state == AppConstant.APPROVE_FAIL) {
+                mHolder.initAuthenticationState();
+            } else {
+                mHolder.initGoingAuthenticationState();
+            }
         }
+
     }
 
     @Subscribe

app/src/main/java/com/webrain/dailypay/ui/fragment/ResumeFragment.java

@@ -186,16 +186,20 @@ public class ResumeFragment extends BaseFragment<ResumeFragmentPresenter> implem
      */
     @Override
     public void onNoRealAuthentication(int state) {
-        setLoadingVisible(false);
-        if (mHolder == null) {
-            mHolder = new RealAuthenticationHolder(mContext);
-            llAuthentication.addView(mHolder.getView());
-            llAuthentication.setVisibility(View.VISIBLE);
-        }
-        if (state == AppConstant.APPROVE_NONE || state == AppConstant.APPROVE_FAIL) {
-            mHolder.initAuthenticationState();
+        if (state == AppConstant.APPROVE_SUCCESS) {
+            llAuthentication.setVisibility(View.GONE);
         } else {
-            mHolder.initGoingAuthenticationState();
+            setLoadingVisible(false);
+            if (mHolder == null) {
+                mHolder = new RealAuthenticationHolder(mContext);
+                llAuthentication.addView(mHolder.getView());
+                llAuthentication.setVisibility(View.VISIBLE);
+            }
+            if (state == AppConstant.APPROVE_NONE || state == AppConstant.APPROVE_FAIL) {
+                mHolder.initAuthenticationState();
+            } else {
+                mHolder.initGoingAuthenticationState();
+            }
         }
     }
 

app/src/main/java/com/webrain/dailypay/ui/mvp/presenter/MeFragmentPresenter.java

@@ -11,6 +11,7 @@ import com.webrain.dailypay.R;
 import com.webrain.dailypay.bean.CompanyBean;
 import com.webrain.dailypay.bean.UserBean;
 import com.webrain.dailypay.callback.MvpDataCallBack;
+import com.webrain.dailypay.event.StringEvent;
 import com.webrain.dailypay.ui.activity.identity.IdentityCompanyActivity;
 import com.webrain.dailypay.ui.activity.identity.IdentityRecruitersActivity;
 import com.webrain.dailypay.ui.activity.identity.IdentityResultActivity;
@@ -52,8 +53,8 @@ public class MeFragmentPresenter extends BasePresenter<MeFragment> implements Me
                 @Override
                 public void onData(Boolean data) {
                     if (isViewAttach()) {
-                        EventBus.getDefault().post(EventConstant.EVENT_USER_AUTHENTICATION_STATUS_CHANGE);
-                        EventBus.getDefault().post(EventConstant.EVENT_COMPANY_AUTHENTICATION_STATUS_CHANGE);
+                        EventBus.getDefault().post(new StringEvent(EventConstant.EVENT_USER_AUTHENTICATION_STATUS_CHANGE));
+                        EventBus.getDefault().post(new StringEvent(EventConstant.EVENT_COMPANY_AUTHENTICATION_STATUS_CHANGE));
                         if (isQueryUserState) {
                             if (AppCacheManager.getInstance().getLoginModel().getAuthenticationStatus() == AppConstant.APPROVE_SUCCESS) {//认证成功状态，提示认证成功
                                 ToastUtils.show(mvpReference.get().getContext(), R.string.toast_yes_authentication);

app/src/main/java/com/webrain/dailypay/ui/mvp/presenter/ResumeFragmentPresenter.java

@@ -72,6 +72,7 @@ public class ResumeFragmentPresenter extends BasePresenter<ResumeFragment> imple
                 if (AppCacheManager.getInstance().getLoginModel().getAuthenticationStatus() != AppConstant.APPROVE_SUCCESS) {
                     mvpReference.get().onNoRealAuthentication(AppCacheManager.getInstance().getLoginModel().getAuthenticationStatus());
                 } else {
+                    mvpReference.get().onNoRealAuthentication(AppCacheManager.getInstance().getLoginModel().getAuthenticationStatus());
                     if (!mResumeFragmentModel.isInit())
                         getHttpPositionList(false, false, true);
                 }

app/src/main/res/drawable/corners_guide_banner_type.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/corners_purple_4dp" android:state_pressed="true" />
+    <item android:drawable="@drawable/corners_purple_4dp" android:state_checked="true" />
+    <item android:drawable="@drawable/corners_purple_4dp" android:state_selected="true" />
+    <item android:drawable="@drawable/corners_stork_purple_4dp" android:state_enabled="false" />
+    <item android:drawable="@drawable/corners_stork_purple_4dp" />
+</selector>

app/src/main/res/drawable/corners_purple_4dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--圆角半径-->
+    <corners android:radius="16dp" />
+    <solid
+        android:color="@color/text_purple"/>
+</shape>

app/src/main/res/drawable/corners_stork_gray_11.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--圆角半径-->
+    <corners android:radius="11dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/edit_input_gray" />
+</shape>

app/src/main/res/drawable/corners_stork_purple_4dp.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--圆角半径-->
+    <corners android:radius="4dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/text_purple" />
+</shape>

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

@@ -10,64 +10,47 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <RelativeLayout
+
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="48dp"
-        android:paddingLeft="35dp"
-        android:paddingRight="35dp">
-
-        <TextView
-            android:id="@+id/tv_jump"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:textSize="@dimen/px39_13sp" />
-            <!--android:text="@string/jump"-->
-            <!--android:textColor="@color/text_dark_gray2"-->
-
-
-        <TextView
-            android:id="@+id/tv_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:padding="10dp"
-            android:text="@string/next"
-            android:textSize="@dimen/px39_13sp" />
-            <!--android:textColor="@color/text_blue"-->
-
-
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="horizontal">
-
-            <View
-                android:id="@+id/v_1"
-                android:layout_width="6dp"
-                android:layout_height="6dp"  />
-                <!--android:background="@drawable/corners_guide_banner_type"-->
-
-
-            <View
-                android:id="@+id/v_2"
-                android:layout_width="6dp"
-                android:layout_height="6dp"
-                android:layout_marginLeft="11dp"  />
-                <!--android:background="@drawable/corners_guide_banner_type"-->
-
-            <View
-                android:id="@+id/v_3"
-                android:layout_width="6dp"
-                android:layout_height="6dp"
-                android:layout_marginLeft="11dp"  />
-                <!--android:background="@drawable/corners_guide_banner_type"-->
-
-        </LinearLayout>
-    </RelativeLayout>
-
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="68dp"
+        android:orientation="horizontal">
+
+        <View
+            android:id="@+id/v_1"
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:background="@drawable/corners_guide_banner_type" />
+
+
+        <View
+            android:id="@+id/v_2"
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:layout_marginLeft="11dp"
+            android:background="@drawable/corners_guide_banner_type" />
+
+        <View
+            android:id="@+id/v_3"
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:layout_marginLeft="11dp"
+            android:background="@drawable/corners_guide_banner_type" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_jump"
+        android:layout_width="49dp"
+        android:layout_height="22dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="44dp"
+        android:layout_marginRight="24dp"
+        android:background="@drawable/corners_stork_gray_11"
+        android:text="@string/jump"
+        android:textColor="@color/edit_input_gray"
+        android:textSize="@dimen/px36_12sp" />
 </RelativeLayout>

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

@@ -72,6 +72,7 @@
                     android:layout_marginTop="28dp"
                     android:layout_marginRight="28dp"
                     android:gravity="center"
+                    android:singleLine="true"
                     android:text="高大强 先生："
                     android:textColor="@color/text_black"
                     android:textSize="@dimen/px51_17sp" />
@@ -120,8 +121,8 @@
                     android:id="@+id/sal_position"
                     android:layout_width="match_parent"
                     android:layout_height="142dp"
-                    android:visibility="gone"
-                    android:background="@color/main_purple" />
+                    android:background="@color/main_purple"
+                    android:visibility="gone" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -192,11 +193,11 @@
                 <com.webrain.dailypay.ui.widget.ShrinkAnimationLayout
                     android:id="@+id/sal_time"
                     android:layout_width="match_parent"
-                    android:paddingLeft="43dp"
-                    android:paddingRight="43dp"
                     android:layout_height="142dp"
                     android:background="@color/main_purple"
-                    android:orientation="vertical" />
+                    android:orientation="vertical"
+                    android:paddingLeft="43dp"
+                    android:paddingRight="43dp" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -288,9 +289,9 @@
                         android:background="@color/transparent"
                         android:gravity="right|center_vertical"
                         android:hint="@string/hint_click_input_interview_contact_phone"
-                        android:singleLine="true"
                         android:inputType="number"
                         android:maxLength="11"
+                        android:singleLine="true"
                         android:textColor="@color/text_purple"
                         android:textColorHint="@color/text_hint_gray"
                         android:textSize="@dimen/px33_11sp" />

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

@@ -5,50 +5,6 @@
     android:layout_height="match_parent"
     android:background="@color/white">
 
-
-    <!--<com.webrain.baselibrary.widget.HorizontalExpandMenu-->
-    <!--android:id="@+id/expandMenu2"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_marginLeft="15dp"-->
-    <!--android:layout_marginTop="15dp"-->
-    <!--android:layout_marginRight="15dp"-->
-    <!--app:expand_time="500">-->
-
-
-    <!--<RadioGroup-->
-    <!--android:id="@+id/rg"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="40dp"-->
-    <!--android:orientation="horizontal">-->
-
-    <!--<RadioButton-->
-    <!--android:id="@+id/rb_1"-->
-    <!--android:layout_width="0dp"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:layout_weight="1"-->
-    <!--android:text="选项1"-->
-    <!--android:textColor="@color/colorPrimary" />-->
-
-    <!--<RadioButton-->
-    <!--android:id="@+id/rb_2"-->
-    <!--android:layout_width="0dp"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:layout_weight="1"-->
-
-    <!--android:text="选项2"-->
-    <!--android:textColor="@color/colorPrimary" />-->
-    <!--</RadioGroup>-->
-
-
-    <!--<EditText-->
-    <!--android:id="@+id/et_text"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="40dp"-->
-    <!--android:layout_below="@id/rg" />-->
-    <!--</com.webrain.baselibrary.widget.HorizontalExpandMenu>-->
-
-
     <RelativeLayout
         android:id="@+id/rl_bottom"
         android:layout_width="match_parent"
@@ -162,6 +118,7 @@
         app:cardElevation="5dp">
 
         <View
+            android:id="@+id/v_release"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/radio_tab_release" />

app/src/main/res/values/strings.xml

@@ -20,6 +20,7 @@
     <string name="cancel">取消</string>
     <string name="sure">确认</string>
     <string name="picture">图片</string>
+    <string name="jump">跳过</string>
 
 
     <string name="please_choose_account_type">请选择您的账户类型</string>