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

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

@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+    <item android:drawable="@color/me_menu_item_normal" android:state_focused="false"/>
     <item android:drawable="@color/me_menu_item_normal"/>
 </selector>

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

@@ -128,6 +128,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
+                        android:drawablePadding="3dp"
+                        android:drawableRight="@drawable/navigation"
                         android:text="*****************"
                         android:textColor="@color/black" />
                 </LinearLayout>

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>
 

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/selector_me_menu_item_bg"
     android:paddingBottom="10dp">
 
     <View

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

@@ -2,9 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    app:cardElevation="@dimen/paddingMin"
     android:layout_height="match_parent">
-
         <ListView
             android:id="@+id/mList"
             android:layout_width="match_parent"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 27 14:13:42 CST 2018
-debugName=517
-versionName=641
-debugCode=517
-versionCode=182
+#Tue Jul 31 18:10:44 CST 2018
+debugName=525
+versionName=638
+debugCode=525
+versionCode=179

app_core/common/src/main/java/com/common/system/SystemUtil.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -338,59 +339,40 @@ public class SystemUtil {
             ToastUtil.showToast(mContext, R.string.phone_number_format_error);
             return;
         }
-
-        final PopupWindow window = new PopupWindow(mContext);
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_select_alert_pop, null);
-        window.setContentView(view);
-        window.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.pop_round_bg));
-        DisplayUtil.backgroundAlpha(mContext, 0.4f);
-        window.setTouchable(true);
-        setPopupWindowHW((Activity) mContext, window);
-        window.setOutsideTouchable(false);
-        window.setFocusable(true);
-        TextView title_tv = (TextView) view.findViewById(R.id.title_tv);
-        TextView message_tv = (TextView) view.findViewById(R.id.message_tv);
-        TextView sure_tv = (TextView) view.findViewById(R.id.sure_tv);
-        title_tv.setText(mContext.getString(R.string.dialog_confim_phone));
-        message_tv.setText(mContext.getString(R.string.dialog_phone) + phone);
-        sure_tv.setText(R.string.dialog_phone_action);
-
-        window.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                DisplayUtil.backgroundAlpha(mContext, 1f);
-            }
-        });
-        view.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                window.dismiss();
-            }
-        });
-        sure_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mContext.requestPermission(Manifest.permission.CALL_PHONE, new Runnable() {
+        MaterialDialog dialog = new MaterialDialog.Builder(mContext).title(R.string.dialog_confim_phone).content(mContext.getString(R.string.dialog_phone) + phone)
+                .positiveText(R.string.dialog_phone_action).negativeText(R.string.common_cancel).autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
                     @Override
-                    public void run() {
-                        // 用intent启动拨打电话
-                        Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
-                        if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
-                            //预防万一
-                            return;
-                        }
-                        mContext.startActivity(intent);
+                    public void onPositive(MaterialDialog dialog) {
+                        mContext.requestPermission(Manifest.permission.CALL_PHONE, new Runnable() {
+                            @Override
+                            public void run() {
+                                // 用intent启动拨打电话
+                                Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
+                                if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+                                    //预防万一
+                                    return;
+                                }
+                                mContext.startActivity(intent);
+                            }
+                        }, new Runnable() {
+                            @Override
+                            public void run() {
+                                ToastUtil.showToast(mContext, R.string.not_system_permission);
+                            }
+                        });
+                        dialog.dismiss();
                     }
-                }, new Runnable() {
+
                     @Override
-                    public void run() {
-                        ToastUtil.showToast(mContext, R.string.not_system_permission);
+                    public void onNegative(MaterialDialog dialog) {
+                        super.onNegative(dialog);
+                        dialog.dismiss();
                     }
-                });
-                window.dismiss();
-            }
-        });
-        window.showAtLocation(view, Gravity.CENTER, 0, 0);
+                }).build();
+
+        dialog.show();
+
+
     }
 
     @Deprecated
@@ -403,8 +385,8 @@ public class SystemUtil {
                 final PopupWindow window = new PopupWindow(mContext);
                 View view = LayoutInflater.from(mContext).inflate(R.layout.item_select_alert_pop, null);
                 window.setContentView(view);
-                window.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.pop_round_bg));
-                DisplayUtil.backgroundAlpha(mContext, 0.4f);
+                window.setBackgroundDrawable(new BitmapDrawable());
+                DisplayUtil.backgroundAlpha(mContext, 0.5f);
                 window.setTouchable(true);
                 setPopupWindowHW((Activity) mContext, window);
                 window.setOutsideTouchable(false);
@@ -446,6 +428,8 @@ public class SystemUtil {
             }
         }
     }
