app字体全局化处理

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 20 15:22:20 CST 2018
-debugName=527
+#Fri Jul 27 10:15:20 CST 2018
+debugName=561
 versionName=637
-debugCode=527
+debugCode=561
 versionCode=178

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_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

@@ -5,322 +5,368 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+ <ScrollView
+   
+     android:layout_width="match_parent"
+     android:layout_height="wrap_content">
+     <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">
+
+             <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/ll_text_size"
+        android:id="@+id/seek_font_ll"
         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">
-
-            <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                    android:paddingLeft="@dimen/dp_10"
-                    android:paddingTop="5dp"
-                    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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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_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="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="5dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:text="单据序号1"
-                    android:textColor="#00A4EE" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingBottom="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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="5dp"
-                android:paddingLeft="@dimen/dp_10"
-                android:paddingTop="5dp">
-
-                <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>
-
-
+            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>
-
-    <com.uas.appme.widget.SetTextSizeView
-        android:id="@+id/seek_font"
-        android:layout_width="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_height="35dp"
-        android:layout_marginTop="30dp"
-        android:background="@android:color/white"
-        app:SetTextlineWidth="0.1dp"
-        app:circleColor="@android:color/white"
-        app:circleRadius="12dp"
-        app:lineColor="@android:color/black"
-        app:totalCount="6" />
+ 
 </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>