合并代码

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -26,7 +26,6 @@ import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.account.RegisterActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.alarm.AlarmManage;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
@@ -73,8 +72,8 @@ public class SplashActivity extends BaseActivity {
         });
         mSelectLv.setVisibility(View.INVISIBLE);
         //TODO gongpengming 先关闭
-        AlarmManage manage = new AlarmManage();
-        manage.setSigninAlarm(this);
+//        AlarmManage manage = new AlarmManage();
+//        manage.setSigninAlarm(this);
         initConfig();// 初始化配置
 
     }

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

@@ -16,7 +16,6 @@ import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.alarm.AlarmManage;
 import com.xzjmyk.pm.activity.ui.erp.util.alarm.AlarmService;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 
@@ -46,7 +45,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     private boolean isAlarm;//判断是否为提醒
     private boolean isAuto;//判断是否为自动
     //TODO 关闭
-    private AlarmManage manage;
+//    private AlarmManage manage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -63,8 +62,8 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         auto_signin_sw.setChecked(isAuto);
         setTextColor(isAlarm);
         //TODO
-        manage = new AlarmManage();
-        manage.setSigninAlarm(ct);
+//        manage = new AlarmManage();
+//        manage.setSigninAlarm(ct);
         tv_alar.setOnClickListener(this);
         tv_ualar.setOnClickListener(this);
         isalarma_sw.setOnCheckedChangeListener(this);
@@ -79,7 +78,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     @Override
     protected void onStop() {
         //TODO
-//        startService();
+        startService();
         super.onStop();
     }
 
@@ -135,9 +134,9 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
                 break;
         }
 //        TODO
-        if (manage == null)
-            manage = new AlarmManage();
-        manage.setSigninAlarm(ct);
+//        if (manage == null)
+//            manage = new AlarmManage();
+//        manage.setSigninAlarm(ct);
     }
 
     @Override
@@ -157,9 +156,9 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
             }
             if (requestCode == 0x21 || requestCode == 0x22) {
 //      TODO
-                if (manage == null)
-                    manage = new AlarmManage();
-                manage.setSigninAlarm(ct);
+//                if (manage == null)
+//                    manage = new AlarmManage();
+//                manage.setSigninAlarm(ct);
             }
         }
     }

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

@@ -269,13 +269,6 @@ public class AlarmReceiver extends BroadcastReceiver {
         else
             bean.setOffSignin(time);
         dao.updateByBrean(bean);
-        new Handler().postAtTime(new Runnable() {//延迟两秒
-            @Override
-            public void run() {
-                AlarmManage manage = new AlarmManage();
-                manage.setSigninAlarm(MyApplication.getInstance());
-            }
-        }, 5000);
         NotificationManage notificationManage = new NotificationManage();
         notificationManage.sendNotification(MyApplication.getInstance(), "系统已为你自动打卡成功", SigninActivity.class);
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/CoreService.java

@@ -17,7 +17,6 @@ import android.util.Log;
 
 import com.xzjmyk.pm.activity.bean.message.NewFriendMessage;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.alarm.AlarmManage;
 import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;

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

@@ -53,14 +53,14 @@
 
                 <HorizontalScrollView
                     android:id="@+id/hv_head_view"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="40dip"
                     android:background="#ffffff"
                     android:fadingEdge="none"
                     android:scrollbars="none">
 
                     <RelativeLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="10dp"
                         android:layout_gravity="top">