设置中去掉白天夜晚时间设置

android_host/src/main/h10_wke_1h/res/layout/fragment_system_settings.xml

@@ -19,13 +19,24 @@
                 android:layout_marginLeft="10px"
                 android:orientation="vertical">
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="6dp"
+                    android:gravity="center"
+                    android:text="@string/str_settings"
+                    android:textColor="#000000"
+                    android:textSize="20sp" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#ffffff"
                     android:layout_gravity="center_vertical"
                     android:orientation="vertical"
-                    android:paddingLeft="6px">
+                    android:paddingLeft="6px"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"

android_host/src/main/h10_z3128_1h/res/layout/fragment_system_settings.xml

@@ -18,13 +18,24 @@
                 android:layout_marginLeft="10px"
                 android:orientation="vertical">
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="6dp"
+                    android:gravity="center"
+                    android:text="@string/str_settings"
+                    android:textColor="#000000"
+                    android:textSize="20sp" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#ffffff"
                     android:layout_gravity="center_vertical"
                     android:orientation="vertical"
-                    android:paddingLeft="6px">
+                    android:paddingLeft="6px"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"

common/src/main/code/com/wdkl/ncs/android/lib/widget/DoubleSlideSeekBar.java

@@ -340,54 +340,56 @@ public class DoubleSlideSeekBar extends View {
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        // Y轴 坐标
-        lineY = getHeight() - paddingBottom - bitmapHeight / 2;
-        // 字所在高度 100$
-//        textHeight = lineY - bitmapHeight / 2 - 10;
-        textHeight = lineY - bitmapHeight / 2 - 20;
-        //是否画刻度
-        if (hasRule) {
-            drawRule(canvas);
-        }
-        if (linePaint == null) {
-            linePaint = new Paint();
-        }
-        //画内部线
-        linePaint.setAntiAlias(true);
-        linePaint.setStrokeWidth(lineWidth);
-        linePaint.setColor(inColor);
-        linePaint.setStrokeCap(Paint.Cap.ROUND);
-        canvas.drawLine(slideLowX, lineY, slideBigX, lineY, linePaint);
-        linePaint.setColor(outColor);
-        linePaint.setStrokeCap(Paint.Cap.ROUND);
-        //画 外部线
-        canvas.drawLine(lineStart, lineY, slideLowX, lineY, linePaint);
-        canvas.drawLine(slideBigX, lineY, lineEnd, lineY, linePaint);
-        //画游标
-        if (bitmapPaint == null) {
-            bitmapPaint = new Paint();
-        }
-        canvas.drawBitmap(bitmapLow, slideLowX - bitmapWidth / 2, lineY - bitmapHeight / 2, bitmapPaint);
-        canvas.drawBitmap(bitmapBig, slideBigX - bitmapWidth / 2, lineY - bitmapHeight / 2, bitmapPaint);
-        //画 游标上边的字
-        if (textPaint == null) {
-            textPaint = new Paint();
-        }
-        textPaint.setColor(textColor);
-        textPaint.setTextSize(textSize);
-        textPaint.setAntiAlias(true);
 
-        //这里不要直接转int 因为会去掉小数位 和实际显示的不符合 要转string 四舍五入
-        Log.e(TAG, "smallRange " + Integer.parseInt(String.format("%.0f", smallRange)));
-        Log.e(TAG, "bigRange " + Integer.parseInt(String.format("%.0f", bigRange)));
-//        canvas.drawText(String.format("%.0f" + unit, smallRange), slideLowX - bitmapWidth / 2, textHeight, textPaint);
-//        canvas.drawText(String.format("%.0f" + unit, bigRange), slideBigX - bitmapWidth / 2, textHeight, textPaint);
+        try {
+            // Y轴 坐标
+            lineY = getHeight() - paddingBottom - bitmapHeight / 2;
+            // 字所在高度 100$
+            textHeight = lineY - bitmapHeight / 2 - 20;
+            //是否画刻度
+            if (hasRule) {
+                drawRule(canvas);
+            }
+            if (linePaint == null) {
+                linePaint = new Paint();
+            }
+            //画内部线
+            linePaint.setAntiAlias(true);
+            linePaint.setStrokeWidth(lineWidth);
+            linePaint.setColor(inColor);
+            linePaint.setStrokeCap(Paint.Cap.ROUND);
+            canvas.drawLine(slideLowX, lineY, slideBigX, lineY, linePaint);
+            linePaint.setColor(outColor);
+            linePaint.setStrokeCap(Paint.Cap.ROUND);
+            //画 外部线
+            canvas.drawLine(lineStart, lineY, slideLowX, lineY, linePaint);
+            canvas.drawLine(slideBigX, lineY, lineEnd, lineY, linePaint);
+            //画游标
+            if (bitmapPaint == null) {
+                bitmapPaint = new Paint();
+            }
+            canvas.drawBitmap(bitmapLow, slideLowX - bitmapWidth / 2, lineY - bitmapHeight / 2, bitmapPaint);
+            canvas.drawBitmap(bitmapBig, slideBigX - bitmapWidth / 2, lineY - bitmapHeight / 2, bitmapPaint);
+            //画 游标上边的字
+            if (textPaint == null) {
+                textPaint = new Paint();
+            }
+            textPaint.setColor(textColor);
+            textPaint.setTextSize(textSize);
+            textPaint.setAntiAlias(true);
 
-        Log.e(TAG, "smallRange算出来的 " + computRange(slideLowX));
-        Log.e(TAG, "bigRange算出来的" + computRange(slideBigX));
+            //这里不要直接转int 因为会去掉小数位 和实际显示的不符合 要转string 四舍五入
+            Log.e(TAG, "smallRange " + Integer.parseInt(String.format("%.0f", smallRange)));
+            Log.e(TAG, "bigRange " + Integer.parseInt(String.format("%.0f", bigRange)));
+            Log.e(TAG, "smallRange算出来的 " + computRange(slideLowX));
+            Log.e(TAG, "bigRange算出来的" + computRange(slideBigX));
 
-        canvas.drawText(time[Integer.parseInt(String.format("%.0f", smallRange)) - 1], slideLowX - bitmapWidth / 2, textHeight, textPaint);
-        canvas.drawText(time[Integer.parseInt(String.format("%.0f", bigRange)) - 1], slideBigX - bitmapWidth / 2, textHeight, textPaint);
+            canvas.drawText(time[Integer.parseInt(String.format("%.0f", smallRange)) - 1], slideLowX - bitmapWidth / 2, textHeight, textPaint);
+            canvas.drawText(time[Integer.parseInt(String.format("%.0f", bigRange)) - 1], slideBigX - bitmapWidth / 2, textHeight, textPaint);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
 
     @Override