代码冲突

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

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

@@ -340,7 +340,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
         String url = Constants.IM_BASE_URL() + "user/appBookingList";
         Map<String, Object> params = new HashMap<>();
         params.put("token",  UserSp.getInstance(MyApplication.getInstance()).getAccessToken(""));
-        params.put("userid", UserSp.getInstance(MyApplication.getInstance()).getUserId(""));
+        params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
         params.put("telephone",  UserSp.getInstance(MyApplication.getInstance()).getTelephone(""));
         params.put("yearmonth", DateFormatUtil.getStrDate4Date(curDate, "yyyyMM"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

app_core/common/src/main/java/com/core/app/AppConfig.java

@@ -6,6 +6,7 @@ import android.content.SharedPreferences.Editor;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.common.config.BaseConfig;
 import com.core.model.ConfigBean;
 
 public class AppConfig {
@@ -178,6 +179,9 @@ public class AppConfig {
 
     private static void initApiUrls(AppConfig config) {
         String apiUrl = config.apiUrl;
+        if (BaseConfig.isDebug()){
+            apiUrl=Constants.IM_BASE_URL();
+        }
         /* 登陆注册 */
         config.USER_REGISTER = apiUrl + "user/register";// 注册
         config.VERIFY_TELEPHONE = apiUrl + "verify/telephone";// 验证手机号有没有被注册

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

@@ -48,7 +48,9 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.booking.R;
+import com.modular.booking.activity.utils.GridSelectActivity;
 import com.modular.booking.model.SBListModel;
+import com.modular.booking.model.SBMenuModel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -512,18 +514,58 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 tv.setText(number.substring(0, number.length() - 1));
                 break;
             case SERVICE_SELECT:
-            case MAN_SELECT:
-                SelectBean service = data.getParcelableExtra("data");
-                if (service != null && service.getName() != null) {
-                    LogUtil.i("service=" + JSON.toJSONString(service));
-                    tvMessage = service.getName();
-                    serviceId = service.getFields();
-                    serviceName = service.getName();
+                try {
+                    SBMenuModel menuModel= data.getParcelableExtra("data");
+                    JSONObject object=  JSON.parseObject(menuModel.getData());
+                    //sm_userid
+                    //sm_username
+                    tvMessage = object.getString("st_name");
+                    serviceId = object.getString("st_id");
+                    serviceName = object.getString("st_name");
                     if (tv != null) {
                         tv.setTag(R.id.tag_id, serviceId);
                         tv.setTag(R.id.tag_id2, serviceName);
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+            case MAN_SELECT:
+                try {
+                    SBMenuModel menuModel= data.getParcelableExtra("data");
+                    JSONObject object=  JSON.parseObject(menuModel.getData());
+                    //sm_userid
+                    //sm_username
+                    if (model.getIndustrycode().equals("10001")) {
+                        //医生
+                        tvMessage = object.getString("sm_username");
+                        serviceId = object.getString("sm_userid");
+                        serviceName = object.getString("sm_username");
+                    }else{
+                        //其它
+                        tvMessage = object.getString("st_name");
+                        serviceId = object.getString("st_id");
+                        serviceName = object.getString("st_name");
+                    }
+                  
+                    if (tv != null) {
+                          tv.setTag(R.id.tag_id, serviceId);
+                          tv.setTag(R.id.tag_id2, serviceName);
+                      }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
+//                SelectBean service = data.getParcelableExtra("data");
+//                if (service != null && service.getName() != null) {
+//                    LogUtil.i("service=" + JSON.toJSONString(service));
+//                    tvMessage = service.getName();
+//                    serviceId = service.getFields();
+//                    serviceName = service.getName();
+//                    if (tv != null) {
+//                        tv.setTag(R.id.tag_id, serviceId);
+//                        tv.setTag(R.id.tag_id2, serviceName);
+//                    }
+//                }
                 break;
         }
         if (tvMessage != null && tv != null) {
@@ -566,11 +608,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                             bean.setFields(String.valueOf(id));
                             bean.setName(name);
                             bean.setObject(object.toJSONString());
+                            bean.setJson(object.toJSONString());
                             selectBeens.add(bean);
                         }
                     }
                     if (!ListUtils.isEmpty(selectBeens)) {
-                        Intent intent = new Intent(ct, SelectActivity.class)
+                        Intent intent = new Intent(ct, GridSelectActivity.class)
                                 .putExtra("type", 2)
                                 .putExtra("title", title)
                                 .putParcelableArrayListExtra("data", selectBeens);
@@ -616,11 +659,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                             bean.setId(id);
                             bean.setFields(String.valueOf(id));
                             bean.setName(name);
+                            bean.setJson(object.toJSONString());
                             selectBeens.add(bean);
                         }
                     }
                     if (!ListUtils.isEmpty(selectBeens)) {
-                        Intent intent = new Intent(ct, SelectActivity.class)
+                        Intent intent = new Intent(ct, GridSelectActivity.class)
                                 .putExtra("type", 2)
                                 .putExtra("title", title)
                                 .putParcelableArrayListExtra("data", selectBeens);

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

@@ -212,7 +212,7 @@ public class BServiceListActivity extends OABaseActivity {
                             LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
                             sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));
-                            sbListModel.setCash("免费");
+                            sbListModel.setCash(mObject.getString("sc_telephone"));
                             sbListModel.setCompanyid(mObject.getString("sc_uu"));
                             sbListModel.setImid(mObject.getString("sc_imid"));
                             sbListModel.setId(mObject.getInteger("sc_id"));

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

@@ -192,7 +192,7 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
                                 LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                                 float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
                                 sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));
-                                sbListModel.setCash("免费");
+                                sbListModel.setCash(mObject.getString("sc_telephone"));
                                 sbListModel.setImid(mObject.getString("sc_imid"));
                                 sbListModel.setId(mObject.getInteger("sc_id"));
                                 sbListModel.setStarttime(mObject.getString("sc_starttime"));

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

@@ -354,7 +354,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                                 LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                                 float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
                                 sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance, "#.0")));
-                                sbListModel.setCash("免费");
+                                sbListModel.setCash(mObject.getString("sc_telephone"));
                                 sbListModel.setImid(mObject.getString("sc_imid"));
                                 sbListModel.setId(mObject.getInteger("sc_id"));
                                 sbListModel.setStarttime(mObject.getString("sc_starttime"));

app_modular/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectActivity.java

@@ -1,18 +1,78 @@
 package com.modular.booking.activity.utils;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.GridView;
 
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.core.base.OABaseActivity;
+import com.core.model.SelectBean;
+import com.modular.booking.R;
+import com.modular.booking.adapter.ItemRoomsSelectAdapter;
+import com.modular.booking.model.SBMenuModel;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
   * @desc:功能界面  表格选择界面
   * @author：Arison on 2017/11/1
   */
 public class GridSelectActivity extends OABaseActivity {
-    
-    
+    ItemRoomsSelectAdapter itemAdapter;
+    private GridView gvTopic;
+    private List<SBMenuModel> menuModels=new ArrayList<>();
+    ArrayList<SelectBean> selectBeens = new ArrayList<SelectBean>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_grid_select);
+        gvTopic = (GridView) findViewById(R.id.gv_topic);
+        initView();
+        initEvent();
+    }
+    
+    private void initView(){
+        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));
+        itemAdapter = new ItemRoomsSelectAdapter(mContext, menuModels);
+        gvTopic.setAdapter(itemAdapter);
+    }
+    private static final String TAG = "GridSelectActivity";
+    public void initEvent(){
+        gvTopic.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                ItemRoomsSelectAdapter.ViewHolder menuModel = (ItemRoomsSelectAdapter.ViewHolder) view.getTag();
+                LogUtil.d(TAG ,JSON.toJSONString(menuModel.model));
+                setResult(0x21,new Intent().putExtra("data",menuModel.model));
+                finish();
+            }
+        });
     }
 }

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

