企业架构功能完善；

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/FANGlh/Desktop/UU5.5.1/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     android:versionCode="71"
-    android:versionName="5.5.6">
+    android:versionName="5.5.7">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -8,8 +8,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
-import com.afollestad.materialdialogs.MaterialDialog;
-
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -35,8 +33,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-            new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();
+//            new MaterialDialog.Builder(this).content(stackTraceString)
+//                    .build().show();
         }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);

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

@@ -43,6 +43,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.me.BasicInfoEditActivity;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
@@ -183,8 +184,16 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             mNickname = entities.get(0).getEM_NAME();
         }
         // mNameEdit.setText(mTempData.getNickName());
-        tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId())
-        +"-"+Area.getCityAreaString(0,mTempData.getAreaId()));
+      
+        if(!StringUtils.isEmpty(Area.getCityAreaString(0, mTempData.getAreaId()))){
+            tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId())
+                    + "-" + Area.getCityAreaString(0, mTempData.getAreaId()));
+        }else{
+            tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()));
+        }
+        if (Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()).contains("海外")){
+            tv_address.setText("海外");
+        }
         AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), iv_headImage, true);
     }
 
@@ -379,8 +388,14 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                 String province_name = data.getStringExtra(SelectAreaActivity.EXTRA_PROVINCE_NAME);
                 String city_name = data.getStringExtra(SelectAreaActivity.EXTRA_CITY_NAME);
                 String county_name=data.getStringExtra(SelectAreaActivity.EXTRA_COUNTY_NAME);
-                tv_address.setText(province_name + "-" + city_name+"-"+county_name);
-
+                if (StringUtils.isEmpty(county_name)){
+                    tv_address.setText(province_name + "-" + city_name);
+                }else{
+                    tv_address.setText(province_name + "-" + city_name+"-"+county_name);
+                }
+                if ("海外".equals(province_name)){
+                    tv_address.setText(province_name);
+                }
                 LogUtil.d("省：" + provinceId + "市：" + cityId + "县：" + countryId);
                 mTempData.setCountryId(countryId);
                 mTempData.setProvinceId(provinceId);
@@ -549,6 +564,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                     AvatarHelper.getInstance().deleteAvatar(loginUserId);
                     ToastUtil.showToast(BaseInfoActivity.this, R.string.upload_avatar_success);
                     mCurrentFile=null;
+                    mProgressDialog=null;
                 } else {
                     ToastUtil.showToast(BaseInfoActivity.this, R.string.upload_avatar_failed);
                 }

WeiChat/src/main/res/layout/item_process_state.xml

@@ -26,7 +26,7 @@
     <TextView
         android:id="@+id/tv_status"
         android:layout_marginLeft="10dp"
-       android:layout_marginBottom="10dp"
+        android:layout_marginBottom="10dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" 
         android:text="状态"