结合旧版app企业架构功能，整个企业架构；10-31 重要的修复

WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="69"
+    android:versionCode="70"
     android:versionName="5.5.5">
 
     <uses-sdk

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

@@ -34,8 +34,6 @@ import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.ui.SplashActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.util.AndroidUtils;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.SharedUtil;
@@ -130,10 +128,10 @@ public class MyApplication extends Application {
         // 初始化网络监听
         mNetWorkObservable = new NetWorkObservable(this);
         
-        
-        LogUtil.d("applications",AndroidUtils.getEthernetMacAddress());
-        LogUtil.d("applications",AndroidUtils.getAndroidId(this));
-        LogUtil.d("applications",AndroidUtils.getWifiMacAddress(this));
+//        
+//        LogUtil.d("applications",AndroidUtils.getEthernetMacAddress());
+//        LogUtil.d("applications",AndroidUtils.getAndroidId(this));
+//        LogUtil.d("applications",AndroidUtils.getWifiMacAddress(this));
     }
 
     /**

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

@@ -413,10 +413,9 @@ public class CompanyContactsActivity extends BaseActivity {
         mHandler.sendEmptyMessage(UPDATE_CHANGE_MASTER);
     }
 
-    /**
-     * @desc:
-     * @author：Administrator on 2016/1/30 18:04
-     */
+    private String next_or_id;//记录下级标题栏的or_id   解决顶部导航栏点击选择问题
+    private String next_or_name;//记录下级标题栏的or_id   解决顶部导航栏点击选择问题
+   
     public void initListener() {
         //横向导航监听
         rg_nav_content.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {

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

@@ -200,7 +200,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("客户管理");
+        getSupportActionBar().setTitle("客户关系管理");
         initBarChart();
         initSaleBarChart();
         initListener();

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

@@ -460,17 +460,26 @@ public class ViewUtil {
 
     private static void loginERPItemDialog(final String phone,
                                            final String password) {
+        //记住
+        String company = CommonUtil.getSharedPreferences(ct,"erp_commpany");
         String[] items = new String[erpEntities.size()];
+        int select=0;
         for (int j = 0; j < erpEntities.size(); j++) {
             items[j] = erpEntities.get(j).getName();
+            if (!StringUtils.isEmpty(company)){
+               if (company.equals(erpEntities.get(j).getName())){
+                   select=j;
+               }
+            }
         }
         if (CommonUtil.isDialogShowing(loginERPDialog)) {
             return;
         } else {
+         
             loginERPDialog = new MaterialDialog.Builder(ct)
                     .title("选择登录的UAS账套")
                     .items(items)
-                    .itemsCallbackSingleChoice(0,
+                    .itemsCallbackSingleChoice(select,
                             new MaterialDialog.ListCallbackSingleChoice() {
                                 @Override
                                 public boolean onSelection(MaterialDialog dialog,

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

@@ -108,11 +108,7 @@ public class MasterDialog extends Dialog {
 	}
 	
 	public interface PickDialogListener {
-		//public void onLeftBtnClick();
-		//public void onRightBtnClick();
 		public void onListItemClick(int position, Master master);
-		//public void onListItemLongClick(int position, String string);
-		//public void onCancel();
 	}
 
 	public class MasterAdapter extends BaseAdapter{
@@ -157,6 +153,9 @@ public class MasterDialog extends Dialog {
 				Drawable drawable= context.getResources().getDrawable(R.drawable.icon_select_master);
 				drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
 				holder.blend_dialog_list_item_textview.setCompoundDrawables(null,null,drawable,null);
+			}else{
+				holder.blend_dialog_list_item_textview.setTextColor(context.getResources().getColor(R.color.lightblack));
+				holder.blend_dialog_list_item_textview.setCompoundDrawables(null,null,null,null);
 			}
 			return convertView;
 		}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -177,7 +177,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         @Override
         public void onReceive(Context context, Intent intent) {
             if ("updata".equals(intent.getStringExtra(BasicInfoEditActivity.UPHEAD))) {
-                //TODO 更新头像
                 AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), mAvatarImg, true);
             }
         }
@@ -275,7 +274,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-//        inflater = getActivity().getMenuInflater();
         inflater.inflate(R.menu.menu_me_scan, menu);
     }
 
@@ -332,7 +330,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), LocalVideoActivity.class));
                 break;
             case R.id.setting_rl:// 设置
-                  startActivity(new Intent(getActivity(), SettingActivity.class));
+                startActivity(new Intent(getActivity(), SettingActivity.class));
                 break;
             case R.id.app_scan_code_rl://APP二维码
                 ImageView imageView = new ImageView(getActivity());