1.个人中心新增 通用设置

2.完成通用设置界面绘制，以及版本更新，用户协议功能

app/src/main/AndroidManifest.xml

@@ -85,6 +85,9 @@
             android:name=".ui.activity.MineTaxPaymentCertificateActivity"
             android:screenOrientation="portrait" />
         <activity
+            android:name=".ui.activity.MineGeneralSettingActivity"
+            android:screenOrientation="portrait" />
+        <activity
             android:name=".ui.activity.NormalUserActivity"
             android:screenOrientation="portrait" />
         <activity

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

@@ -40,14 +40,13 @@ public class MineCenterActivity extends BaseActivity<MineCenterPresenter> implem
     LinearLayout llPaymentRecord;
     @BindView(R.id.ll_tax)
     LinearLayout llTax;
-    @BindView(R.id.ll_version)
-    LinearLayout llVersion;
+    @BindView(R.id.ll_general)
+    LinearLayout llGeneral;
     @BindView(R.id.tv_logout)
     TextView tvLogout;
 
     SureDialog mLogoutDialog;
 
-
     @Override
     public int getLayoutId() {
         return R.layout.activity_mine_center;
@@ -66,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_version, 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_general, R.id.tv_logout})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.ll_apply:
@@ -84,8 +83,8 @@ public class MineCenterActivity extends BaseActivity<MineCenterPresenter> implem
             case R.id.ll_tax:
                 startActivity(new Intent(mContext, MineTaxPaymentCertificateActivity.class));
                 break;
-            case R.id.ll_version:
-                mvpPresenter.checkUpdate();
+            case R.id.ll_general:
+                startActivity(new Intent(mContext, MineGeneralSettingActivity.class));
                 break;
             case R.id.tv_logout:
                 if (mLogoutDialog == null) {

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

@@ -0,0 +1,75 @@
+package com.webrain.happywork.ui.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.webrain.happywork.R;
+import com.webrain.happywork.ui.base.BaseActivity;
+import com.webrain.happywork.ui.mvp.contacts.MineGeneralSettingContacts;
+import com.webrain.happywork.ui.mvp.presenter.MineGeneralSettingPresenter;
+import com.webrain.happywork.ui.widget.dialog.SureDialog;
+
+import butterknife.BindView;
+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.tv_unregister)
+    TextView tvUnregister;
+
+    SureDialog mUnregisterDialog;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_mine_general_setting;
+    }
+
+    @Override
+    public MineGeneralSettingPresenter bindPresenter() {
+        return new MineGeneralSettingPresenter(this);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle(R.string.mine_center);
+    }
+
+    @OnClick({R.id.ll_tips, R.id.ll_version, R.id.tv_unregister})
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.ll_tips:
+                startActivity(new Intent(mContext, TipsActivity.class));
+                break;
+            case R.id.ll_version:
+                mvpPresenter.checkUpdate();
+                break;
+            case R.id.tv_unregister:
+                if (mUnregisterDialog == null) {
+                    mUnregisterDialog = new SureDialog(mContext);
+                    mUnregisterDialog.initData(R.string.is_unregister, 0, R.string.cancel, R.string.sure, onClickSureListener);
+                }
+                mUnregisterDialog.show();
+                break;
+        }
+    }
+
+    /**
+     * 注销账户点击回调
+     */
+    SureDialog.OnClickSureListener onClickSureListener = new SureDialog.OnClickSureListener() {
+        @Override
+        public void onClick(boolean isSure) {
+
+        }
+    };
+}

app/src/main/java/com/webrain/happywork/ui/mvp/contacts/MineCenterContacts.java

@@ -18,7 +18,6 @@ public class MineCenterContacts {
 
         void getHttpUserBean();
 
-        void checkUpdate();
     }
 
     public interface IMineCenterModel {
@@ -26,7 +25,5 @@ public class MineCenterContacts {
 
         UserBean getUserBean();
 
-        void httpCheckUpdate(MvpDataCallBack<VersionBean> callBack);
-
     }
 }

app/src/main/java/com/webrain/happywork/ui/mvp/contacts/MineGeneralSettingContacts.java

@@ -0,0 +1,19 @@
+package com.webrain.happywork.ui.mvp.contacts;
+
+import com.webrain.happywork.bean.VersionBean;
+import com.webrain.happywork.callback.MvpDataCallBack;
+import com.webrain.happywork.ui.base.IPresenter;
+import com.webrain.happywork.ui.base.IView;
+
+public class MineGeneralSettingContacts {
+    public interface IMineGeneralSettingView extends IView {
+    }
+
+    public interface IMineGeneralSettingPresenter extends IPresenter {
+        void checkUpdate();
+    }
+
+    public interface IMineGeneralSettingModel {
+        void httpCheckUpdate(MvpDataCallBack<VersionBean> callBack);
+    }
+}

app/src/main/java/com/webrain/happywork/ui/mvp/model/MineCenterModel.java

