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

WeiChat/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
 //定义时间
 def releaseTime() {
-    return new Date().format("yyyyMMddHHmmss")
+    return new Date().format("yyyyMMdd.HHmm.ss")
 }
 //设置发布的显示的版本号
 def getVersionName(){
@@ -61,33 +61,31 @@ android {
             signingConfig signingConfigs.config
         }
     }
-
-    // 友盟多渠道打包
+    
     productFlavors {   
-//        wandoujia {}
-//        _360 {}
+        wandoujia {}
+        _360 {}
         baidu {}
-//        xiaomi {}
-//        tencent {}
-//        taobao {}
+        xiaomi {}
+        tencent {}
+        taobao {}
     }
 
     productFlavors.all {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
-    //给apk添加对应的版本号：这里暂时注释但保留
-    //配置自定义打包名称
+    
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             def fileName
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
-                    variant.mergedFlavor.versionName = getVersionName()+"."+releaseTime()
-                    fileName = "UU互联_${variant.mergedFlavor.versionName}_release.apk"
+                    variant.mergedFlavor.versionName = getVersionName()+"_"+variant.productFlavors[0].name
+                    fileName = "WeiChat_${variant.mergedFlavor.versionName}_release.apk"
                 } else if (variant.buildType.name.equals('debug')) {
-                    variant.mergedFlavor.versionName = getVersionName()+"."+releaseTime()
-                    fileName = "UU互联_${variant.mergedFlavor.versionName}_debug.apk"
+                    variant.mergedFlavor.versionName = getVersionName()+"_"+releaseTime()+ "_"+variant.productFlavors[0].name
+                    fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
                 }
                 output.outputFile = new File(outputFile.parent, fileName)
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/UserRoleUtils.java

@@ -74,7 +74,7 @@ public class UserRoleUtils {
                         view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
                     }
                     if (fragment instanceof WorksFragment){
-                        view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
+                       // view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
                         view.findViewById(R.id.my_client_rl).setVisibility(View.GONE);
                         view.findViewById(R.id.setting_rl).setVisibility(View.GONE);
                     }

WeiChat/src/main/res/drawable/bg_bule_btn.xml

@@ -3,21 +3,21 @@
     <item android:state_pressed="true">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="3dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="3dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>
         <shape>
             <solid android:color="@color/titleBlue" />
-            <corners android:radius="8dp" />
+            <corners android:radius="3dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

app_core/common/src/main/java/com/core/api/wxapi/ApiPlatform.java

@@ -1,7 +1,5 @@
 package com.core.api.wxapi;
 
-import android.util.Log;
-
 import com.common.config.BaseConfig;
 
 
