代码冲突

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/utils/GridSelectDateActivity.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -36,14 +35,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-  * @desc:功能界面  表格选择界面
- *   自定义头部
-  * @author：Arison on 2017/11/1
-  */
+ * @desc:功能界面 表格选择界面
+ * 自定义头部
+ * @author：Arison on 2017/11/1
+ */
 public class GridSelectDateActivity extends OABaseActivity {
     ItemRoomsSelectAdapter itemAdapter;
     private GridView gvTopic;
-    private List<SBMenuModel> menuModels=new ArrayList<>();
+    private List<SBMenuModel> menuModels = new ArrayList<>();
     ArrayList<SelectBean> selectBeens = new ArrayList<SelectBean>();
     private TextView tvTopDate;
     private ImageView back;
@@ -56,14 +55,14 @@ public class GridSelectDateActivity extends OABaseActivity {
         initView();
         initEvent();
     }
-    
-    private void initView(){
+
+    private void initView() {
         View view = LayoutInflater.from(ct).inflate(R.layout.action_service_room, null);
-        tvTopDate =(TextView)view.findViewById(R.id.tvTopDate);
-        back=(ImageView)view.findViewById(R.id.book_service_search_back);
+        tvTopDate = (TextView) view.findViewById(R.id.tvTopDate);
+        back = (ImageView) view.findViewById(R.id.book_service_search_back);
         ActionBar bar = this.getSupportActionBar();
         bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        bar.setBackgroundDrawable( getResources().getDrawable(R.color.antionbarcolor));
+        bar.setBackgroundDrawable(getResources().getDrawable(R.color.antionbarcolor));
         bar.setCustomView(view);
 
         back.setOnClickListener(new View.OnClickListener() {
@@ -72,43 +71,73 @@ public class GridSelectDateActivity extends OABaseActivity {
                 onBackPressed();
             }
         });
-        if (getIntent()!=null){
-           selectBeens=getIntent().getParcelableArrayListExtra("data");
-           getSupportActionBar().setTitle(getIntent().getStringExtra("title"));
-           if (!ListUtils.isEmpty(selectBeens)){
-               for (int i = 0; i < selectBeens.size(); i++) {
-                   SelectBean selectBean=selectBeens.get(i);
-                   com.alibaba.fastjson.JSONObject object= JSON.parseObject(selectBean.getJson()) ;
-                   SBMenuModel menuModel=new SBMenuModel();
-                   menuModel.setUrl(object.getString("st_imageurl"));
-                   if (StringUtil.isEmpty(object.getString("st_name"))){
-                       menuModel.setTitle(object.getString("sm_username"));//医生
-                   }else{
-                       menuModel.setTitle(object.getString("st_name"));
-                   }
-                   menuModel.setCode(object.getString("sm_userid"));
-                   menuModel.setData(object.toJSONString());
-                   menuModels.add(menuModel);
-               }
-           }
+        if (getIntent() != null) {
+            selectBeens = getIntent().getParcelableArrayListExtra("data");
+            getSupportActionBar().setTitle(getIntent().getStringExtra("title"));
+            if (!ListUtils.isEmpty(selectBeens)) {
+                for (int i = 0; i < selectBeens.size(); i++) {
+                    SelectBean selectBean = selectBeens.get(i);
+                    com.alibaba.fastjson.JSONObject object = JSON.parseObject(selectBean.getJson());
+                    SBMenuModel menuModel = new SBMenuModel();
+                    menuModel.setUrl(object.getString("st_imageurl"));
+                    if (StringUtil.isEmpty(object.getString("st_name"))) {
+                        menuModel.setTitle(object.getString("sm_username"));//医生
+                    } else {
+                        menuModel.setTitle(object.getString("st_name"));
+                    }
+                    menuModel.setCode(object.getString("sm_userid"));
+                    menuModel.setData(object.toJSONString());
+                    menuModels.add(menuModel);
+                }
+            }
         }
-        LogUtil.d("GridSelectActivity","models:"+JSON.toJSONString(menuModels));
+        LogUtil.d("GridSelectActivity", "models:" + JSON.toJSONString(menuModels));
         itemAdapter = new ItemRoomsSelectAdapter(mContext, menuModels);
         gvTopic.setAdapter(itemAdapter);
+
+        itemAdapter.setmOnBookClickListener(new ItemRoomsSelectAdapter.OnBookClickListener() {
+            @Override
+            public void onBookClick(View view, int position) {
+                SBMenuModel menuModel = menuModels.get(position);
+                LogUtil.d(TAG, "按钮点击事件!");
+                ToastMessage("" + menuModel.getDesc() + menuModel.getTitle());
+
+                if (menuModel.isBooking()) {
+                    ToastMessage("包间已满，不可预订！");
+                } else {
+                    setResult(0x21, new Intent().putExtra("data", menuModel));
+                    finish();
+                }
+            }
+        });
+
+        itemAdapter.setmOnImageClickListener(new ItemRoomsSelectAdapter.OnImageClickListener() {
+            @Override
+            public void onImageClick(View view, int position) {
+                SBMenuModel menuModel = menuModels.get(position);
+                LogUtil.d(TAG, "图片点击事件!");
+                String loginUserId = menuModel.getUrl();
+                Intent intent = new Intent(activity, SingleImagePreviewActivity.class);
+                intent.putExtra(AppConstant.EXTRA_IMAGE_URI, loginUserId);
+                startActivity(intent);
+            }
+        });
     }
+
     private static final String TAG = "GridSelectActivity";
-    public void initEvent(){
+
+    public void initEvent() {
         tvTopDate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //弹出日期
                 startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                         .putExtra("hasMenu", false)
-                        .putExtra("bookType","0")
+                        .putExtra("bookType", "0")
                         .putExtra("type", 3), 0x01);
             }
         });
-        gvTopic.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        /*gvTopic.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 final ItemRoomsSelectAdapter.ViewHolder menuModel = (ItemRoomsSelectAdapter.ViewHolder) view.getTag();
@@ -116,13 +145,13 @@ public class GridSelectDateActivity extends OABaseActivity {
                     @Override
                     public void onClick(View v) {
 //                        ToastMessage("点击事件！");
-                        LogUtil.d(TAG,"按钮点击事件!");
-                        ToastMessage(""+menuModel.model.getDesc()+menuModel.model.getTitle());
+                        LogUtil.d(TAG, "按钮点击事件!");
+                        ToastMessage("" + menuModel.model.getDesc() + menuModel.model.getTitle());
 
-                        if (menuModel.model.isBooking()){
+                        if (menuModel.model.isBooking()) {
                             ToastMessage("包间已满，不可预订！");
-                        }else{
-                            setResult(0x21,new Intent().putExtra("data",menuModel.model));
+                        } else {
+                            setResult(0x21, new Intent().putExtra("data", menuModel.model));
                             finish();
                         }
                     }
@@ -131,8 +160,8 @@ public class GridSelectDateActivity extends OABaseActivity {
                 menuModel.ivItem.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        LogUtil.d(TAG,"图片点击事件!");
-                        String loginUserId =menuModel.model.getUrl();
+                        LogUtil.d(TAG, "图片点击事件!");
+                        String loginUserId = menuModel.model.getUrl();
                         Intent intent = new Intent(activity, SingleImagePreviewActivity.class);
                         intent.putExtra(AppConstant.EXTRA_IMAGE_URI, loginUserId);
                         startActivity(intent);
@@ -141,7 +170,7 @@ public class GridSelectDateActivity extends OABaseActivity {
 
 
             }
-        });
+        });*/
     }
 
     @Override
