Browse Source

高级设置界面基本完成1

FANGLH 9 years ago
parent
commit
702b7cf2fb

+ 5 - 24
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SignSeniorSettingActivity.java

@@ -1,9 +1,7 @@
 package com.xzjmyk.pm.activity.ui.me;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -59,11 +57,7 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
     }
     private void initView() {
         isAuto = CommonUtil.getSharedPreferencesBoolean(ct, AUTO_SIGNIN, true); //初次进来设置状态
-        if (isAuto){
-            auto_sign_sw.setChecked(true);
-        }else {
-            auto_sign_sw.setChecked(false);
-        }
+        auto_sign_sw.setChecked(isAuto);
         auto_sign_sw.setOnCheckedChangeListener(this);
         late_time_tv.setOnClickListener(this);
         serious_late_time_tv.setOnClickListener(this);
@@ -135,7 +129,7 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
             if (requestCode == LATE_TIME_CODE){
                 late_time_tv.setText(selected_time);
             }else if (requestCode == ERIOUS_LATE_TIME){
-                late_time_tv.setText(selected_time);
+                serious_late_time_tv.setText(selected_time);
             }else if (requestCode == LEAVE_EARLY_TIME){
                 leave_early_tv.setText(selected_time);
             }else if (requestCode == ABSENTEEISM_TIME){
@@ -153,24 +147,11 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
     public void onCheckedChanged(View view, final boolean isChecked) {
         switch (view.getId()) {
             case R.id.senior_setting_auto_sign_sw:
-                if (isAuto){
-                    new AlertDialog.Builder(ct)
-                            .setTitle("温馨提示")
-                            .setMessage("您已关闭自动打卡,系统无法将帮你自动打卡")
-                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    auto_sign_sw.setChecked(true);
-                                    CommonUtil.setSharedPreferences(ct, AUTO_SIGNIN, isChecked);
-                                }
-                            }).show();
-                }else {
-                    auto_sign_sw.setChecked(false);
-                    CommonUtil.setSharedPreferences(ct, AUTO_SIGNIN, isChecked);
+                CommonUtil.setSharedPreferences(ct, AUTO_SIGNIN, isChecked);
+                if (auto_sign_sw.isChecked()){
+                    ToastMessage("您已关闭自动打卡,系统无法将帮您自动打卡");
                 }
-
                 break;
         }
     }
-
 }

+ 3 - 3
WeiChat/src/main/res/layout/office_address_settings.xml

@@ -54,7 +54,7 @@
             <RelativeLayout
                 android:id="@+id/of_add_set_range_rl"
                 style="@style/IMTbleLine"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
                 android:background="@color/white">
 
                 <TextView
@@ -91,7 +91,7 @@
             <ListView
                 android:id="@+id/of_add_set_address_lv"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
                 android:visibility="gone"
                 android:background="@color/white">
             </ListView>
@@ -101,7 +101,7 @@
                 android:id="@+id/of_add_set_addaddress_rl"
                 android:layout_width="match_parent"
                 style="@style/IMTbleLine"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
                 android:background="@color/white"
                 >
                 <TextView