添加图标

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

@@ -6,7 +6,6 @@ import android.os.IBinder;
 import android.util.Log;
 
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.Date;
 import java.util.Timer;
@@ -33,7 +32,6 @@ public class AlarmService extends Service {
 
     @Override
     public void onDestroy() {//服务关闭
-
         super.onDestroy();
     }
 
@@ -45,14 +43,13 @@ public class AlarmService extends Service {
     public void alarm() {
         ReckonAlarmTimeUtil util = new ReckonAlarmTimeUtil();
         long time = util.reckoAlarmAndAuto(getApplicationContext());
-        if (time==0)return;
+        if (time == 0) return;
         Log.i("gongpengming", TimeUtils.f_long_2_str(time));
         Timer timer = new Timer();
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
                 Log.i("gongpengming", "进来了");
-                ToastUtil.showToast(getApplicationContext(), "进来了");
             }
         }, new Date(time));
     }

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

@@ -4,15 +4,49 @@
     android:layout_height="match_parent"
     android:background="@color/oa_main">
 
+    <ImageView
+        android:id="@+id/signin_btn"
+        android:layout_width="110dp"
+        android:layout_height="110dp"
+        android:layout_above="@+id/oa_range_addr_rl"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="8dp"
+        android:clickable="true"
+        android:gravity="center"
+        android:src="@drawable/signin_btn" />
+
+    <View
+        android:layout_width="2px"
+        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
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/signin_btn"
+        android:layout_marginTop="5dp"
+        android:clickable="false"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:focusable="false"
+        android:longClickable="false"
+        android:paddingTop="20dp" />
+
     <LinearLayout
         android:id="@+id/oa_range_addr_rl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="15dp"
+        android:layout_marginBottom="17dp"
         android:orientation="vertical"
 
-        android:padding="5dp">
+        android:padding="5dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -25,6 +59,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:drawableLeft="@drawable/oa_signin"
+                android:drawablePadding="8dp"
                 android:text="当前位置"
                 android:textColor="#000000"
                 android:textSize="12dp" />
@@ -35,9 +70,9 @@
                 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" />
+                android:textColor="@color/text_hine"
+                android:textSize="12dp" />
         </LinearLayout>
 
         <LinearLayout
@@ -51,9 +86,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:textColor="#000000"
-                android:drawableLeft="@drawable/oa_signin"
+                android:drawableLeft="@drawable/icon_distance"
+                android:drawablePadding="8dp"
                 android:text="距离公司"
+                android:textColor="#000000"
                 android:textSize="12dp" />
 
             <TextView
@@ -79,37 +115,5 @@
 
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/signin_btn"
-        android:layout_width="110dp"
-        android:layout_height="110dp"
-        android:layout_above="@+id/oa_range_addr_rl"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="8dp"
-        android:clickable="true"
-        android:gravity="center"
-        android:src="@drawable/signin_btn" />
-
-    <View
-        android:layout_width="2px"
-        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
-        android:id="@+id/listview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/signin_btn"
-        android:layout_marginTop="5dp"
-        android:clickable="false"
-        android:divider="@null"
-        android:dividerHeight="0dp"
-        android:focusable="false"
-        android:longClickable="false"
-        android:paddingTop="20dp" />
-
 
 </RelativeLayout>