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

# Conflicts:
#	WeiChat/src/main/res/values-en/strings.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -93,7 +93,7 @@ public class DataDownloadActivity extends BaseActivity {
             if (manager==null)manager=new DBManager();
             switch (msg.what) {
                 case LOAD_COMPANY_DATA:
-                    Log.i("newdata", "handleMessage:" + msg.getData().getString("result"))
+                    Log.i("newdata", "handleMessage:" + msg.getData().getString("result"));
                     writeData(msg);//写入缓存
                     company_download_status = STATUS_SUCCESS;
                     if (address_user_download_status != STATUS_SUCCESS) {// 没有成功，就下载