@@ -60,39 +60,4 @@ public class MineCenterModel extends BaseModel implements MineCenterContacts.IMi
         return AppCacheManager.getInstance().getLoginModel();
     }
 
-    /**
-     * 检查最新版本号
-     *
-     * @param callBack
-     */
-    @Override
-    public void httpCheckUpdate(final MvpDataCallBack<VersionBean> callBack) {
-        RetrofitHttpParams params = new RetrofitHttpParams(mContext);
-        params.put("version", AppUtils.getVersionName(mContext));
-        params.put("app_system", 0);//表示Android系统
-        new VersionSubscribe(mContext).requestCheckVersion(params.getRequestParams(), new ApiObserver<ApiCheckVersion>(mContext, true, true, false) {
-            @Override
-            public void onSuccess(ApiCheckVersion data) {
-                if (data != null && !data.isLatest() && data.getHwVersion() != null) {
-                    callBack.onData(data.getHwVersion());
-                } else {
-                    ToastUtils.show(mContext, R.string.toast_is_new_version);
-                }
-            }
-
-            @Override
-            public void onError(ApiCheckVersion data, ApiException exception) {
-                super.onError(data, exception);
-                if (exception != null && ApiCode.Request.HTTP_ERROR.equals(exception.getErrorCode())) {
-                    ToastUtils.show(mContext, R.string.toast_is_new_version);
-                } else {
-                    ToastUtils.show(mContext, exception.getErrorMessage());
-                }
-            }
-
-            @Override
-            public void onFinish() {
-            }
-        });
-    }
 }

app/src/main/java/com/webrain/happywork/ui/mvp/model/MineGeneralSettingModel.java

@@ -0,0 +1,62 @@
+package com.webrain.happywork.ui.mvp.model;
+
+
+import android.content.Context;
+
+import com.webrain.baselibrary.utils.AppUtils;
+import com.webrain.baselibrary.utils.ToastUtils;
+import com.webrain.happywork.R;
+import com.webrain.happywork.bean.VersionBean;
+import com.webrain.happywork.bean.api.ApiCheckVersion;
+import com.webrain.happywork.callback.MvpDataCallBack;
+import com.webrain.happywork.http.ApiCode;
+import com.webrain.happywork.http.ApiObserver;
+import com.webrain.happywork.http.RetrofitHttpParams;
+import com.webrain.happywork.http.exception.ApiException;
+import com.webrain.happywork.http.subscribe.VersionSubscribe;
+import com.webrain.happywork.ui.base.BaseModel;
+import com.webrain.happywork.ui.mvp.contacts.MineGeneralSettingContacts;
+
+public class MineGeneralSettingModel extends BaseModel implements MineGeneralSettingContacts.IMineGeneralSettingModel {
+
+
+    public MineGeneralSettingModel(Context mContext) {
+        super(mContext);
+    }
+
+    /**
+     * 检查最新版本号
+     *
+     * @param callBack
+     */
+    @Override
+    public void httpCheckUpdate(final MvpDataCallBack<VersionBean> callBack) {
+        RetrofitHttpParams params = new RetrofitHttpParams(mContext);
+        params.put("version", AppUtils.getVersionName(mContext));
+        params.put("app_system", 0);//表示Android系统
+        new VersionSubscribe(mContext).requestCheckVersion(params.getRequestParams(), new ApiObserver<ApiCheckVersion>(mContext, true, true, false) {
+            @Override
+            public void onSuccess(ApiCheckVersion data) {
+                if (data != null && !data.isLatest() && data.getHwVersion() != null) {
+                    callBack.onData(data.getHwVersion());
+                } else {
+                    ToastUtils.show(mContext, R.string.toast_is_new_version);
+                }
+            }
+
+            @Override
+            public void onError(ApiCheckVersion data, ApiException exception) {
+                super.onError(data, exception);
+                if (exception != null && ApiCode.Request.HTTP_ERROR.equals(exception.getErrorCode())) {
+                    ToastUtils.show(mContext, R.string.toast_is_new_version);
+                } else {
+                    ToastUtils.show(mContext, exception.getErrorMessage());
+                }
+            }
+
+            @Override
+            public void onFinish() {
+            }
+        });
+    }
+}

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

@@ -53,22 +53,4 @@ public class MineCenterPresenter extends BasePresenter<MineCenterActivity> imple
         }
     }
 
-
-    /**
-     * 检查更新
-     */
-    @Override
-    public void checkUpdate() {
-        if (isViewAttach()) {
-            mMineCenterModel.httpCheckUpdate(new MvpDataCallBack<VersionBean>() {
-                @Override
-                public void onData(VersionBean data) {
-                    if (isViewAttach()) {
-                        if (data != null)
-                            new UpdateAppDialog(mvpReference.get(), data).show();
-                    }
-                }
-            });
-        }
-    }
 }

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

