Browse Source

修复很重要bug

Bitliker 9 years ago
parent
commit
ba71e6be97

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -42,7 +42,7 @@ public class BdLocationHelper {
         mLocationClient.registerLocationListener(mMyLocationListener); // 注册监听函数
         mLocationClient.registerLocationListener(mMyLocationListener); // 注册监听函数
         LocationClientOption option = new LocationClientOption();
         LocationClientOption option = new LocationClientOption();
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选,默认高精度,设置定位模式,高精度,低功耗,仅设备
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选,默认高精度,设置定位模式,高精度,低功耗,仅设备
-        option.setCoorType("bd0911");//可选,默认gcj02,设置返回的定位结果坐标系
+        option.setCoorType("bd09ll");//可选,默认gcj02,设置返回的定位结果坐标系
         option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s;//可选,默认0,即仅定位一次,设置发起定位请求的间隔需要大于等于1000ms才是有效的
         option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s;//可选,默认0,即仅定位一次,设置发起定位请求的间隔需要大于等于1000ms才是有效的
         option.setIsNeedAddress(true);//可选,设置是否需要地址信息,默认不需要
         option.setIsNeedAddress(true);//可选,设置是否需要地址信息,默认不需要
         option.setOpenGps(true);//可选,默认false,设置是否使用gps
         option.setOpenGps(true);//可选,默认false,设置是否使用gps

+ 3 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

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

+ 12 - 10
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AlarmaActivity.java

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

+ 4 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmManage.java

@@ -4,9 +4,7 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;
-import android.widget.Toast;
 
 
-import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -162,10 +160,10 @@ public class AlarmManage {
 
 
     private void setNextAlarm(Context ct, String action, long time) {
     private void setNextAlarm(Context ct, String action, long time) {
         if (time < System.currentTimeMillis()) return;
         if (time < System.currentTimeMillis()) return;
-        if (AppConfig.DEBUG) {
-            String str = TimeUtils.f_long_2_str(time);
-            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
-        }
+//        if (AppConfig.DEBUG) {
+//            String str = TimeUtils.f_long_2_str(time);
+//            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
+//        }
         Intent intent = new Intent(ct, AlarmReceiver.class);
         Intent intent = new Intent(ct, AlarmReceiver.class);
         intent.setAction(StringUtils.isEmpty(action) ? WORK_ALARM_ACTION : action);
         intent.setAction(StringUtils.isEmpty(action) ? WORK_ALARM_ACTION : action);
         AlarmManager alarm = (AlarmManager) ct.getSystemService(ALARM_SERVICE);
         AlarmManager alarm = (AlarmManager) ct.getSystemService(ALARM_SERVICE);

+ 1 - 1
WeiChat/src/main/res/layout/activity_oa_alarma.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
         android:layout_height="@dimen/item_height"
         android:padding="10dp"
         android:padding="10dp"
-            >
+        android:visibility="gone">
 
 
         <TextView
         <TextView
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"