合并代码 2.0 验证问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -129,7 +129,7 @@ public class BdLocationHelper {
         }
     };
 
-    private synchronized void setLocation(BDLocation location) throws Exception {
+    private void setLocation(BDLocation location) throws Exception {
         if (System.currentTimeMillis() - oldTime < 10000) return;//防止过度
         if (locationEntity == null)
             locationEntity = new LocationEntity();
@@ -153,7 +153,7 @@ public class BdLocationHelper {
             if (StringUtils.isEmpty(location.getAddrStr()))
                 PreferenceUtils.putString("bdaddress", location.getAddrStr());
         } else {
-            //统一未定位失败
+            //统一为定位失败
             locationEntity.setLocationOk(false);
             log("定位失败");
             if (location.getLocType() == BDLocation.TypeServerError) {

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

@@ -98,7 +98,7 @@ public class MyRuleSetActivity extends BaseActivity {
                 timeShow.append(t1 + "-" + t2 + " ");
                 allTime += OACheckUtil.getDifferSS(t1, t2);
             }
-            float h = Float.valueOf(allTime) / (1000 * 60*60);
+            float h = Float.valueOf(allTime) / ( 60*60);
             String hour = float2String(h);
             timeShow.append("  " + hour + "小时");
             time_tv.setText(timeShow.toString() );

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

@@ -156,7 +156,8 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
     public void showLocation(String location) {
         if (!StringUtils.isEmpty(location))
             office_addr.setText(location);
-
+//        else
+//            Crouton.showToast(ct, "定位失败，请检查定位权限", R.color.load_warning);
     }