样式大调备份

WeiChat/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-sdk
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
-    <!--share umeng-->
+    <!-- share umeng -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -103,7 +103,6 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:theme="@style/AppTheme">
-
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="baidu" />
@@ -115,10 +114,11 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+
                 <action android:name="cat.ereza.customactivityoncrash.RESTART" />
             </intent-filter>
         </activity>
-        <!--异常跳转页面-->
+        <!-- 异常跳转页面 -->
         <activity
             android:name=".CustomCrashActivity"
             android:process=":error_activity">
@@ -569,22 +569,22 @@
         <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" />
         <activity
             android:name=".ui.erp.activity.oa.DailydetailsActivity"
-
             android:theme="@style/OAThemeSignin" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" />
         <activity android:name=".ui.erp.activity.oa.SuperSetActivity" />
-        <!--<activity
+        <!--
+            <activity
             android:name=".ui.erp.activity.oa.AddDailyActivity"
-            android:theme="@style/OAThemeSignin" />-->
+            android:theme="@style/OAThemeSignin" />
+        -->
         <activity
             android:name=".ui.erp.activity.oa.WorkDailyAddActivity"
             android:theme="@style/OAThemeSignin" />
         <activity
             android:name=".ui.erp.activity.oa.WorkDailyShowActivity"
             android:theme="@style/OAThemeSignin" />
-
         <activity
             android:name=".ui.erp.activity.oa.WorkLogsActivity"
             android:theme="@style/OAThemeSignin" />
@@ -652,7 +652,7 @@
         <!-- umeng api key -->
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="57ea27bb67e58e088c003bbf"></meta-data>
+            android:value="57ea27bb67e58e088c003bbf" />
         <!-- weixin -->
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -710,6 +710,11 @@
         <activity
             android:name=".ui.erp.activity.message.ProcessMsgActivity"
             android:label="@string/title_activity_process_msg" />
+
+        <service
+            android:name=".ui.erp.util.alarm.AlarmService"
+            android:enabled="true"
+            android:exported="true"></service>
     </application>
 
 </manifest>

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

@@ -34,7 +34,7 @@ import java.util.Map;
 
 public class AddMeetTaskActivity extends BaseActivity {
     private PullToRefreshListView listView;
-    private boolean isPower=true;
+    private boolean isPower = true;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -55,7 +55,7 @@ public class AddMeetTaskActivity extends BaseActivity {
                         Crouton.makeText(ct, StringUtils.isEmpty(message) ? "程序错误" : StringUtils.getChinese(message));
                     }
                     if (StringUtils.isInclude(message, "查看列表的权限")) {
-                        isPower=false;
+                        isPower = false;
                     }
                     break;
             }
@@ -78,7 +78,7 @@ public class AddMeetTaskActivity extends BaseActivity {
             Intent intent = new Intent(ct, TaskAddActivity.class);
             intent.putExtra("reid", R.style.OAThemeMeet);
             intent.putExtra("type", 2);
-            intent.putExtra("isPower", isPower);
+            intent.putExtra("isPower", true);
             intent.putExtra("meetname", meetName);
             startActivityForResult(intent, 0x11);
         }
@@ -95,7 +95,15 @@ public class AddMeetTaskActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x20) {
-            loadNetData();
+            if (!isPower)
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        Crouton.makeText(ct, "您没有查看单据的权限");
+                    }
+                }, 1000);
+            else
+                loadNetData();
         }
     }
 

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

@@ -105,6 +105,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         switch (view.getId()) {
             case R.id.isalarma_sw:
                 CommonUtil.setSharedPreferences(ct, ALARMA_CLICK, isChecked);
+                setTextColor(isChecked);
                 break;
             case R.id.auto_signin_sw:
                 CommonUtil.setSharedPreferences(ct, AUTO_SIGNIN, isChecked);
@@ -148,4 +149,17 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         return -1;
     }
 
+    public void setTextColor(boolean clicked) {
+        int id = 0;
+        if (clicked) {
+            id = R.color.text_color;
+        } else {
+            id = R.color.hintColor;
+        }
+        tv_alar.setFocusable(clicked);
+        tv_ualar.setFocusable(clicked);
+        tv_alar.setTextColor(getResources().getColor(id));
+        tv_ualar.setTextColor(getResources().getColor(id));
+
+    }
 }

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

@@ -46,6 +46,7 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
@@ -175,6 +176,19 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                         chaneTAG(true);
                     }
                     break;
