1.登录流程改版

2.个人中心 改版

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

@@ -124,6 +124,8 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
     public void onEvent(StringEvent event) {
         if (event.getData().equals(EventConstant.EVENT_LOGOUT)) {
             finish();
+        }else if(event.getData().equals(EventConstant.EVENT_LOGIN)){
+            mvpPresenter.getRequirements(true, true);
         }
     }
 

app/src/main/java/com/webrain/happywork/ui/activity/MineCenterActivity.java

@@ -40,8 +40,8 @@ public class MineCenterActivity extends BaseActivity<MineCenterPresenter> implem
     LinearLayout llPaymentRecord;
     @BindView(R.id.ll_tax)
     LinearLayout llTax;
-    @BindView(R.id.ll_general)
-    LinearLayout llGeneral;
+    @BindView(R.id.ll_more)
+    LinearLayout llMore;
     @BindView(R.id.tv_logout)
     TextView tvLogout;
 
@@ -65,7 +65,7 @@ public class MineCenterActivity extends BaseActivity<MineCenterPresenter> implem
         mvpPresenter.init();
     }
 
-    @OnClick({R.id.ll_apply, R.id.ll_order, R.id.ll_payment_record, R.id.ll_tax, R.id.iv_header,R.id.ll_general, R.id.tv_logout})
+    @OnClick({R.id.ll_apply, R.id.ll_order, R.id.ll_payment_record, R.id.ll_tax, R.id.iv_header,R.id.ll_more, R.id.tv_logout})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.ll_apply:
@@ -83,7 +83,7 @@ public class MineCenterActivity extends BaseActivity<MineCenterPresenter> implem
             case R.id.ll_tax:
                 startActivity(new Intent(mContext, MineTaxPaymentCertificateActivity.class));
                 break;
-            case R.id.ll_general:
+            case R.id.ll_more:
                 startActivity(new Intent(mContext, MineGeneralSettingActivity.class));
                 break;
             case R.id.tv_logout:

app/src/main/java/com/webrain/happywork/ui/activity/MineGeneralSettingActivity.java

@@ -3,9 +3,11 @@ package com.webrain.happywork.ui.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.webrain.happywork.BuildConfig;
 import com.webrain.happywork.R;
 import com.webrain.happywork.ui.base.BaseActivity;
 import com.webrain.happywork.ui.mvp.contacts.MineGeneralSettingContacts;
@@ -19,12 +21,17 @@ import butterknife.OnClick;
  * 通用设置界面
  */
 public class MineGeneralSettingActivity extends BaseActivity<MineGeneralSettingPresenter> implements MineGeneralSettingContacts.IMineGeneralSettingView {
-    @BindView(R.id.ll_tips)
-    LinearLayout llTips;
-    @BindView(R.id.ll_version)
-    LinearLayout llVersion;
+    @BindView(R.id.ll_tips_user)
+    LinearLayout llTipsUser;
+    @BindView(R.id.ll_tips_privacy)
+    LinearLayout llTipsPrivacy;
     @BindView(R.id.tv_unregister)
     TextView tvUnregister;
+    @BindView(R.id.iv_logo)
+    ImageView ivLogo;
+    @BindView(R.id.tv_version)
+    TextView tvVersion;
+
 
     SureDialog mUnregisterDialog;
 
@@ -42,15 +49,19 @@ public class MineGeneralSettingActivity extends BaseActivity<MineGeneralSettingP
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.mine_center);
+        tvVersion.setText("版本号 V"+ BuildConfig.VERSION_NAME);
     }
 
-    @OnClick({R.id.ll_tips, R.id.ll_version, R.id.tv_unregister})
+    @OnClick({R.id.ll_tips_user, R.id.ll_tips_privacy,R.id.iv_logo, R.id.tv_unregister})
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.ll_tips:
+            case R.id.ll_tips_user:
                 startActivity(new Intent(mContext, TipsUserActivity.class));
                 break;
-            case R.id.ll_version:
+            case R.id.ll_tips_privacy:
+                startActivity(new Intent(mContext, TipsPrivacyActivity.class));
+                break;
+            case R.id.iv_logo:
                 mvpPresenter.checkUpdate();
                 break;
             case R.id.tv_unregister:

app/src/main/java/com/webrain/happywork/ui/mvp/presenter/LoginPresenter.java

@@ -6,6 +6,8 @@ import android.text.TextUtils;
 import android.widget.Toast;
 
 import com.webrain.baselibrary.AppConstant;
+import com.webrain.baselibrary.EventConstant;
+import com.webrain.baselibrary.event.StringEvent;
 import com.webrain.baselibrary.utils.PhoneUtils;
 import com.webrain.happywork.AppCacheManager;
 import com.webrain.happywork.R;
