打卡界面PopupWindow用小龚的1

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkActivity.java

@@ -13,6 +13,8 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -31,6 +33,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.WifiReceiverUtil;
+import com.xzjmyk.pm.activity.ui.me.OfficeAddressSettingsActivity;
+import com.xzjmyk.pm.activity.ui.me.SignSeniorSettingActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.MacAndIDUtil;
@@ -285,17 +289,16 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
 //                }
                 break;
             case R.id.super_setting_tv:
-                //TODO 高级设置
+                startActivity(new Intent(ct, SignSeniorSettingActivity.class));
                 closePopupWindow();
                 break;
             case R.id.work_setting_tv:
-                //TODO 班次设置
                 intent=new Intent(ct,FlightsActivity.class);
                 startActivity(intent);
                 closePopupWindow();
                 break;
             case R.id.office_addr_setting_tv:
-                //TODO 考勤地址
+                startActivity(new Intent(ct, OfficeAddressSettingsActivity.class));
                 closePopupWindow();
                 break;
             case R.id.my_rule_setting_tv:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SignSeniorSettingActivity.java

@@ -1,23 +1,63 @@
 package com.xzjmyk.pm.activity.ui.me;
 
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
+
+import static com.xzjmyk.pm.activity.AppConfig.AUTO_SIGNIN;
 
 /**
  * Created by FANGlh on 2017/1/16.
- * function:
+ * function:高级设置
  */
-public class SignSeniorSettingActivity extends BaseActivity {
+public class SignSeniorSettingActivity extends BaseActivity implements View.OnClickListener,SwitchView.OnCheckedChangeListener{
+    @ViewInject(R.id.senior_setting_auto_sign_sw)
+    private SwitchView auto_sign_sw;
+    @ViewInject(R.id.senior_setting_late_time_tv)
+    private TextView late_time_tv;
+    @ViewInject(R.id.senior_setting_serious_late_time_tv)
+    private TextView serious_late_time_tv;
+    @ViewInject(R.id.senior_setting_leave_early_tv)
+    private TextView leave_early_tv;
+    @ViewInject(R.id.senior_setting_absenteeism_tv)
+    private TextView absenteeism_time_tv;
+    @ViewInject(R.id.senior_setting_save_bt)
+    private Button save_bt;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.sign_senior_setting);
+        ViewUtils.inject(this);
         initView();
     }
 
     private void initView() {
+        boolean isAuto = CommonUtil.getSharedPreferencesBoolean(ct, AUTO_SIGNIN, true);
+        auto_sign_sw.setChecked(isAuto);
+        auto_sign_sw.setOnCheckedChangeListener(this);
+    }
 