@@ -0,0 +1,37 @@
+package com.webrain.happywork.ui.mvp.presenter;
+
+
+import com.webrain.happywork.bean.VersionBean;
+import com.webrain.happywork.callback.MvpDataCallBack;
+import com.webrain.happywork.ui.activity.MineGeneralSettingActivity;
+import com.webrain.happywork.ui.base.BasePresenter;
+import com.webrain.happywork.ui.mvp.contacts.MineGeneralSettingContacts;
+import com.webrain.happywork.ui.mvp.model.MineGeneralSettingModel;
+import com.webrain.happywork.ui.widget.dialog.UpdateAppDialog;
+
+public class MineGeneralSettingPresenter extends BasePresenter<MineGeneralSettingActivity> implements MineGeneralSettingContacts.IMineGeneralSettingPresenter {
+    private MineGeneralSettingModel mMineOrderModel;
+
+    public MineGeneralSettingPresenter(MineGeneralSettingActivity view) {
+        super(view);
+        this.mMineOrderModel = new MineGeneralSettingModel(mvpReference.get());
+    }
+
+    /**
+     * 检查更新
+     */
+    @Override
+    public void checkUpdate() {
+        if (isViewAttach()) {
+            mMineOrderModel.httpCheckUpdate(new MvpDataCallBack<VersionBean>() {
+                @Override
+                public void onData(VersionBean data) {
+                    if (isViewAttach()) {
+                        if (data != null)
+                            new UpdateAppDialog(mvpReference.get(), data).show();
+                    }
+                }
+            });
+        }
+    }
+}

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

@@ -182,7 +182,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/ll_version"
+            android:id="@+id/ll_general"
             android:layout_width="match_parent"
             android:layout_height="71dp"
             android:layout_marginTop="10dp"
@@ -195,14 +195,14 @@
             <View
                 android:layout_width="33dp"
                 android:layout_height="33dp"
-                android:background="@mipmap/ic_mine_version" />
+                android:background="@mipmap/ic_mine_general" />
 
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="14dp"
                 android:layout_weight="1"
-                android:text="@string/mine_version"
+                android:text="@string/mine_general"
                 android:textColor="@color/text_black"
                 android:textSize="@dimen/px39_13sp" />
 

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

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_gray_f5"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/ll_tips"
+        android:layout_width="match_parent"
+        android:layout_height="71dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp">
+
+        <View
+            android:layout_width="33dp"
+            android:layout_height="33dp"
+            android:background="@mipmap/ic_mine_tips" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="14dp"
+            android:layout_weight="1"
+            android:text="@string/mine_tips"
+            android:textColor="@color/text_black"
+            android:textSize="@dimen/px39_13sp" />
+
+        <View
+            android:layout_width="9dp"
+            android:layout_height="14dp"
+            android:background="@mipmap/ic_right_gray" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_version"
+        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"
+        android:paddingRight="20dp">
+
+        <View
+            android:layout_width="33dp"
+            android:layout_height="33dp"
+            android:background="@mipmap/ic_mine_version" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="14dp"
+            android:layout_weight="1"
+            android:text="@string/mine_version"
+            android:textColor="@color/text_black"
+            android:textSize="@dimen/px39_13sp" />
+
+        <View
+            android:layout_width="9dp"
+            android:layout_height="14dp"
+            android:background="@mipmap/ic_right_gray" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_unregister"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginTop="13.5dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:text="@string/unregister"
+        android:textColor="@color/text_black"
+        android:textSize="@dimen/px45_15sp" />
+
+</LinearLayout>

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

@@ -26,7 +26,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:singleLine="true"
                 android:textColor="@color/text_black"
                 android:textSize="@dimen/px54_18sp" />
 

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

@@ -4,12 +4,14 @@
     <string name="all_area">全部区域</string>
     <string name="login">登录</string>
     <string name="logout">退出登录</string>
+    <string name="unregister">注销账户</string>
     <string name="cancel">取消</string>
     <string name="sure">确认</string>
     <string name="sure_apply">确认报名</string>
     <string name="apply_fail">报名失败</string>
     <string name="apply_success">报名成功</string>
     <string name="is_logout">是否退出登录</string>
+    <string name="is_unregister">注销账号是一个不可逆操作， \n注销后会失去所有记录，请谨\n慎操作。</string>
     <string name="business">行业</string>
     <string name="unit_price">单价</string>
     <string name="authentication_user">认证用户</string>
@@ -74,6 +76,8 @@
     <string name="mine_record_date">收款时间</string>
     <string name="mine_tax">完税证明</string>
     <string name="mine_version">版本信息</string>
+    <string name="mine_general">通用设置</string>
+    <string name="mine_tips">用户协议与隐私政策</string>
     <string name="mine_empty_none">空空如也</string>
     <string name="mine_empty_apply">您目前没有需要发布人确认的报名</string>
     <string name="mine_empty_order">您目前没有正在进行中的订单</string>