正式版本5.7.2---》发布

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="85"
-    android:versionName="5.7.1">
+    android:versionCode="86"
+    android:versionName="5.7.2">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -9,7 +9,6 @@ import com.baidu.location.BDLocationListener;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.model.LatLng;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 
@@ -125,8 +124,8 @@ public class BdLocationHelper {
             cityName = location.getCity();
             district = location.getDistrict();
             address = location.getAddrStr();
-            LogUtil.d("address:"+address);
-            LogUtil.d("Latitude:"+location.getLatitude()+" Longitude:"+ location.getLongitude());
+//            LogUtil.d("address:"+address);
+//            LogUtil.d("Latitude:"+location.getLatitude()+" Longitude:"+ location.getLongitude());
             if (!StringUtils.isEmpty(this.location))
                 PreferenceUtils.putString("bdlocation", this.location);
             if (!StringUtils.isEmpty(address))

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

@@ -145,7 +145,6 @@ public class WebViewLoadActivity extends BaseActivity {
 
             @Override
             public void onPageStarted(WebView view, String url, Bitmap favicon) {
-//                progressDialog.show();
                 if (pb.getVisibility() == View.GONE) {
                     pb.setVisibility(View.VISIBLE);
                 }
@@ -153,7 +152,6 @@ public class WebViewLoadActivity extends BaseActivity {
 
             @Override
             public void onPageFinished(WebView view, String url) {
-//               progressDialog.dismiss();
                 if (pb.getVisibility() == View.VISIBLE) {
                     pb.setVisibility(View.GONE);
                 }

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -5,6 +5,8 @@
     <string name="common_save_button">保存</string>
     <string name="common_update_button">更新</string>
     <string name="common_submit_button">提交</string>
+    <string name="common_reset">重置</string>
+    <string name="common_select_all">全部</string>
     <string name="common_resubmit_button">重新提交</string>
     <string name="common_search">搜索</string>
     <string name="common_input">请输入(必填)</string>
@@ -123,15 +125,39 @@
     <string name="sports_dialog_content">更多历史记录</string>
     
     <!--个人资料-->
-    <!--<string name="user_birthday">生日</string>-->
-    <!--<string name="user_sex">性别</string>-->
-    <!--<string name="user_nickname">昵称</string>-->
-    <!--<string name="user_images">头像</string>-->
-    <!--<string name="user_birthday">地区</string>-->
-    <!--<string name="user_birthday">男</string>-->
-    <!--<string name="user_birthday">女</string>-->
-    <!--<string name="user_birthday">职位</string>-->
-    <!--<string name="user_birthday">企业信息</string>-->
+    <string name="user_info_title">个人资料</string>
+    <string name="user_birthday">生日</string>
+    <string name="user_sex">性别</string>
+    <string name="user_nickname">昵称</string>
+    <string name="user_images">头像</string>
+    <string name="user_area">地区</string>
+    <string name="user_body">男</string>
+    <string name="user_girl">女</string>
+    <string name="user_position">职位</string>
+    <string name="user_conpany_info">企业信息</string>
+    <!--通讯录-->
+    <!--通讯录添加好友-->
+    <string name="user_minage">最小年龄</string>
+    <string name="user_maxage">最大年龄</string>
+    <string name="user_appear">出现时间</string>
+    
+    <string name="select_sex_title">选择性别</string>
+    <string name="select_date_title">选择日期</string>
+    <string-array name="array_select_date">
+        <item>所有日期</item>
+        <item>近一天</item>
+        <item>近两天</item>
+        <item>近三天</item>
+        <item>近一周</item>
+        <item>近两周</item>
+        <item>近一个月</item>
+        <item>近六周</item>
+        <item>近两个月</item>
+    </string-array>
+    <!--通讯录个人详情-->
+    
+    
+    <!--选择地区 未完成-->
     <!--arison-->