@@ -110,7 +110,7 @@ public class ItemBserviceListAdapter extends BaseAdapter {
             ivIcon = (ImageView) view.findViewById(R.id.iv_icon);
             tvTitle = (TextView) view.findViewById(R.id.tvTitle);
             tvType = (TextView) view.findViewById(R.id.tvType);
-            tvStart = (TextView) view.findViewById(R.id.tvStart);
+           // tvStart = (TextView) view.findViewById(R.id.tvStart);
             tvDistance = (TextView) view.findViewById(R.id.tvDistance);
             tvCash = (TextView) view.findViewById(R.id.tvCash);
             btBook = (Button) view.findViewById(R.id.btBook);

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

@@ -0,0 +1,81 @@
+package com.modular.booking.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.common.data.StringUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.modular.booking.R;
+import com.modular.booking.model.SBMenuModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ItemRoomsSelectAdapter extends BaseAdapter {
+
+    private List<SBMenuModel> objects = new ArrayList<SBMenuModel>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public ItemRoomsSelectAdapter(Context context,List<SBMenuModel> data) {
+        this.context = context;
+        this.objects=data;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public SBMenuModel getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_rooms_select, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((SBMenuModel)getItem(position), (ViewHolder) convertView.getTag());
+        return convertView;
+    }
+
+    private void initializeViews(SBMenuModel object, ViewHolder holder) {
+        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;
+    }
+
+    public class ViewHolder {
+        private RelativeLayout rlItem;
+        private ImageView ivItem;
+        private TextView tvName;
+       public SBMenuModel model;
+
+        public ViewHolder(View view) {
+            rlItem = (RelativeLayout) view.findViewById(R.id.rlItem);
+            tvName = (TextView) view.findViewById(R.id.tvName);
+            ivItem=(ImageView) view.findViewById(R.id.ivItem);
+            
+        }
+    }
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/SBMenuModel.java

@@ -16,6 +16,7 @@ public class SBMenuModel implements Parcelable {
     private int descColor;
     private String desc;
     private String url;
+    private String data;
 
     public int getIcon() {
         return icon;
@@ -65,6 +66,16 @@ public class SBMenuModel implements Parcelable {
         this.descColor = descColor;
     }
 
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public SBMenuModel() {
+    }
 
     @Override
     public int describeContents() {
@@ -79,9 +90,7 @@ public class SBMenuModel implements Parcelable {
         dest.writeInt(this.descColor);
         dest.writeString(this.desc);
         dest.writeString(this.url);
-    }
-
-    public SBMenuModel() {
+        dest.writeString(this.data);
     }
 
     protected SBMenuModel(Parcel in) {
@@ -91,9 +100,10 @@ public class SBMenuModel implements Parcelable {
         this.descColor = in.readInt();
         this.desc = in.readString();
         this.url = in.readString();
+        this.data = in.readString();
     }
 
-    public static final Parcelable.Creator<SBMenuModel> CREATOR = new Parcelable.Creator<SBMenuModel>() {
+    public static final Creator<SBMenuModel> CREATOR = new Creator<SBMenuModel>() {
         @Override
         public SBMenuModel createFromParcel(Parcel source) {
             return new SBMenuModel(source);

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

@@ -2,13 +2,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <com.core.widget.NScrollerGridView
+    <GridView
         android:id="@+id/gv_topic"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
         android:horizontalSpacing="15dp"
-        android:numColumns="4"
+        android:numColumns="2"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:paddingTop="5dp"

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

@@ -28,5 +28,6 @@
         android:layout_height="45dp"
         android:layout_marginBottom="10dp"
         android:background="@null"
-        android:src="@drawable/defaultpic"></de.hdodenhof.circleimageview.CircleImageView>
+        android:src="@drawable/defaultpic">
+    </de.hdodenhof.circleimageview.CircleImageView>
 </LinearLayout>

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

@@ -14,6 +14,7 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_margin="10dp"
+        android:scaleType="fitXY"
         android:src="@drawable/defaultpic" />
 
     <LinearLayout
@@ -46,17 +47,35 @@
                 android:textSize="10sp" />
         </LinearLayout>
 
+        <!--<LinearLayout-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:orientation="horizontal">-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tvStart"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_weight="1"-->
+                <!--android:text="****" />-->
+        <!--</LinearLayout>-->
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <TextView
+            <RatingBar
                 android:id="@+id/tvStart"
+                style="@android:style/Widget.Holo.RatingBar.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="****" />
+                android:numStars="5"
+                android:progressTint="#f5c814"
+                android:rating="5"
+                android:secondaryProgressTint="#f5c814"
+                android:stepSize="0"
+                tools:ignore="NewApi" />
         </LinearLayout>
 
         <LinearLayout
@@ -81,8 +100,9 @@
                 android:id="@+id/tvCash"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/icon_tel"
                 android:layout_weight="1"
-                android:text="58代100"
+                android:text="1328349823"
                 android:textColor="@color/light_green" />
 
             <Button

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:gravity="center_vertical"
               android:orientation="horizontal">
@@ -50,14 +51,15 @@
 
             <RatingBar
                 android:id="@+id/bservice_storeman_rate_rb"
-                style="?android:attr/ratingBarStyleSmall"
+                style="@android:style/Widget.Holo.RatingBar.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:numStars="5"
                 android:progressTint="#f5c814"
+                android:rating="5"
                 android:secondaryProgressTint="#f5c814"
-                android:numStars="5"
-                android:rating="3.5"
-                android:stepSize="0.1" />
+                android:stepSize="0"
+                tools:ignore="NewApi" />
         </LinearLayout>
 
         <LinearLayout

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

@@ -1,7 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" 
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rlItem"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</LinearLayout>
+    android:layout_height="match_parent"
+    android:background="@color/white">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="150dp">
+    <ImageView
+        android:id="@+id/ivItem"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY" />
+    <TextView
+        android:id="@+id/tvName"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:textSize="16sp"
+        android:gravity="center"
+        android:layout_alignParentBottom="true"
+        android:textColor="@color/white"
+        android:textStyle="bold"
+        android:background="#80000000"
+        android:text="服务项目"
+        />
+    </RelativeLayout>
+</RelativeLayout>

app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

@@ -12,6 +12,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.LogUtil;
@@ -201,6 +202,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 boolean success = false;
                 if (result.getResultCode() == Result.CODE_SUCCESS) {
+                    LogUtil.d("HttpLogs", "IM login:"+JSON.toJSONString(result));
                     success = LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, result);// 设置登陆用户信息
                 }
                 if (success) {