+    
+    
 
     public static void setPopupWindowHW(Activity ct, PopupWindow window) {
         window.getContentView().measure(0, 0);

app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -100,7 +100,7 @@ public abstract class BaseActivity extends ActionBackActivity {
         //重启之后恢复到之前的语言
         switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
       
-        initFontScale(CommonUtil.getSharedPreferencesInt(MyApplication.getInstance(),"font_scale",0));
+        initFontScale(CommonUtil.getSharedPreferencesInt(MyApplication.getInstance(),"app_font_scale",0));
         // SystemUtil.setSystemBarTint(this);
 
     }
@@ -225,21 +225,13 @@ public abstract class BaseActivity extends ActionBackActivity {
             case 0:
                 configuration.fontScale = 1;
                 break;
-            case 2:
-                configuration.fontScale = 1.15f;
-                break;
-            case 3:
+            case 1:
                 configuration.fontScale = 1.2f;
                 break;
-            case 4:
-                configuration.fontScale =1.25f;
-                break;
-            case 5:
+            case 2:
                 configuration.fontScale = 1.3f;
                 break;
-            case 6:
-                configuration.fontScale =1.35f;
-                break;
+   
         }
         //0.85 小, 1 标准大小, 1.15 大，1.3 超大 ，1.45 特大 
         DisplayMetrics metrics = new DisplayMetrics();

app_core/common/src/main/res/layout/item_pop_employee.xml

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:paddingBottom="10dp">
 
     <View

app_core/common/src/main/res/layout/pop_crm_list.xml

@@ -12,7 +12,7 @@
         <ListView
             android:id="@+id/mList"
             style="@style/ListViewBasic"
-         
+         android:background="@color/white"
             android:layout_height="wrap_content"
             android:dividerHeight="0dp">
         </ListView>

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

@@ -158,6 +158,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
+                        android:drawablePadding="3dp"
+                        android:drawableRight="@drawable/navigation"
                         android:text="*****************"
                         android:textColor="@color/black" />
                 </LinearLayout>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CompanyContactsActivity.java

@@ -947,15 +947,15 @@ public class CompanyContactsActivity extends BaseActivity {
         popupWindow.setFocusable(true);
         // 设置允许在外点击消失
         popupWindow.setOutsideTouchable(false);
-        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                DisplayUtil.backgroundAlpha(ct, 1f);
-                //显示
-                mRefreshLayout.getLayout().setVisibility(View.VISIBLE);
-            }
-        });
-        DisplayUtil.backgroundAlpha(this, 1f);
+//        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+//            @Override
+//            public void onDismiss() {
+//                DisplayUtil.backgroundAlpha(ct, 1f);
+//                //显示
+//                mRefreshLayout.getLayout().setVisibility(View.VISIBLE);
+//            }
+//        });
+//        DisplayUtil.backgroundAlpha(this, 1f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -1252,13 +1252,13 @@ public class CompanyContactsActivity extends BaseActivity {
         @Override
         public View getView(final int position, View convertView, ViewGroup parent) {
             convertView = super.getView(position, convertView, parent);
-            ImageView phone_img = (ImageView) convertView.findViewById(R.id.phone_img);
-            ImageView header_img = (ImageView) convertView.findViewById(R.id.header_img);
+            ImageView phone_img =  convertView.findViewById(R.id.phone_img);
+            ImageView header_img =  convertView.findViewById(R.id.header_img);
             final Map<String, Object> mMap = (Map<String, Object>) getItem(position);
             phone_img.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    SystemUtil.phoneAction(mContext, mMap.get("item_phone").toString());
+                    SystemUtil.phoneAction(CompanyContactsActivity.this, mMap.get("item_phone").toString());
                     LogUtil.i("企业架构界面 拨打电话"+JSON.toJSONString(mMap));
                 }
             });

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

