Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

app_core/common/src/main/java/com/core/app/Constants.java

@@ -38,6 +38,7 @@ public class Constants {
     public static final String WEIXIN_SECRET = "7475f0b85c140c68e7568c904fb68421";
 
     public static String charitBaseUrl() {
+
         return "http://lj.ubtob.com/app/";
     }
 

app_core/common/src/main/java/com/core/dao/WorkLocationDao.java

@@ -63,8 +63,11 @@ public class WorkLocationDao {
                 bean.setId(cursor.getInt(0));
                 double latitude = cursor.getDouble(1);
                 double longitude = cursor.getDouble(2);
-                if (latitude > 0 && longitude > 0)
+                if (latitude > 0 && longitude > 0){
                     bean.setLocation(new LatLng(latitude, longitude));
+                }else{
+                    bean.setLocation(new LatLng(0, 0));
+                }
                 bean.setShortName(cursor.getString(3));
                 bean.setWorkaddr(cursor.getString(4));
                 bean.setValidrange(cursor.getInt(5));

app_modular/applocation/src/main/java/com/uas/applocation/utils/LocationDistanceUtils.java

@@ -72,6 +72,7 @@ public class LocationDistanceUtils {
         }
     }
     public static float distanceMeBack(LatLng a) {
+        if (a==null)return -1;
         String distance = distanceMeStr(new LatLng(a.longitude,a.latitude));
         try {
             return Float.valueOf(distance);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -314,7 +314,6 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
         }
     }
 
-    //TODO 我真是被这样的需求搞废了
     private TypeAdapter typeAdapter;
     private TypeAdapter typeAdapter2;
 
@@ -467,7 +466,8 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 
         String json = JSON.toJSONString(map);
         LogUtil.i("json=" + json);
-        new HttpClient.Builder("http://lj.ubtob.com/")
+        String url="http://lj.ubtob.com/";
+        new HttpClient.Builder(url)
                 .isDebug(BaseConfig.isDebug())
                 .build()
                 .Api()

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/UserFragment.java

@@ -143,11 +143,10 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
         }
         DecimalFormat df = new DecimalFormat(".##");
         if (sumMoney != null) {
-            charitTv.setText(df.format(sumMoney));
+            charitTv.setText(sumMoney);
         }
         projectNumTv.setText("(" + sumProJoin + ")");
         activityNumTv.setText("(" + sumActJoin + ")");
-
         PreferenceUtils.putString("userInfo", message);
     }