+    @Override
+    public void onClick(View v) {
+
+    }
+
+    @Override
+    public void onCheckedChanged(View view, boolean isChecked) {
+        switch (view.getId()) {
+            case R.id.senior_setting_auto_sign_sw:
+                CommonUtil.setSharedPreferences(ct, AUTO_SIGNIN, isChecked);
+                break;
+        }
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/service/StepService.java

@@ -242,12 +242,12 @@ public class StepService extends Service implements SensorEventListener {
                 .getSystemService(SENSOR_SERVICE);
         getLock(this);
        // android4.4以后可以使用计步传感器
-//        int VERSION_CODES = Build.VERSION.SDK_INT;
-//        if (VERSION_CODES >= 19) {
-//            addCountStepListener();
-//        } else {
-//            addBasePedoListener();
-//        }
+        int VERSION_CODES = Build.VERSION.SDK_INT;
+        if (VERSION_CODES >= 19) {
+            addCountStepListener();
+        } else {
+            addBasePedoListener();
+        }
 
         addBasePedoListener();
         addCountStepListener();

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/utils/DbUtils.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import com.litesuits.orm.LiteOrm;
 import com.litesuits.orm.db.assit.QueryBuilder;
 import com.litesuits.orm.db.model.ConflictAlgorithm;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 
 import java.util.List;
 
@@ -65,7 +66,12 @@ public class DbUtils {
      * @return
      */
     public static <T> List<T> getQueryByWhere(Class<T> cla, String field, String[] value) {
-        return liteOrm.<T>query(new QueryBuilder(cla).where(field + "=?", value));
+        if (!ListUtils.isEmpty(liteOrm.<T>query(new QueryBuilder(cla).where(field + "=?", value)))){
+            return liteOrm.<T>query(new QueryBuilder(cla).where(field + "=?", value));
+        }else {
+            return null;
+        }
+
     }
 
     /**

WeiChat/src/main/res/layout/office_address_settings.xml

@@ -1,7 +1,8 @@
 <?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:layout_height="match_parent"
+    android:background="#ebe9e9">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -54,7 +55,7 @@
                 android:id="@+id/of_add_set_range_rl"
                 style="@style/IMTbleLine"
                 android:layout_height="40dp"
-                android:background="@drawable/selector_me_menu_item_bg">
+                android:background="@color/white">
 
                 <TextView
                     android:id="@+id/of_add_set_range_text"
@@ -91,15 +92,17 @@
                 android:id="@+id/of_add_set_address_lv"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:visibility="gone">
+                android:visibility="gone"
+                android:background="@color/white">
             </ListView>
 
 
             <RelativeLayout
                 android:id="@+id/of_add_set_addaddress_rl"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 style="@style/IMTbleLine"
                 android:layout_height="40dp"
+                android:background="@color/white"
                 >
                 <TextView
                     android:layout_width="wrap_content"

WeiChat/src/main/res/layout/pop_work_activity.xml

@@ -63,7 +63,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="4dp"
-        android:background="@color/button_invalid" />
+        android:background="@color/black_gray" />
 
     <TextView
         android:id="@+id/cancel_tv"

WeiChat/src/main/res/layout/sign_senior_setting.xml

@@ -2,9 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="10dp"
     android:orientation="vertical"
-    android:background="@color/bg_main"
+    android:background="#ebe9e9"
     >
 <ScrollView
     android:layout_width="match_parent"
@@ -12,12 +11,20 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        >
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="10px"
+            android:background="@color/black_gray"
+            />
     <RelativeLayout
         android:id="@+id/senior_setting_auto_sign_rl"
         style="@style/IMTbleLine2"
         android:visibility="visible"
         android:background="@color/white"
+        android:layout_height="50dp"
         >
 
         <TextView
@@ -41,7 +48,7 @@
             android:visibility="gone"
             />
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
-            android:id="@+id/senior_setting_auto_sign_reply"
+            android:id="@+id/senior_setting_auto_sign_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"
             android:layout_alignParentRight="true"
@@ -52,7 +59,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="10px"
-        android:background="@color/item_line"
+        android:background="@color/black_gray"
         />
     <TextView
         android:layout_width="match_parent"
@@ -146,13 +153,13 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"/>
     <RelativeLayout
-        android:id="@+id/senior_setting_Leave_early_rl"
+        android:id="@+id/senior_setting_leave_early_rl"
         style="@style/IMTbleLine2"
         android:layout_height="40dp"
         android:background="@color/white">
 
         <TextView
-            android:id="@+id/senior_setting_Leave_early_text"
+            android:id="@+id/senior_setting_leave_early_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -162,15 +169,15 @@
             />
 
         <TextView
-            android:id="@+id/senior_setting_Leave_early_tv"
+            android:id="@+id/senior_setting_leave_early_tv"
             style="@style/IMTbleLine_TextValue"
-            android:layout_toLeftOf="@+id/senior_setting_Leave_early_img"
-            android:layout_toRightOf="@+id/senior_setting_Leave_early_text"
+            android:layout_toLeftOf="@+id/senior_setting_leave_early_img"
+            android:layout_toRightOf="@+id/senior_setting_leave_early_text"
             android:textColor="@color/dark_dark_grey"
             android:text="15分钟"
             />
         <ImageView
-            android:id="@+id/senior_setting_Leave_early_img"
+            android:id="@+id/senior_setting_leave_early_img"
             android:layout_width="@dimen/next_width"
             android:layout_height="@dimen/next_height"
             android:layout_alignParentRight="true"
@@ -188,7 +195,7 @@
         android:id="@+id/senior_setting_absenteeism_rl"
         style="@style/IMTbleLine2"
         android:layout_height="40dp"
-        android:background="@drawable/selector_me_menu_item_bg">
+        android:background="@color/white">
 
         <TextView
             android:id="@+id/senior_setting_absenteeism_text"