+                default:
+                    try {
+                        JsonValidator validator = new JsonValidator();
+                        if (validator.validate(message)) {
+                            JSONObject object1 = JSON.parseObject(message);
+                            Crouton.makeText(ct, StringUtils.isEmpty(object1.getString("exceptionInfo")) ? "程序错误" : object1.getString("exceptionInfo"));
+                        } else {
+                            Crouton.makeText(ct, StringUtils.isEmpty(message) ? "程序错误" : StringUtils.getChinese(message));
+                        }
+                    }catch (Exception e){
+
+                    }
+                    break;
             }
         }
     };

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -126,7 +126,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude")) ? "0" : jsonObject.getString("latitude")) : "0");
                         CommonUtil.setSharedPreferences(ct, "companyX", (float) companyX);
                         CommonUtil.setSharedPreferences(ct, "companyY", (float) companyY);
-                        CommonUtil.setSharedPreferences(ct, "distance",  companyDistance);
+                        CommonUtil.setSharedPreferences(ct, "distance", companyDistance);
                         unoffice_mm.setText(setDistance());
                     }
                     if (jsonObject.getBoolean("success")) {
@@ -230,7 +230,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 default:
                     JsonValidator validator = new JsonValidator();
                     if (validator.validate(message)) {
-                        ViewUtil.ToastMessage(ct,message,Style.holoRedLight,3000);
+                        ViewUtil.ToastMessage(ct, message, Style.holoRedLight, 3000);
                     }
                     if (loginNum < 3 && StringUtils.isInclude(message, getResources().getString(R.string.session_out)) || StringUtils.isInclude(message, "程序错误")) {
                         returnLogin();
@@ -280,7 +280,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             if (poi == null) return;
             loaction = poi.name == null ? "" : poi.name;
             addr = poi.address == null ? "" : poi.address;
-            office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
+            office_addr.setText(addr);
             latitude = poi.location.latitude;
             longitude = poi.location.longitude;
             unoffice_mm.setText(setDistance());
@@ -306,7 +306,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             case R.id.signin_btn:
                 if (isPlay()) {
                     if (!CommonUtil.isNetWorkConnected(ct)) {
-                        Crouton.makeText(ct, "当前网络不可用，请检查网络连接",Style.holoRedLight,2000);
+                        Crouton.makeText(ct, "当前网络不可用，请检查网络连接", Style.holoRedLight, 2000);
                         return;
                     }
                     //TODO 上传文件
@@ -330,7 +330,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             case R.id.title:
                 showDateDialog();
                 break;
-            case R.id.unoffice_mm:
+            case R.id.unoffice_:
                 intent = new Intent(ct, LocationMapActivity.class);
                 intent.putExtra("action", "SigninFragment");
                 //已选择此时定位到的地点传递
@@ -338,7 +338,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 startActivityForResult(intent, 0x14);
                 break;
             default:
-                Crouton.makeText(ct, "系统没有找到你的排班信息，请联系管理员处理",Style.holoRedLight,2000);
+                Crouton.makeText(ct, "系统没有找到你的排班信息，请联系管理员处理", Style.holoRedLight, 2000);
                 ct.finish();
                 break;
         }
@@ -379,7 +379,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         back.setOnClickListener(this);
         signin_btn.setOnClickListener(this);
         title.setOnClickListener(this);
-        unoffice_mm.setOnClickListener(this);
+        findViewById(R.id.unoffice_).setOnClickListener(this);
     }
 
     private void init() {
@@ -406,7 +406,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     setBaiduLocation();
                 } else {
                     if (resultCode == 62) {
-                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", Style.holoRedLight,2000);
+                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", Style.holoRedLight, 2000);
                     }
                 }
             }
@@ -436,7 +436,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         loaction = MyApplication.getInstance().getBdLocationHelper().getName();
         addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
         unoffice_mm.setText(setDistance());