@@ -18,6 +20,8 @@ import com.webrain.happywork.ui.base.BasePresenter;
 import com.webrain.happywork.ui.mvp.contacts.LoginContacts;
 import com.webrain.happywork.ui.mvp.model.LoginModel;
 
+import org.greenrobot.eventbus.EventBus;
+
 public class LoginPresenter extends BasePresenter<LoginActivity> implements LoginContacts.ILoginPresenter {
     private LoginModel mLoginModel;
 
@@ -51,11 +55,7 @@ public class LoginPresenter extends BasePresenter<LoginActivity> implements Logi
                 @Override
                 public void onData(Boolean data) {
                     if (AppCacheManager.getInstance().isLogin()) {
-                        if (AppCacheManager.getInstance().getLoginModel().getRegisterFrom() == AppConstant.REGISTER_FROM_SERVICE) {
-                            mvpReference.get().startActivity(new Intent(mvpReference.get(), MainActivity.class));
-                        } else {
-                            mvpReference.get().startActivity(new Intent(mvpReference.get(), NormalUserActivity.class));
-                        }
+                        EventBus.getDefault().post(new StringEvent(EventConstant.EVENT_LOGIN));
                         mvpReference.get().finish();
                     }
                 }

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

@@ -182,7 +182,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/ll_general"
+            android:id="@+id/ll_more"
             android:layout_width="match_parent"
             android:layout_height="71dp"
             android:layout_marginTop="10dp"
@@ -202,7 +202,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:layout_weight="1"
-                android:text="@string/mine_general"
+                android:text="@string/more"
                 android:textColor="@color/text_black"
                 android:textSize="@dimen/px39_13sp" />
 

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

@@ -6,11 +6,36 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/ll_tips"
         android:layout_width="match_parent"
-        android:layout_height="71dp"
+        android:layout_height="154dp"
         android:layout_marginTop="10dp"
         android:background="@color/white"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_logo"
+            android:layout_width="71dp"
+            android:layout_height="71dp"
+            android:background="@mipmap/ic_launcher" />
+
+        <TextView
+            android:id="@+id/tv_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="版本号 V1.0.2"
+            android:textColor="@color/text_black"
+            android:textSize="@dimen/px36_12sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_tips_user"
+        android:layout_width="match_parent"
+        android:layout_height="71dp"
+        android:layout_marginTop="2dp"
+        android:background="@color/white"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingLeft="20dp"
@@ -26,7 +51,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:layout_weight="1"
-            android:text="@string/mine_tips"
+            android:text="@string/user_tips2"
             android:textColor="@color/text_black"
             android:textSize="@dimen/px39_13sp" />
 
@@ -37,7 +62,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/ll_version"
+        android:id="@+id/ll_tips_privacy"
         android:layout_width="match_parent"
         android:layout_height="71dp"
         android:layout_marginTop="2dp"
@@ -57,7 +82,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="14dp"
             android:layout_weight="1"
-            android:text="@string/mine_version"
+            android:text="@string/privacy_tips2"
             android:textColor="@color/text_black"
             android:textSize="@dimen/px39_13sp" />
 

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

@@ -25,6 +25,7 @@
     <string name="get_code">获取短信验证码</string>
     <string name="login_tip">未注册开心工作的手机号将自动注册，且代表您已同意：《用户协议》与《隐私政策》</string>
     <string name="no_more_data">没有更多信息了</string>
+    <string name="more">更多</string>
     <string name="take_photo">拍照</string>
     <string name="picture">图片</string>
     <string name="take_photo_from_album">从相册选取</string>
@@ -39,6 +40,8 @@
     <string name="update_now">立刻升级</string>
     <string name="user_tips">开心灵工用户协议</string>
     <string name="privacy_tips">开心灵工隐私协议</string>
+    <string name="user_tips2">用户协议</string>
+    <string name="privacy_tips2">隐私协议</string>
     <string name="e_contract">电子合同</string>
     <string name="toast_is_new_version">已是最新版本</string>
 

baselibrary/src/main/java/com/webrain/baselibrary/EventConstant.java

@@ -4,6 +4,7 @@ package com.webrain.baselibrary;
  * EventBus String
  */
 public class EventConstant {
+    public static final String EVENT_LOGIN = "login"; //登入
     public static final String EVENT_LOGOUT = "logout"; //登出
     public static final String EVENT_AVATAR_CHANGE = "avatar_change";//头像改变
     public static final String EVENT_ORDER_SURE = "order_sure";//订单确认