@@ -150,51 +179,51 @@ public class GridSelectDateActivity extends OABaseActivity {
         if (data == null) {
             return;
         }
-        switch (requestCode){
+        switch (requestCode) {
             case 0x01:
                 try {
                     String startTime = data.getStringExtra("startDate");
                     String displayDate = startTime;
                     tvTopDate.setText(displayDate);
-                    getBookingDataState(DateFormatUtil.getStrDate4Date(DateFormatUtil.getDate4StrDate(displayDate,"yyyyMMdd"),"yyyyMMdd"));
+                    getBookingDataState(DateFormatUtil.getStrDate4Date(DateFormatUtil.getDate4StrDate(displayDate, "yyyyMMdd"), "yyyyMMdd"));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
                 break;
         }
     }
-    
-    
-    public void getBookingDataState(String date){
-        LogUtil.d(TAG,"date:"+date);
+
+
+    public void getBookingDataState(String date) {
+        LogUtil.d(TAG, "date:" + date);
         //http://113.105.74.135:8092/user/appServiceBusytime?yearmonth=20171109&token=8a07b517fdd94248b7f00d120ab29502&commonid=0&type=餐饮&companyid=10002&client=Android%20Client
-          HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
-                 httpClient.Api().send(new HttpClient.Builder()
-                 .url("user/appServiceBusytime")
-                 .add("yearmonth",date)
-                 .add("commonid","0")
-                 .add("token", MyApplication.getInstance().mAccessToken)
-                 .method(Method.GET)
-                 .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
-          
-                     @Override
-                     public void onResponse(Object o) {
-                         try {
-                             LogUtil.d(TAG,o.toString());
-                             JSONArray reslut=JSON.parseObject(o.toString()).getJSONArray("reslut");
-                             if (reslut!=null){
-                                 for (int i = 0; i <reslut.size() ; i++) {
-                                     JSONObject object=reslut.getJSONObject(i);
-                                  
-                                 }
-                             }
-                             
-                         } catch (Exception e) {
-                             e.printStackTrace();
-                         }
-
-
-                     }
-                 }));
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appServiceBusytime")
+                .add("yearmonth", date)
+                .add("commonid", "0")
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(), new ResultSubscriber<Object>(new ResultListener<Object>() {
+
+            @Override
+            public void onResponse(Object o) {
+                try {
+                    LogUtil.d(TAG, o.toString());
+                    JSONArray reslut = JSON.parseObject(o.toString()).getJSONArray("reslut");
+                    if (reslut != null) {
+                        for (int i = 0; i < reslut.size(); i++) {
+                            JSONObject object = reslut.getJSONObject(i);
+
+                        }
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+
+            }
+        }));
     }
 }

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

@@ -23,10 +23,20 @@ public class ItemRoomsSelectAdapter extends BaseAdapter {
 
     private Context context;
     private LayoutInflater layoutInflater;
+    private OnImageClickListener mOnImageClickListener;
+    private OnBookClickListener mOnBookClickListener;
 
-    public ItemRoomsSelectAdapter(Context context,List<SBMenuModel> data) {
+    public void setmOnImageClickListener(OnImageClickListener mOnImageClickListener) {
+        this.mOnImageClickListener = mOnImageClickListener;
+    }
+
+    public void setmOnBookClickListener(OnBookClickListener mOnBookClickListener) {
+        this.mOnBookClickListener = mOnBookClickListener;
+    }
+
+    public ItemRoomsSelectAdapter(Context context, List<SBMenuModel> data) {
         this.context = context;
-        this.objects=data;
+        this.objects = data;
         this.layoutInflater = LayoutInflater.from(context);
     }
 
@@ -51,29 +61,48 @@ public class ItemRoomsSelectAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_rooms_select, null);
             convertView.setTag(new ViewHolder(convertView));
         }
-        initializeViews((SBMenuModel)getItem(position), (ViewHolder) convertView.getTag());
+        initializeViews((SBMenuModel) getItem(position), (ViewHolder) convertView.getTag(), position);
         return convertView;
     }
 
