1.优化打卡功能

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

@@ -10,6 +10,7 @@ import com.tongyu.luck.happywork.baselibrary.utils.PxUtils;
 import com.tongyu.luck.happywork.ui.base.BaseActivity;
 import com.tongyu.luck.happywork.ui.mvp.cclient.contacts.ClockRulesContacts;
 import com.tongyu.luck.happywork.ui.mvp.cclient.presenter.ClockRulesPresenter;
+import com.tongyu.luck.happywork.utils.ActionBarUtils;
 
 import butterknife.BindView;
 
@@ -36,6 +37,7 @@ public class ClockRulesActivity extends BaseActivity<ClockRulesPresenter> implem
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ActionBarUtils.setStatusBarDarkTheme(this, false);
         setBackColor(R.color.white);
         LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) vBg.getLayoutParams();
         layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;

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

@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -21,6 +22,7 @@ import com.tongyu.luck.happywork.R;
 import com.tongyu.luck.happywork.baselibrary.AppConstant;
 import com.tongyu.luck.happywork.baselibrary.EventConstant;
 import com.tongyu.luck.happywork.baselibrary.utils.DateUtils;
+import com.tongyu.luck.happywork.baselibrary.utils.PxUtils;
 import com.tongyu.luck.happywork.baselibrary.widget.refresh.ProgressRefreshLayout;
 import com.tongyu.luck.happywork.bean.ClockInfoBean;
 import com.tongyu.luck.happywork.event.StringEvent;
@@ -40,9 +42,7 @@ import org.greenrobot.eventbus.Subscribe;
 
 import butterknife.BindDrawable;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.Unbinder;
 
 public class ClockFragment extends BaseFragment<ClockFragmentPresenter> implements ClockFragmentContacts.IClockFragmentView {
     @BindView(R.id.tv_work_hour)
@@ -165,6 +165,13 @@ public class ClockFragment extends BaseFragment<ClockFragmentPresenter> implemen
         tvWorkHour.setTypeface(typeFace);
         tvWeekRepay.setTypeface(typeFace);
         tvTodayMoney.setTypeface(typeFace);
+
+
+        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) vClockVideo.getLayoutParams();
+        layoutParams.width = PxUtils.getDeviceWidth() - PxUtils.dip2px(28);
+        layoutParams.height = (int) (1.0f * layoutParams.width / 518 * 186);
+        vClockVideo.setLayoutParams(layoutParams);
+
     }
 
     /**
@@ -247,10 +254,7 @@ public class ClockFragment extends BaseFragment<ClockFragmentPresenter> implemen
                             rlTodayMoney.setVisibility(View.VISIBLE);
                         }
                     }
-
-
                 }
-
             }
         }
     }

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

@@ -35,6 +35,7 @@ public class ClockFragmentModel extends BaseModel implements ClockFragmentContac
     private ClockInfoBean infoBean;//打卡信息
 
     private boolean isInit;//是否已经初始化
+    private boolean isLoading;//是否正在打卡在
 
     public ClockFragmentModel(Context mContext) {
         super(mContext);
@@ -134,8 +135,9 @@ public class ClockFragmentModel extends BaseModel implements ClockFragmentContac
      */
     @Override
     public void requestClock(final MvpDataCallBack<ClockResultBean> callBack) {
-        if (mLocation == null || infoBean == null)
+        if (mLocation == null || infoBean == null || isLoading)
             return;
+        isLoading = true;
         RetrofitHttpParams params = new RetrofitHttpParams(mContext);
         params.put("longitude", mLocation.getLongitude());
         params.put("latitude", mLocation.getLatitude());
@@ -152,6 +154,7 @@ public class ClockFragmentModel extends BaseModel implements ClockFragmentContac
 
             @Override
             public void onFinish() {
+                isLoading = false;
             }
         });
     }

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

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

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

@@ -17,8 +17,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginRight="15dp"
             android:layout_marginBottom="16dp"
-            app:cardCornerRadius="10dp"
-            app:cardElevation="2dp">
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

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

@@ -121,7 +121,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="14dp"
+                        android:layout_marginTop="10dp"
                         android:text="@string/clock_tips"
                         android:textColor="@color/white_70"
                         android:textSize="@dimen/px33_11sp" />
@@ -131,10 +131,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="79dp"
                         android:layout_marginLeft="14dp"
-                        android:layout_marginTop="10dp"
+                        android:layout_marginTop="29dp"
                         android:layout_marginRight="14dp"
-                        app:cardCornerRadius="15dp"
-                        app:cardElevation="2dp">
+                        app:cardCornerRadius="8dp"
+                        app:cardElevation="0dp">
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -223,8 +223,8 @@
                         android:layout_marginTop="10dp"
                         android:layout_marginRight="14dp"
                         android:layout_marginBottom="10dp"
-                        app:cardCornerRadius="15dp"
-                        app:cardElevation="2dp">
+                        app:cardCornerRadius="8dp"
+                        app:cardElevation="0dp">
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -243,7 +243,7 @@
                                     android:layout_width="0dp"
                                     android:layout_height="match_parent"
                                     android:layout_weight="1"
-                                    android:background="@drawable/corners_gray_f5_5dp"
+                                    android:background="@drawable/corners_gray_f5_4dp"
                                     android:paddingLeft="14dp">
 
                                     <TextView
@@ -271,7 +271,7 @@
                                     android:layout_height="match_parent"
                                     android:layout_marginLeft="6dp"
                                     android:layout_weight="1"
-                                    android:background="@drawable/corners_gray_f5_5dp"
+                                    android:background="@drawable/corners_gray_f5_4dp"
                                     android:paddingLeft="14dp">
 
                                     <TextView
@@ -425,8 +425,8 @@
                     android:layout_marginRight="14dp"
                     android:layout_marginBottom="10dp"
                     android:visibility="gone"
-                    app:cardCornerRadius="15dp"
-                    app:cardElevation="2dp">
+                    app:cardCornerRadius="8dp"
+                    app:cardElevation="0dp">
 
                     <RelativeLayout
                         android:layout_width="match_parent"
@@ -482,14 +482,22 @@
                 </android.support.v7.widget.CardView>
 
 
-                <ImageView
-                    android:id="@+id/v_clock_video"
+                <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="14dp"
                     android:layout_marginRight="14dp"
                     android:layout_marginBottom="10dp"
-                    android:background="@mipmap/ic_clock_in_video" />
+                    app:cardCornerRadius="8dp"
+                    app:cardElevation="0dp">
+
+                    <ImageView
+                        android:id="@+id/v_clock_video"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@mipmap/ic_clock_in_video" />
+                </android.support.v7.widget.CardView>
+
             </LinearLayout>
         </RelativeLayout>
     </ScrollView>