@@ -11,21 +9,16 @@ import com.common.config.BaseConfig;
  * 在ApiModel中定义公共逻辑方法
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
-    //    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
-//    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
     private String mBaseUrl = "";
 
     public ApiPlatform() {
-        if (!BaseConfig.isDebug()) {
+        if (BaseConfig.isDebug()) {
             mBaseUrl = "http://uas.ubtob.com/";
-            super.login = "https://uas.ubtob.com/sso/login";
+            super.login = "https://account.ubtob.com/sso/login";
         } else {
             mBaseUrl = "http://uas.ubtob.com/";
-            super.login = "https://uas.ubtob.com/sso/login";
-//            mBaseUrl = "http://218.17.158.219:9090/platform-b2b/";
-//            super.login = "http://113.105.74.135:8001/sso/login";
+            super.login = "https://account.ubtob.com/sso/login";
         }
-        Log.i("fang", mBaseUrl + "," + login);
         //审批流
         super.getAuditDone = mBaseUrl + "mobile/approvalflow/getAuditDone";
         //通讯录人员列表

app_core/common/src/main/res/drawable/bg_bule_btn.xml

@@ -3,21 +3,21 @@
     <item android:state_pressed="true">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="1dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
             <solid android:color="@color/btn_orange_press" />
-            <corners android:radius="8dp" />
+            <corners android:radius="1dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>
         <shape>
             <solid android:color="@color/titleBlue" />
-            <corners android:radius="8dp" />
+            <corners android:radius="1dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -319,7 +319,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     private String  bmanid;
     public void getApiData(){
         showLoading();
-        HttpClient httpClient=new HttpClient.Builder("http://113.105.74.140:8092/").build();
+        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
         httpClient.Api()
                 .send(new HttpClient.Builder().url("user/appBusinessDetail")
                         .add("id", model.getAb_id())

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

@@ -195,7 +195,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 LogUtil.i(model.toString());
                 initType(model.getType());
                 if (isEdited) {
-                    submit_btn.setText("提交");
+                    submit_btn.setText("立即预约");
                     if (!StringUtil.isEmpty(sb_userid)) {
                         AvatarHelper.getInstance().displayAvatar(sb_userid, iv_header, true);
                         AvatarHelper.getInstance().displayAvatar(sb_userid, max_img, true);
@@ -219,11 +219,23 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     String sb_imageurl = object.getString("sc_imageurl");
                     sb_userid = object.getString("sb_userid");
                     sb_username = object.getString("sb_username");
-                    if ("已取消".equals(sb_status)) {
+                    //已取消，已确认，已结束
+                    if ("已取消".equals(sb_status)||"已结束".equals(sb_status)) {
                         submit_btn.setVisibility(View.GONE);
-                    } else {
-                        submit_btn.setVisibility(View.VISIBLE);
+                    } else if ("已确认".equals(sb_status)){
+                        if (!StringUtil.isEmpty(dataService)) {
+                            String recordId = object.getString("sb_recordid");
+                            if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
+                                submit_btn.setVisibility(View.VISIBLE);
+                                submit_btn.setText("取消");
+                            } else {
+                                submit_btn.setVisibility(View.VISIBLE);
+                                submit_btn.setText("释放");
+                            }
+                        }
                     }
+                    
+                 
                     if (!StringUtil.isEmpty(sb_userid)) {
                         AvatarHelper.getInstance().displayAvatar(sb_userid, iv_header, true);
                         AvatarHelper.getInstance().displayAvatar(sb_userid, max_img, true);
@@ -241,7 +253,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         AvatarHelper.getInstance().display(sb_imageurl, max_img, true);
                     }
 
-                    submit_btn.setText("取消");
+                    
                 }
 
                 getSupportActionBar().setTitle(model.getName());
@@ -470,7 +482,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 ToastUtil.showToast(ct, "请先选择科室");
             }
         } else if (id == R.id.submit_btn) {
-            if (((Button) v).getText().equals("提交")) {
+            if (((Button) v).getText().equals("立即预约")) {
                 save();
             } else if (((Button) v).getText().equals("取消")) {
                 if (!StringUtil.isEmpty(dataService)) {
@@ -480,6 +492,18 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         cancle(String.valueOf(model.getId()));
                     } else {
                         ToastMessage("商家不可取消预约！");
+                    } 
+                }
+            }else if(((Button) v).getText().equals("释放")){
+                if (!StringUtil.isEmpty(dataService)) {
+                    JSONObject object = JSON.parseObject(dataService);
+                    String recordId = object.getString("sb_recordid");
+                    if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
+//                        cancle(String.valueOf(model.getId()));
+                        ToastMessage("只有商家可以释放！");
+                    } else {
+                        //商家释放
+                       release();
                     }
                 }
             }
@@ -1333,4 +1357,29 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         dialog.show();
 
     }
+    
+    
+    //商家释放预约接口
+    public void release(){
+        Map<String,Object> map=new HashMap<>();
+        if (!StringUtil.isEmpty(dataService)){
+            JSONObject object=JSON.parseObject(dataService);
+            map.put("sb_status","已结束");
+            map.put("sb_id",object.getString("sb_id"));
+         }
+          LogUtil.d(TAG,JSON.toJSONString(map));
+          HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
+                 httpClient.Api().send(new HttpClient.Builder()
+                 .url("user/appServiceUpdate")
+                 .add("map",JSON.toJSONString(map))
+                 .add("token",MyApplication.getInstance().mAccessToken)
+                 .method(Method.POST)
+                 .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
+          
+                     @Override
+                     public void onResponse(Object o) {
+                         
+                     }
+                 }));
+    }
 }

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

@@ -511,27 +511,35 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                     switch (position) {
                         case 0:
                            loadSeachData("500",pageSize);
+                           tv_distance.setText("0.5km");
                             break;
                         case 1:
                             loadSeachData("1000",pageSize);
+                            tv_distance.setText("1km");
                             break;
                         case 2:
                             loadSeachData("2000",pageSize);
+                            tv_distance.setText("2km");
                             break;
                         case 3:
                             loadSeachData("5000",pageSize);
+                            tv_distance.setText("5km");
                             break;
                         case 4:
                             loadSeachData("10000",pageSize);
+                            tv_distance.setText("10km");
                             break;
                         case 5:
                             loadSeachData("20000",pageSize);
+                            tv_distance.setText("20km");
                             break;
                         case 6:
                             loadSeachData("30000",pageSize);
+                            tv_distance.setText("30km");
                             break;
                         case 7:
                           loadListData(pageSize);
+                            tv_distance.setText("全部");
                             break;
                         default:
                             break;

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/item_line"
+    android:background="#EBE9EA"
     android:orientation="vertical">
     <!--android:layout_marginTop="80dp"-->
     <com.core.widget.view.MyGridView
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:horizontalSpacing="0.5dp"
-        android:background="@color/item_line"
+        android:background="#EBE9EA"
         android:numColumns="3"
         android:paddingTop="5dp"
         android:scrollbars="none"

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

@@ -42,7 +42,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="center"
+                android:gravity="right"
                 android:text="餐饮"
                 android:textSize="10sp" />
         </LinearLayout>

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

@@ -433,8 +433,10 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 doUpdate();
             else
                 doSaveDatasList();
-        } else
-            sendPictureRequest(mPhotoList.get(now_p));
+        } else{
+            if (now_p < mPhotoList.size())
+                sendPictureRequest(mPhotoList.get(now_p));
+        }
 
     }