-        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
+        office_addr.setText(addr);
     }
 
     private void initView() {
@@ -444,7 +444,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         listview.setLayoutManager(new LinearLayoutManager(ct));
         adapter = new SigninAdapter(ct);
         listview.setAdapter(adapter);
-        office_addr.setText(Html.fromHtml("<font color=\'#575757\'>当前位置  " + "</font><font color=\'#000000\'>" + addr + "</font>"));
+        office_addr.setText(addr);
         loadNetData(System.currentTimeMillis());//获取打卡班次信息
         getMacByNet();
         //判断是否有定位权限
@@ -573,7 +573,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         try {
             if (!StringUtils.isEmpty(dis)) {
                 distance = (int) Double.parseDouble(dis);
-                re = Html.fromHtml("<font color=\'#575757\'>距离考勤地点" + (distance == -1 ? -1 : distance) + "米&#160&#160&#160&#160&#160" + "</font><font color=\'#000000\'><U>地点微调</U></font>");
+                re = Html.fromHtml("<font color=\'#575757\'>约" + (distance == -1 ? -1 : distance) + "米&#160&#160&#160&#160&#160" + "</font><font color=\'#000000\'></font>");
             }
         } catch (ClassCastException e) {
             e.printStackTrace();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmService.java

@@ -0,0 +1,41 @@
+package com.xzjmyk.pm.activity.ui.erp.util.alarm;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class AlarmService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {//第一次进来
+        super.onCreate();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {//每次启动服务
+
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {//服务关闭
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onLowMemory() {//低内存关闭
+        super.onLowMemory();
+    }
+
+    public void alarm() {
+
+
+    }
+
+
+}

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

@@ -52,10 +52,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true" />
     </RelativeLayout>
-    <View
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/line"
-        android:background="@color/lightgrey" />
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"

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

@@ -11,33 +11,78 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="15dp"
         android:orientation="vertical"
+
         android:padding="5dp">
 
-        <TextView
-            android:id="@+id/office_addr"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:drawableLeft="@drawable/oa_signin"
-            android:drawablePadding="5dp"
-            android:gravity="center_horizontal"
-            android:textColor="@color/text_hine" />
-
-        <TextView
-            android:id="@+id/unoffice_mm"
-            android:layout_width="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:drawableLeft="@drawable/oa_signin"
+                android:text="当前位置"
+                android:textColor="#000000"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/office_addr"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:drawablePadding="5dp"
+                android:textSize="12dp"
+                android:gravity="center_horizontal"
+                android:textColor="@color/text_hine" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:layout_marginTop="5dp"
-            android:text="地点微调"
-            android:textColor="@color/text_hine"
-            android:textSize="15dp" />
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:textColor="#000000"
+                android:drawableLeft="@drawable/oa_signin"
+                android:text="距离公司"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/unoffice_mm"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:textColor="@color/text_hine"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/unoffice_"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:text="@string/unoffice"
+                android:textColor="#f17e21"
+                android:textSize="12dp" />
+        </LinearLayout>
+
+
     </LinearLayout>
 
     <ImageView
         android:id="@+id/signin_btn"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="110dp"
+        android:layout_height="110dp"
         android:layout_above="@+id/oa_range_addr_rl"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="8dp"
@@ -50,6 +95,7 @@
         android:layout_height="match_parent"
         android:layout_above="@+id/signin_btn"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="25dp"
         android:background="@color/item_line" />
 
     <android.support.v7.widget.RecyclerView
@@ -62,8 +108,8 @@
         android:divider="@null"
         android:dividerHeight="0dp"
         android:focusable="false"
-        android:paddingTop="20dp"
-        android:longClickable="false" />
+        android:longClickable="false"
+        android:paddingTop="20dp" />
 
 
 </RelativeLayout>

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

@@ -3,12 +3,12 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize">
+
     <ImageView
         android:id="@+id/back"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:padding="10dp"
-        android:src="@drawable/back" />
+        android:src="@drawable/actionbar_up_indicator" />
 
     <TextView
         android:id="@+id/title"
@@ -17,13 +17,12 @@
         android:layout_centerInParent="true"
         android:drawableRight="@drawable/down"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_main" />
+        android:textSize="14sp" />
 
     <ImageView
         android:id="@+id/seting"
-        android:layout_width="40dp"
+        android:layout_width="20dp"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
-        android:padding="8dp"
         android:src="@drawable/setting" />
 </RelativeLayout>

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

@@ -19,6 +19,7 @@
     <string name="add_summed">请添加工作总结(必填项)!</string>
     <string name="change_mobile_ok">申请变更成功，待系统审批完即可正常打卡!</string>
     <string name="submit">提交</string>
+    <string name="unoffice"><u>地点微调</u></string>
     <string name="change_mobile">手机变更单</string>
     <string name="play_phone">拨打电话</string>
     <string name="send_mail">发送短信</string>