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

# Conflicts:
#	WeiChat/src/main/res/layout/act_task_detail.xml
#	WeiChat/src/main/res/layout/activity_save_meet.xml
#	WeiChat/version.properties

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

@@ -72,6 +72,7 @@ import com.core.net.volley.ArrayResult;
 import com.core.net.volley.FastVolley;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;
+import com.core.utils.CommonInterface;
 import com.core.utils.IntentUtils;
 import com.core.utils.helper.LoginHelper;
 import com.core.xmpp.CoreService;
@@ -629,6 +630,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 //        dbManager.closeDB();
         doHiTask();
         autoPresenter = AutoPresenter.onCreate();
+        CommonInterface.getInstance().loadConfigs(null);
 //		startService(new Intent(MainActivity.this, AutoErpService.class));
         LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jul 26 09:29:14 CST 2018
+#Fri Jul 27 14:13:42 CST 2018
 debugName=517
-versionName=640
+versionName=641
 debugCode=517
-versionCode=181
+versionCode=182

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -102,6 +102,9 @@ public class CommonUtil {
             ct=MyApplication.getInstance();
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
+//        if (BaseConfig.isDebug()){
+//            baseUrl="http://192.168.253.243:8080/ERP/";
+//        }
         return baseUrl;
     }
     

app_core/common/src/main/res/layout/act_taskerp_add.xml

@@ -58,7 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="1dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="8dp"
                 android:layout_toRightOf="@id/detailsTV"
                 android:text="*"
                 android:textColor="@color/red" />

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

@@ -46,6 +46,7 @@ public class AreaUtils {
 
 
     public static int getLocationServiceType() {
+        Log.i("gong","getLocationServiceType="+type);
         return type;
     }
 

app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -257,7 +257,6 @@ public class SignUtils implements OnHttpResultListener {
             }
         }
         form.put("cl_phone", phone);
-//        form.put("facecard", 1);//添加一个参数
         form.put("cl_emcode", getSharedPreferences(ct, "erp_username"));
         form.put("cl_emname", CommonUtil.getName());
         form.put("cl_distance", dis);
@@ -273,7 +272,7 @@ public class SignUtils implements OnHttpResultListener {
 
         String formStore = JSONUtil.map2JSON(form);
         param.put("formStore", formStore);
-        param.put("facecard", 1);
+        param.put("facecard", "1");
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
                 "mobile/saveCardLog.action";

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -216,7 +216,6 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                 phone = getSharedPreferences(MyApplication.getInstance(), "user_phone");
         }
         form.put("cl_phone", phone);
-//        form.put("facecard", 1);//添加一个参数
         form.put("cl_emcode", getSharedPreferences(ct, "erp_username"));
         String emname = getSharedPreferences(ct, "erp_emname");
         if (StringUtil.isEmpty(emname)) {
@@ -235,7 +234,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
 
         String formStore = JSONUtil.map2JSON(form);
         param.put("formStore", formStore);
-        param.put("facecard", 1);
+        param.put("facecard", "1");
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
                 "mobile/saveCardLog.action";