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

# Conflicts:
#	WeiChat/version.properties

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

@@ -489,7 +489,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_crm, menu);
+        getMenuInflater().inflate(R.menu.menu_crm, menu);
         return true;
     }
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Oct 18 11:24:42 CST 2018
-debugName=930
-versionName=654
-debugCode=930
-versionCode=194
+#Thu Oct 18 17:22:43 CST 2018
+debugName=932
+versionName=645
+debugCode=932
+versionCode=195

app_core/common/src/main/assets/work_menu.json

@@ -264,16 +264,7 @@
         "caller": "",
         "isHide": false
       },
-      {
-        "isLocalMenu": true,
-        "menuName": "str_work_customer_link",
-        "menuIcon": "icon_crm_contact",
-        "menuActivity": "com.modular.work.ContactsListActivity",
-        "menuTag": "local_customer_link",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
-      },
+     
       {
         "isLocalMenu": true,
         "menuName": "str_work_customer_manage",
@@ -313,16 +304,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "新商机管理",
-        "menuIcon": "",
-        "menuActivity": "com.modular.work.BusinessManageHomeActivity",
-        "menuTag": "local_business_manage",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   },

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -425,8 +425,8 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             intent.putExtra(AppConstant.EXTRA_TITLE, getString(R.string.use_help));
             startActivity(intent);
         } else if (v.getId() == R.id.about_us_rl) {
-            //startActivity(new Intent(mContext, AboutActivity.class));
-           startActivity(new Intent("com.modular.work.ContactsListActivity"));
+            startActivity(new Intent(mContext, AboutActivity.class));
+          // startActivity(new Intent("com.modular.work.ContactsListActivity"));
         } else if (v.getId() == R.id.share_rl) {
             share();
         } else if (v.getId() == R.id.rl_app_update) {

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailActivty.java

@@ -43,7 +43,6 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appworks.CRM.erp.model.Business;
 import com.uas.appworks.R;
-import com.uas.appworks.activity.businessManage.businessDetailActivity.BusinessDetailNewActivity;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -130,14 +129,14 @@ public class BusinessDetailActivty extends BaseActivity {
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                /*final BussinessDetailAdapter.OldViewHolder holder = (BussinessDetailAdapter.OldViewHolder) view.getTag();
+                final BussinessDetailAdapter.OldViewHolder holder = (BussinessDetailAdapter.OldViewHolder) view.getTag();
                 startActivity(new Intent(BusinessDetailActivty.this, BusinessDetailInfoActivity.class)
                         .putExtra("type", holder.type)
                         .putExtra("formCondition", formCondition + "=" + holder.bc_id)
                         .putExtra("gridCondition", gridCondition + "=" + holder.bc_id)
                         .putExtra("id", holder.bc_id)
-                );*/
-                try {
+                );
+                /*try {
                     int itemAtPosition = (int) parent.getItemIdAtPosition(position);
                     Business business = mData.get(itemAtPosition);
                     startActivity(new Intent(mContext, BusinessDetailNewActivity.class)
@@ -148,7 +147,7 @@ public class BusinessDetailActivty extends BaseActivity {
                             .putExtra(Constants.FLAG.COMMON_WHICH_PAGE, "businessCompany"));
                 } catch (Exception e) {
 
-                }
+                }*/
             }
         });