1.优化完善打卡功能

app/src/main/java/com/tongyu/luck/happywork/http/ApiCode.java

@@ -55,6 +55,8 @@ public class ApiCode {
         public static final int HTTP_USER_UNLOGIN = 2010;
         //用户被注销或拉黑
         public static final int HTTP_USER_CANT_LOGIN = 4000;
+        //用户信息被使用
+        public static final int HTTP_USER_AUTHENTICATION_BE_USER = 2100;
 //        //AccessToken错误或已过期
 //        public static final int ACCESS_TOKEN_EXPIRED = 10001;
 //        //RefreshToken错误或已过期

app/src/main/java/com/tongyu/luck/happywork/http/exception/ApiException.java

@@ -106,6 +106,8 @@ public class ApiException extends IOException {
             ex.isNeedShowError = false;
         } else if (e.getErrorCode() == ApiCode.Response.HTTP_USER_CANT_LOGIN) {//用户已经注销或者拉黑不允许登录
             ex.isNeedShowError = false;
+        }else if (e.getErrorCode() == ApiCode.Response.HTTP_USER_AUTHENTICATION_BE_USER) {//用户已经注销或者拉黑不允许登录
+            ex.isNeedShowError = false;
         }
         return ex;
     }

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/clock/ClockResultActivity.java

@@ -1,5 +1,6 @@
 package com.tongyu.luck.happywork.ui.activity.cclient.clock;
 
+import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -16,6 +17,7 @@ import com.tongyu.luck.happywork.ui.mvp.cclient.contacts.ClockResultContacts;
 import com.tongyu.luck.happywork.ui.mvp.cclient.presenter.ClockResultPresenter;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 
 public class ClockResultActivity extends BaseActivity<ClockResultPresenter> implements ClockResultContacts.IClockResultView {
 
@@ -52,6 +54,11 @@ public class ClockResultActivity extends BaseActivity<ClockResultPresenter> impl
         initView();
     }
 
+    @OnClick(R.id.btn_result)
+    public void onClick(View view) {
+        startActivity(new Intent(mContext,ClockMonthStatisticsActivity.class));
+    }
+
     OnActionBarMenuClickListener onActionBarMenuClickListener = new OnActionBarMenuClickListener() {
         @Override
         public void onClick(int resId) {

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/clock/ClockUserStatisticsActivity.java

@@ -117,7 +117,7 @@ public class ClockUserStatisticsActivity extends BaseActivity<ClockUserStatistic
         tvWeek.setText(title);
         tvRepayTotalWeek.setText((TextUtils.isEmpty(settlementBean.getNextMoney()) ? "0.0" : settlementBean.getNextMoney()) + " 元");
         tvWorkHourTotalWeek.setText((TextUtils.isEmpty(settlementBean.getCountDuration()) ? "0" : settlementBean.getCountDuration()) + " 小时");
-        tvWorkDayWeek.setText((TextUtils.isEmpty(settlementBean.getAttendance()) ? "0" : settlementBean.getAttendance()) + " 天");
+        tvWorkDayWeek.setText((TextUtils.isEmpty(settlementBean.getAttendance()) ? "0" : settlementBean.getAttendance()) + " 次");
         tvLossWeek.setText((TextUtils.isEmpty(settlementBean.getLackClock()) ? "0" : settlementBean.getLackClock()) + " 次");
     }
 
@@ -132,7 +132,7 @@ public class ClockUserStatisticsActivity extends BaseActivity<ClockUserStatistic
         tvMonth.setText(title);
         tvRepayTotalMonth.setText((TextUtils.isEmpty(settlementBean.getNextMoney()) ? "0.0" : settlementBean.getNextMoney()) + " 元");
         tvWorkHourTotalMonth.setText((TextUtils.isEmpty(settlementBean.getCountDuration()) ? "0" : settlementBean.getCountDuration()) + " 小时");
-        tvWorkDayMonth.setText((TextUtils.isEmpty(settlementBean.getAttendance()) ? "0" : settlementBean.getAttendance()) + " 天");
+        tvWorkDayMonth.setText((TextUtils.isEmpty(settlementBean.getAttendance()) ? "0" : settlementBean.getAttendance()) + " 次");
         tvLossMonth.setText((TextUtils.isEmpty(settlementBean.getLackClock()) ? "0" : settlementBean.getLackClock()) + " 次");
     }
 