-    private void initializeViews(SBMenuModel object, ViewHolder holder) {
-        if(StringUtil.isEmpty(object.getUrl())){
-            AvatarHelper.getInstance().display(object.getCode(), holder.ivItem, true,true);
-        }else{
+    private void initializeViews(SBMenuModel object, ViewHolder holder, final int position) {
+        if (StringUtil.isEmpty(object.getUrl())) {
+            AvatarHelper.getInstance().display(object.getCode(), holder.ivItem, true, true);
+        } else {
             AvatarHelper.getInstance().display(object.getUrl(), holder.ivItem, true);
         }
         holder.tvName.setText(object.getTitle());
-        holder.model=object;
-        if (object.isBooking()){
+        holder.model = object;
+        if (object.isBooking()) {
             holder.tvBookAction.setText("已预定");
             holder.tvBookAction.setBackgroundResource(R.color.item_line);
-        }else{
+        } else {
             holder.tvBookAction.setBackgroundResource(R.drawable.bg_bule_btn);
             holder.tvBookAction.setText("预定");
         }
+
+        holder.ivItem.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnImageClickListener != null) {
+                    mOnImageClickListener.onImageClick(v, position);
+                }
+            }
+        });
+
+        holder.tvBookAction.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnBookClickListener != null) {
+                    mOnBookClickListener.onBookClick(v, position);
+                }
+            }
+        });
+
     }
 
     public class ViewHolder {
-        public  RelativeLayout rlImage;
+        public RelativeLayout rlImage;
         public ImageView ivItem;
         private TextView tvName;
         public TextView tvBookAction;
@@ -82,9 +111,17 @@ public class ItemRoomsSelectAdapter extends BaseAdapter {
         public ViewHolder(View view) {
             rlImage = (RelativeLayout) view.findViewById(R.id.rlImage);
             tvName = (TextView) view.findViewById(R.id.tvName);
-            ivItem=(ImageView) view.findViewById(R.id.ivItem);
-            tvBookAction=(TextView) view.findViewById(R.id.tvBookAction);
-            
+            ivItem = (ImageView) view.findViewById(R.id.ivItem);
+            tvBookAction = (TextView) view.findViewById(R.id.tvBookAction);
+
         }
     }
+
+    public interface OnImageClickListener {
+        void onImageClick(View view, int position);
+    }
+
+    public interface OnBookClickListener {
+        void onBookClick(View view, int position);
+    }
 }