代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -237,10 +237,18 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                 loadListData(pageSize);
             }
         });
+        
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                SBListModel model = mListAdapter.getItem((int) id);
+                final SBListModel model = mListAdapter.getItem((int) id);
+//                ItemBserviceListAdapter.ViewHolder viewHolder= (ItemBserviceListAdapter.ViewHolder) view.getTag();
+//                viewHolder.tvCash.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+//                        CommonUtil.phoneAction(mContext,model.getPhone());
+//                    }
+//                });
                 Intent intent = null;
                 if (model.getType().equals("会所") || model.getType().equals("美容美发")) {
                     intent = new Intent(ct, BServiceDetailActivity.class);

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemBserviceHeaderAdapter.java

@@ -69,9 +69,9 @@ public class ItemBserviceHeaderAdapter extends BaseAdapter {
 
     public class ViewHolder {
         public SBMenuModel menuModel;
-        private TextView tvTitle;
-        private TextView tvDesc;
-        private CircleImageView ivMenu;
+        public TextView tvTitle;
+        public TextView tvDesc;
+        public CircleImageView ivMenu;
 
         public ViewHolder(View view) {
             tvTitle = (TextView) view.findViewById(R.id.tv_title);

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemBserviceListAdapter.java

@@ -14,6 +14,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.modular.booking.R;
 import com.modular.booking.activity.services.BServiceAddActivity;
@@ -79,6 +80,12 @@ public class ItemBserviceListAdapter extends BaseAdapter {
         holder.tvType.setText(object.getType());
         holder.tvDistance.setText(object.getDistance());
         holder.tvCash.setText(object.getCash());
+        holder.tvCash.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.phoneAction(context,object.getPhone());
+            }
+        });
         holder.model=object;
         holder.btBook.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -96,14 +103,14 @@ public class ItemBserviceListAdapter extends BaseAdapter {
         });
     }
 
-    protected class ViewHolder {
+    public class ViewHolder {
         private SBListModel model;
         private ImageView ivIcon;
         private TextView tvTitle;
         private TextView tvType;
         private TextView tvStart;
         private TextView tvDistance;
-        private TextView tvCash;
+        public TextView tvCash;
         private Button btBook;
 
         public ViewHolder(View view) {

app_modular/appbooking/src/main/res/layout/item_bservice_list.xml

@@ -101,6 +101,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_tel"
+                android:padding="5dp"
                 android:layout_weight="1"
                 android:text="1328349823"
                 android:textColor="@color/light_green" />