@@ -46,7 +46,7 @@ public class LocationNeerUtils {
     public static void loadDataByNeer(Context ct, int radius, int pagerNum, LatLng latLng, OnSearchLocationListener mOnSearchLocationListener) {
         if (latLng == null) {
             UASLocation local = UasLocationHelper.getInstance().getUASLocation();
-            latLng = new LatLng(local.getGpsLatitude(), local.getGpsLongitude());
+            latLng = new LatLng(local.getLatitude(), local.getLongitude());
         }
         if (AreaUtils.getLocationServiceType() == UASLocation.TYPE_NATIVE) {
             BaseLocationManager mManager = UasLocationHelper.getInstance().getLocationManager();
@@ -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/appme/src/main/AndroidManifest.xml

@@ -120,6 +120,7 @@
 
         <activity android:name=".settings.activity.SystemAdminActivity" />
         <activity android:name=".settings.activity.FontSizeActivity"
+
             android:launchMode="singleTask">
 
             <intent-filter>

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

@@ -19,14 +19,15 @@ public class FontSizeActivity extends SupportToolBarActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_font_size);
         LogUtil.d(TAG,"onCreate()");
+        setTitle(getString(R.string.app_font_size_setting));
         isClickSeek=getIntent().getBooleanExtra("isClickSeek",false);
         seek_font=findViewById(R.id.seek_font);
-        seek_font.setDefaultPosition(CommonUtil.getSharedPreferencesInt(MyApplication.getInstance(),"font_scale",0));
+        seek_font.setDefaultPosition(CommonUtil.getSharedPreferencesInt(MyApplication.getInstance(),"app_font_scale",0));
         seek_font.setOnPointResultListener(new SetTextSizeView.OnPointResultListener() {
             @Override
             public void onPointResult(int position) {
                 isClickSeek=true;
-                CommonUtil.setSharedPreferences(FontSizeActivity.this, "font_scale", position);
+                CommonUtil.setSharedPreferences(FontSizeActivity.this, "app_font_scale", position);
                 switch (position) {
                     case 0:
                         initFontScale(position);
@@ -40,22 +41,6 @@ public class FontSizeActivity extends SupportToolBarActivity {
                         initFontScale(position);
                         switchSettingAction();
                         break;
-                    case 3:
-                        initFontScale(position);
-                        switchSettingAction();
-                        break;
-                    case 4:
-                        initFontScale(position);
-                        switchSettingAction();
-                        break;
-                    case 5:
-                        initFontScale(position);
-                        switchSettingAction();
-                        break;
-                    case 6:
-                        initFontScale(position);
-                        switchSettingAction();
-                        break;
 
                 }
             }

app_modular/appme/src/main/java/com/uas/appme/widget/SetTextSizeView.java

@@ -23,13 +23,13 @@ import java.util.List;
 public class SetTextSizeView extends View {
     private int defaultLineColor = Color.rgb(33, 33, 33);
     private int defaultLineWidth;
-    private int defaultMax = 5;
+    private int defaultMax = 2;
     private int defaultCircleColor = Color.WHITE;
     private int defaultCircleRadius;
     private int defaultPosition = 1;
 
     // 一共有多少格
-    private int max = 5;
+    private int max = 2;
     // 线条颜色
     private int lineColor;
     // 线条粗细
@@ -65,6 +65,7 @@ public class SetTextSizeView extends View {
         super(context, attrs);
         init(context, attrs);
     }
+    
 
     private void init(Context context, AttributeSet attrs) {
         // initDefault
@@ -94,8 +95,10 @@ public class SetTextSizeView extends View {
         mCirclePaint.setStyle(Paint.Style.FILL);
         // 设置阴影效果
         setLayerType(LAYER_TYPE_SOFTWARE, null);
-        mCirclePaint.setShadowLayer(15, 0, 0, Color.rgb(33, 33, 33));
+        mCirclePaint.setShadowLayer(12, 0, 0, Color.rgb(33, 33, 33));
     }
+    
+    
 
     private void initCustomAttr(int attr, TypedArray typedArray) {
         if (attr == R.styleable.SetTextSizeView_lineColor) {
@@ -119,10 +122,11 @@ public class SetTextSizeView extends View {
         circleY = height / 2;
         lineHeight = height / 6;
         // 横线宽度是总宽度-2个圆的半径
-        itemWidth = (w - 2 * circleRadius) / max;
+        itemWidth = (w - 4 * circleRadius) / max;
+        
         // 把可点击点保存起来
         for (int i = 0; i <= max; i++) {
-            points.add(new Point(circleRadius + i * itemWidth, height / 2));
+            points.add(new Point(2*circleRadius + i * itemWidth, height / 2));
         }
     }
 

app_modular/appme/src/main/res/layout/activity_font_size.xml

@@ -1,22 +1,373 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.uas.appme.settings.activity.FontSizeActivity">
+    android:layout_height="match_parent">
+ <ScrollView
+     android:layout_width="match_parent"
+     android:layout_height="wrap_content"
+     android:layout_alignParentTop="true"
+     android:layout_marginBottom="@dimen/dp_10"
+     android:layout_above="@+id/rl_bottom">
+     <LinearLayout
+         android:id="@+id/ll_text_size"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:background="@color/lightgray"
+         android:orientation="vertical"
+         tools:context="com.uas.appme.settings.activity.FontSizeActivity">
 
+         <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center_vertical"
+             android:background="@color/white"
+             android:gravity="center_vertical"
+             android:orientation="horizontal">
 
-    <com.uas.appme.widget.SetTextSizeView
-        android:id="@+id/seek_font"
+             <ImageView
+                 android:layout_width="@dimen/dp_40"
+                 android:layout_height="@dimen/dp_40"
+                 android:layout_margin="@dimen/dp_10"
+                 android:src="@drawable/icon_yuyue3" />
+
+             <TextView
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:text="xx的项目申请"
+                 android:textColor="@color/black"
+                 android:textSize="@dimen/sp_16" />
+
+         </LinearLayout>
+         <!--<view style="@style/app_line_horizontal_05p"
+             android:layout_marginLeft="@dimen/dp_10"
+             android:layout_marginRight="@dimen/dp_10"></view>-->
+         <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:background="@color/white"
+             android:orientation="vertical">
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="项目类型" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="2017091239"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="项目编号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="WE1293012"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="客户名称" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="深圳市智手环科技有限公司"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="客户编号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="29534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+         </LinearLayout>
+
+         <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:layout_marginTop="@dimen/dp_10"
+             android:background="@color/white"
+             android:orientation="vertical">
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:background="@color/white"
+                 android:orientation="horizontal">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:paddingBottom="3dp"
+                     android:paddingLeft="@dimen/dp_10"
+                     android:paddingTop="3dp"
+                     android:text="单据序号1"
+                     android:textColor="#00A4EE" />
+
+             </LinearLayout>
+             <!--<view style="@style/app_line_horizontal_05p"
+                 android:layout_marginLeft="@dimen/dp_10"
+                 android:layout_marginRight="@dimen/dp_10"></view>-->
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="预测单号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="20170729534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="预测序号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="34534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="物料编号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="29534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+         </LinearLayout>
+         <!--    <view style="@style/app_line_horizontal_05p"
+                 android:layout_marginLeft="@dimen/dp_10"
+                 android:layout_marginRight="@dimen/dp_10"></view>-->
+         <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:background="@color/white"
+             android:orientation="vertical">
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:padding="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="3dp"
+                     android:text="单据序号1"
+                     android:textColor="#00A4EE" />
+
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="预测单号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="20170729534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="预测序号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="34534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:paddingBottom="3dp"
+                 android:paddingLeft="@dimen/dp_10"
+                 android:paddingTop="3dp">
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="物料编号" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_marginLeft="20dp"
+                     android:text="29534234"
+                     android:textColor="@color/black" />
+             </LinearLayout>
+         </LinearLayout>
+
+
+     </LinearLayout>
+ </ScrollView>
+<RelativeLayout
+    android:id="@+id/rl_bottom"
+    android:layout_width="match_parent"
+    android:layout_height="45dp"
+    android:layout_marginTop="20dp"
+    android:layout_above="@+id/seek_font_ll"
+    android:background="@android:color/white">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14dp"
+        android:layout_alignParentBottom="true"
+        android:textColor="@color/black"
+        android:layout_marginLeft="15dp"
+        android:text="小"/>
+    <TextView
+        android:id="@+id/tv_middle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black"
+        android:textSize="18dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:text="中"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:textColor="@color/black"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="15dp"
+        android:textSize="26dp"
+        android:text="大"/>
+</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/seek_font_ll"
         android:layout_width="match_parent"
-        app:totalCount="6"
-        android:background="@android:color/white"
-        android:layout_marginTop="30dp"
-        app:lineColor="@android:color/black"
-        app:circleColor="@android:color/white"
-        app:circleRadius="12dp"
-        app:SetTextlineWidth="0.1dp"
-        android:layout_height="35dp" />
-</LinearLayout>
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+        <com.uas.appme.widget.SetTextSizeView
+            android:id="@+id/seek_font"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginBottom="15dp"
+            android:background="@android:color/white"
+            app:SetTextlineWidth="0.1dp"
+            app:circleColor="@android:color/white"
+            app:circleRadius="12dp"
+            app:lineColor="@android:color/black"
+            app:totalCount="2" />  
+    </LinearLayout>
+ 
+</RelativeLayout>
+

app_modular/appme/src/main/res/values-en/strings.xml

@@ -1866,7 +1866,7 @@
     <string name="input_name">请输入姓名</string>
 
     <string name="rest_date">休息时间</string>
-
+    <string name="app_font_size_setting">字体大小设置</string>
 
 
 </resources>

app_modular/appme/src/main/res/values/strings.xml

@@ -1866,6 +1866,7 @@
     <string name="input_name">请输入姓名</string>
 
     <string name="rest_date">休息时间</string>
+    <string name="app_font_size_setting">字体大小设置</string>
 
 
 </resources>

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/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1143,8 +1143,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         //缓存问题
                         // model= (ViewModel) convertView.getTag();
                     }
-
                     final Data data = (Data) getItem(position);
+                    
                     HashMap<String, Object> results = isLastItem(position);
                     final Integer categoryIndex = (Integer) results.get("categoryIndex");
                     model.text.setText(data.getName());

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