feature 修复手机号码验证表达式错误的问题

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

@@ -16,6 +16,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.utils.BaiduMapUtil;
+import com.core.utils.DistanceUtils;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -125,7 +126,7 @@ public class BServiceListActivity extends OABaseActivity {
                             String sc_longitude=mObject.getString("sc_longitude");
                             LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
-                            sbListModel.setDistance(String.valueOf(distance));
+                            sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));
                             sbListModel.setCash("免费");
                             sbListModel.setCompanyid(mObject.getString("sc_uu"));
                             sbListModel.setImid(mObject.getString("sc_imid"));

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

@@ -22,6 +22,7 @@ import com.core.base.OABaseActivity;
 import com.core.interfac.OnVoiceCompleteListener;
 import com.core.utils.BaiduMapUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.DistanceUtils;
 import com.core.utils.ToastUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
@@ -151,7 +152,7 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
                                 String sc_longitude=mObject.getString("sc_longitude");
                                 LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                                 float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
-                                sbListModel.setDistance(String.valueOf(distance));
+                                sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));
                                 sbListModel.setCash("免费");
                                 sbListModel.setImid(mObject.getString("sc_imid"));
                                 sbListModel.setId(mObject.getInteger("sc_id"));

app_modular/appbooking/src/main/java/com/modular/booking/widget/ObservableScrollView.java

@@ -0,0 +1,54 @@
+package com.modular.booking.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * 监听滑动事件
+ * Created by Arison on 2017/10/17.
+ */
+public class ObservableScrollView extends ScrollView {
+    /**
+     * 回调接口监听事件
+     */
+    private OnObservableScrollViewListener mOnObservableScrollViewListener;
+
+    public ObservableScrollView(Context context) {
+        super(context);
+    }
+
+    public ObservableScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ObservableScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    
+    public interface OnObservableScrollViewListener {
+        void onObservableScrollViewListener(int l, int t, int oldl, int oldt);
+    }
+
+    /**
+     * This is called in response to an internal scroll in this view (i.e., the
+     * view scrolled its own contents). This is typically as a result of
+     * {@link #scrollBy(int, int)} or {@link #scrollTo(int, int)} having been
+     * called.
+     *
+     * @param l Current horizontal scroll origin. 当前滑动的x轴距离
+     * @param t Current vertical scroll origin. 当前滑动的y轴距离
+     * @param oldl Previous horizontal scroll origin. 上一次滑动的x轴距离
+     * @param oldt Previous vertical scroll origin. 上一次滑动的y轴距离
+     */
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        if (mOnObservableScrollViewListener != null) {
+            //将监听到的数据向外抛
+            mOnObservableScrollViewListener.onObservableScrollViewListener(l, t, oldl, oldt);
+        }
+    }
+    
+}

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

@@ -31,7 +31,7 @@
                     android:id="@+id/max_img"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:alpha="0.7"
+                    android:alpha="0.16"
                     android:scaleType="fitXY" />
                 <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/iv_header"
@@ -58,15 +58,16 @@
                         android:id="@+id/tv_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/white"
+                        android:textColor="@color/black"
+                        android:textStyle="bold"
                         android:text="********"
-                        android:textSize="18sp"/>
+                        android:textSize="20sp"/>
 
                     <TextView
                         android:id="@+id/tv_sub"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/white"
+                        android:textColor="@color/black"
                         android:text="********"
                         android:textSize="14sp"/>
                 </LinearLayout>

app_modular/appme/src/main/java/com/uas/appme/other/activity/BasicInfoActivity.java

@@ -533,7 +533,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             @Override
             public void onClick(View v) {
                 if (!StringUtil.isEmpty(phone_tv.getText().toString())) {
-                    String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
+                    String check = "^[1][3,5,7,8][0-9]\\d{8}$";
                     Pattern regex = Pattern.compile(check);
                     Matcher matcher = regex.matcher(phone_tv.getText().toString());
                     boolean isMatched = matcher.matches();