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

WeiChat/src/main/res/layout/activity_visit_report_add.xml

@@ -213,7 +213,7 @@
                 android:id="@+id/tv_address_login"
                 style="@style/form_relative_right_text"
                 android:hint="@string/common_input"
-                android:maxHeight="70dp"
+                android:maxHeight="70sp"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 

app_modular/applocation/src/main/java/com/uas/applocation/utils/LocationNeerUtils.java

@@ -62,9 +62,6 @@ public class LocationNeerUtils {
 
     //获取百度定位周边为位置点
     private static void loadBaiduByNeer(int radius, int pagerNum, LatLng latLng, final OnSearchLocationListener mOnSearchLocationListener) {
-        Log.i("gong", "radius=" + radius);
-        Log.i("gong", "pagerNum=" + pagerNum);
-        Log.i("gong", "latLng=" + latLng.latitude + "|||  longitude=" + latLng.longitude);
         PoiNearbySearchOption option = new PoiNearbySearchOption();
         PoiSearch mPoiSearch = PoiSearch.newInstance();
         option.keyword("公司")

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessDetailInfoActivity.java

@@ -327,6 +327,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     position = position + 1;
                     switch (position) {
                         case 1:
+                            popupWindow.dismiss();
                             final String nichehouse = StringUtil.getTextRexHttp(bc_nichehouse);
                             if (/*存在商机库已选择*/!StringUtil.isEmpty(nichehouse)) {
                                 PopupWindowHelper.showAlart(BusinessDetailInfoActivity.this,
@@ -341,7 +342,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                                         });
                             } else
                                 loadNichehouse();
-                            popupWindow.dismiss();
                             break;
                         case 2:
                             startActivityForResult(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class)
@@ -390,10 +390,6 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         popupWindow.setWidth(width + DisplayUtil.dip2px(ct, 10));
         int[] location = new int[2];
         parent.getLocationOnScreen(location);
-        Log.i("Arison", "parent hight:" + location[1]);
-        Log.i("Arison", "popupWindow hight:" + popupWindow.getHeight());
-        Log.i("Arison", "parent width:" + parent.getWidth());
-        Log.i("Arison", "parent width:" + parent.getHeight());
         popupWindow.showAtLocation(parent.findViewById(R.id.bt_manage_go), Gravity.NO_GRAVITY, location[0],
                 location[1] - popupWindow.getHeight() - 5);
 

app_modular/appworks/src/main/res/layout/handler_charit_list.xml

@@ -7,7 +7,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="30dp"
+        android:layout_height="30sp"
         android:background="@color/white">
 
         <TextView