app/src/main/java/com/tongyu/luck/happywork/ui/activity/cclient/mine/RealNameAuthenticationActivity.java

@@ -19,6 +19,7 @@ import com.tongyu.luck.happywork.ui.activity.cclient.image.PickImageActivity;
 import com.tongyu.luck.happywork.ui.base.BaseActivity;
 import com.tongyu.luck.happywork.ui.mvp.cclient.contacts.RealNameAuthenticationContacts;
 import com.tongyu.luck.happywork.ui.mvp.cclient.presenter.RealNameAuthenticationPresenter;
+import com.tongyu.luck.happywork.ui.widget.dialog.AuthenticationReplayDialog;
 import com.tongyu.luck.happywork.utils.PhotoUtils;
 
 import butterknife.BindView;
@@ -46,6 +47,8 @@ public class RealNameAuthenticationActivity extends BaseActivity<RealNameAuthent
     @BindView(R.id.iv_reverse_top)
     ImageView ivReverseTop;
 
+    AuthenticationReplayDialog mDialog;
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_real_name_authentication;
@@ -137,6 +140,16 @@ public class RealNameAuthenticationActivity extends BaseActivity<RealNameAuthent
     }
 
     /**
+     * 认证信息被使用
+     */
+    @Override
+    public void onAuthenticationUsed() {
+        if (mDialog == null)
+            mDialog = new AuthenticationReplayDialog(this);
+        mDialog.show();
+    }
+
+    /**
      * activity回调
      *
      * @param requestCode

app/src/main/java/com/tongyu/luck/happywork/ui/fragment/cclient/ClockFragment.java

@@ -20,12 +20,14 @@ import com.tongyu.luck.happywork.baselibrary.EventConstant;
 import com.tongyu.luck.happywork.baselibrary.utils.DateUtils;
 import com.tongyu.luck.happywork.bean.ClockInfoBean;
 import com.tongyu.luck.happywork.event.StringEvent;
+import com.tongyu.luck.happywork.ui.activity.cclient.CMainActivity;
 import com.tongyu.luck.happywork.ui.activity.cclient.clock.ClockMonthStatisticsActivity;
 import com.tongyu.luck.happywork.ui.activity.cclient.clock.ClockResultActivity;
 import com.tongyu.luck.happywork.ui.activity.cclient.clock.ClockRulesActivity;
 import com.tongyu.luck.happywork.ui.base.BaseFragment;
 import com.tongyu.luck.happywork.ui.mvp.cclient.contacts.ClockFragmentContacts;
 import com.tongyu.luck.happywork.ui.mvp.cclient.presenter.ClockFragmentPresenter;
+import com.tongyu.luck.happywork.ui.widget.dialog.CallServiceDialog;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -88,6 +90,8 @@ public class ClockFragment extends BaseFragment<ClockFragmentPresenter> implemen
     @BindDrawable(R.mipmap.ic_clock_success_time)
     Drawable dSuccess;
 
+    CallServiceDialog mDialog;
+
     @Override
     protected int getLayoutId() {
         return R.layout.fragment_clock;
@@ -117,7 +121,7 @@ public class ClockFragment extends BaseFragment<ClockFragmentPresenter> implemen
         EventBus.getDefault().unregister(this);
     }
 
-    @OnClick({R.id.v_clock, R.id.ll_statistics, R.id.ll_rules, R.id.tv_relocation, R.id.btn_authentication})
+    @OnClick({R.id.v_clock, R.id.ll_statistics, R.id.ll_rules, R.id.tv_relocation, R.id.btn_authentication, R.id.ll_service})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.v_clock:
@@ -135,6 +139,11 @@ public class ClockFragment extends BaseFragment<ClockFragmentPresenter> implemen
             case R.id.btn_authentication:
                 mvpPresenter.getApproveStatus();
                 break;
+            case R.id.ll_service:
+                if (mDialog == null)
+                    mDialog = new CallServiceDialog((CMainActivity) getActivity());
+                mDialog.show();
+                break;
         }
     }
 

app/src/main/java/com/tongyu/luck/happywork/ui/mvp/cclient/contacts/RealNameAuthenticationContacts.java

@@ -12,6 +12,8 @@ public class RealNameAuthenticationContacts {
         void onImageType(String type);
 
         void onImageTake(String imageUrl, int position);
+
+        void onAuthenticationUsed();
     }
 
     public interface IRealNameAuthenticationPresenter extends IPresenter {

app/src/main/java/com/tongyu/luck/happywork/ui/mvp/cclient/model/RealNameAuthenticationModel.java

@@ -15,6 +15,7 @@ import com.tongyu.luck.happywork.bean.api.ApiApproveBean;
 import com.tongyu.luck.happywork.callback.MvpDataCallBack;
 import com.tongyu.luck.happywork.http.ApiObserver;
 import com.tongyu.luck.happywork.http.RetrofitHttpParams;
+import com.tongyu.luck.happywork.http.exception.ApiException;
 import com.tongyu.luck.happywork.http.subscribe.UserSubscribe;
 import com.tongyu.luck.happywork.ui.activity.cclient.mine.RealNameAuthenticationActivity;
 import com.tongyu.luck.happywork.ui.base.BaseModel;
@@ -114,6 +115,12 @@ public class RealNameAuthenticationModel extends BaseModel implements RealNameAu
             }
 
             @Override
+            public void onError(ApiApproveBean data, ApiException exception) {
+                super.onError(data, exception);
+                callBack.onError(exception);
+            }
+
+            @Override
             public void onFinish() {
             }
         });

app/src/main/java/com/tongyu/luck/happywork/ui/mvp/cclient/presenter/RealNameAuthenticationPresenter.java

@@ -12,6 +12,8 @@ import com.tongyu.luck.happywork.baselibrary.utils.CommonUtils;
 import com.tongyu.luck.happywork.baselibrary.utils.ToastUtils;
 import com.tongyu.luck.happywork.callback.MvpDataCallBack;
 import com.tongyu.luck.happywork.event.StringEvent;
+import com.tongyu.luck.happywork.http.ApiCode;
+import com.tongyu.luck.happywork.http.exception.ApiException;
 import com.tongyu.luck.happywork.ui.activity.cclient.mine.RealNameAuthenticationActivity;
 import com.tongyu.luck.happywork.ui.activity.cclient.mine.RealNameAuthenticationResultActivity;
 import com.tongyu.luck.happywork.ui.base.BasePresenter;
@@ -89,7 +91,14 @@ public class RealNameAuthenticationPresenter extends BasePresenter<RealNameAuthe
                         mvpReference.get().startActivity(intent);
                         mvpReference.get().finish();
                     }
+                }
 
+                @Override
+                public void onError(ApiException exception) {
+                    super.onError(exception);
+                    if ((ApiCode.Response.HTTP_USER_AUTHENTICATION_BE_USER + "").equals(exception.getErrorCode())) {//表示用户信息被使用
+                        mvpReference.get().onAuthenticationUsed();
+                    }
                 }
             });
         }

app/src/main/java/com/tongyu/luck/happywork/ui/widget/dialog/AuthenticationReplayDialog.java

@@ -0,0 +1,67 @@
+package com.tongyu.luck.happywork.ui.widget.dialog;
+
+import android.app.Dialog;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.tongyu.luck.happywork.R;
+import com.tongyu.luck.happywork.baselibrary.utils.PhoneUtils;
+import com.tongyu.luck.happywork.ui.base.BaseActivity;
+import com.tongyu.luck.happywork.ui.base.BaseViewHolder;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+
+public class AuthenticationReplayDialog {
+    private BaseActivity mContext;
+    private Dialog mDialog;
+    private ViewHolder mViewHolder;
+
+    public AuthenticationReplayDialog(BaseActivity mContext) {
+        this.mContext = mContext;
+        mViewHolder = new ViewHolder(mContext);
+        mDialog = new Dialog(mContext, R.style.HappyJobDialog);
+        mDialog.setContentView(mViewHolder.getView());
+    }
+
+
+    public void dismiss() {
+        if (mDialog != null && mDialog.isShowing())
+            mDialog.dismiss();
+
+    }
+
+    public void show() {
+        if (mDialog != null && !mDialog.isShowing())
+            mDialog.show();
+    }
+
+    class ViewHolder extends BaseViewHolder {
+
+
+        @BindView(R.id.ll_call)
+        LinearLayout llCall;
+
+        BaseActivity context;
+
+        public ViewHolder(BaseActivity mContext) {
+            super(mContext);
+            this.context = mContext;
+        }
+
+        @Override
+        public int bindViewLayoutId() {
+            return R.layout.dialog_authenticaition_replay;
+        }
+
+        @OnClick({R.id.ll_call})
+        public void onClick(View view) {
+            if (view.getId() == R.id.ll_call) {
+                PhoneUtils.call(context, "400-692-0099");
+            }
+        }
+
+    }
+
+}

app/src/main/java/com/tongyu/luck/happywork/ui/widget/dialog/CallServiceDialog.java

@@ -0,0 +1,67 @@
+package com.tongyu.luck.happywork.ui.widget.dialog;
+
+import android.app.Dialog;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.tongyu.luck.happywork.R;
+import com.tongyu.luck.happywork.baselibrary.utils.PhoneUtils;
+import com.tongyu.luck.happywork.ui.base.BaseActivity;
+import com.tongyu.luck.happywork.ui.base.BaseViewHolder;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+
+public class CallServiceDialog {
+    private BaseActivity mContext;
+    private Dialog mDialog;
+    private ViewHolder mViewHolder;
+
+    public CallServiceDialog(BaseActivity mContext) {
+        this.mContext = mContext;
+        mViewHolder = new ViewHolder(mContext);
+        mDialog = new Dialog(mContext, R.style.HappyJobDialog);
+        mDialog.setContentView(mViewHolder.getView());
+    }
+
+
+    public void dismiss() {
+        if (mDialog != null && mDialog.isShowing())
+            mDialog.dismiss();
+
+    }
+
+    public void show() {
+        if (mDialog != null && !mDialog.isShowing())
+            mDialog.show();
+    }
+
+    class ViewHolder extends BaseViewHolder {
+
+
+        @BindView(R.id.ll_call)
+        LinearLayout llCall;
+
+        BaseActivity context;
+
+        public ViewHolder(BaseActivity mContext) {
+            super(mContext);
+            this.context = mContext;
+        }
+
+        @Override
+        public int bindViewLayoutId() {
+            return R.layout.dialog_call_service;
+        }
+
+        @OnClick({R.id.ll_call})
+        public void onClick(View view) {
+            if (view.getId() == R.id.ll_call) {
+                PhoneUtils.call(context, "400-692-0099");
+            }
+        }
+
+    }
+
+}

app/src/main/res/drawable/corners_blue_21.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="21dp" />
+
+    <solid android:color="@color/blue_00" />
+</shape>

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

@@ -167,6 +167,7 @@
                 </LinearLayout>
 
                 <Button
+                    android:id="@+id/btn_result"
                     android:layout_width="269dp"
                     android:layout_height="43dp"
                     android:layout_gravity="center_horizontal"

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

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="288dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/corners_white_14dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="55dp"
+            android:layout_height="66dp"
+            android:layout_marginTop="33dp"
+            android:background="@mipmap/ic_authentication_replay" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="29dp"
+            android:layout_marginTop="25dp"
+            android:gravity="center"
+            android:text="@string/mine_real_authentication_be_authentication"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/px48_16sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:lineSpacingExtra="3dp"
+            android:text="@string/mine_real_authentication_be_authentication_tips"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/px39_13sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="29dp"
+            android:layout_marginTop="14dp"
+            android:gravity="center"
+            android:text="400-692-0099"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/px69_23sp" />
+
+        <LinearLayout
+            android:id="@+id/ll_call"
+            android:layout_width="188dp"
+            android:layout_height="42dp"
+            android:layout_marginTop="35dp"
+            android:layout_marginBottom="37dp"
+            android:background="@drawable/corners_blue_21"
+            android:gravity="center">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@mipmap/ic_call_service"
+                android:drawablePadding="10dp"
+                android:text="@string/mine_real_once_call_phone"
+                android:textColor="@color/white"
+                android:textSize="@dimen/px48_16sp" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="288dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/corners_white_14dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="29dp"
+            android:layout_marginTop="36dp"
+            android:gravity="center"
+            android:text="@string/clock_call_service"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/px48_16sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="29dp"
+            android:layout_marginTop="14dp"
+            android:gravity="center"
+            android:text="400-692-0099"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/px69_23sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="@string/clock_service_time"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/px39_13sp" />
+
+
+        <LinearLayout
+            android:id="@+id/ll_call"
+            android:layout_width="188dp"
+            android:layout_height="42dp"
+            android:layout_marginTop="35dp"
+            android:layout_marginBottom="29dp"
+            android:background="@drawable/corners_blue_21"
+            android:gravity="center">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@mipmap/ic_call_service"
+                android:drawablePadding="10dp"
+                android:text="@string/mine_real_once_call_phone"
+                android:textColor="@color/white"
+                android:textSize="@dimen/px48_16sp" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -84,7 +84,7 @@
     <string name="clock_loss">缺卡（次）</string>
     <string name="clock_repay_total_title">总预支：</string>
     <string name="clock_work_hour_total_title">总工时：</string>
-    <string name="clock_work_day_title">出勤天数（以上下班打卡为准）：</string>
+    <string name="clock_work_day_title">出勤次数：</string>
     <string name="clock_work_time_title">平均日工时：</string>
     <string name="clock_loss_title">缺卡：</string>
     <string name="clock_today_repay_title">当日可预支工资：</string>
@@ -99,6 +99,9 @@
     <string name="clock_relocation_ing">定位中</string>
     <string name="clock_in_result_tips">新的一天开始啦！\n今天的你也要光芒万丈！记得下班也要打卡哦！</string>
     <string name="clock_loss2">缺卡</string>
+    <string name="clock_call_service">开心工作客服电话</string>
+    <string name="clock_service_time">在线时间：每天8:00-21:00</string>
+
     <string name="go_use">开启开心打卡之旅</string>
     <string name="no_finish">未完成</string>
     <!-- C Client-->
@@ -610,6 +613,9 @@
     <string name="mine_real_authentication_dialog_salary_query">薪资查询前需要通过实名认证，是否现在认证</string>
     <string name="mine_real_authentication_dialog_salary_back_sure">确认前需要通过实名认证，是否现在认证</string>
     <string name="mine_real_authentication_back_me_center">返回个人中心</string>
+    <string name="mine_real_once_call_phone">一键拨号</string>
+    <string name="mine_real_authentication_be_authentication">您的身份证已经被实名认证</string>
+    <string name="mine_real_authentication_be_authentication_tips">如果非您本人操作认证，\n请联系开心客服为您解决问题。</string>
     <string name="mine_click_choose_time_query_salary">点击选择时间以查看该月工资明细</string>
     <string name="mine_resume">我的简历</string>
     <string name="mine_watch_resume">查看简历</string>

baselibrary/src/main/java/com/tongyu/luck/happywork/baselibrary/utils/PhoneUtils.java

@@ -69,7 +69,7 @@ public class PhoneUtils {
             @Override
             public void accept(Boolean aBoolean) throws Exception {
                 if (aBoolean) {
-                    Intent intent = new Intent(Intent.ACTION_CALL);
+                    Intent intent = new Intent(Intent.ACTION_DIAL);
                     Uri data = Uri.parse("tel:" + num);
                     intent.setData(data);
                     mContext.startActivity(intent);