tt/XiaoxintongSystemOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:

Browse Source 
fix:
update:优化控制页面
This commit is contained in:
tongtongstudio
2022-11-17 09:37:42 +08:00
parent db3ee94ca2
commit 6f073ef28d
10 changed files with 468 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
app/src/main/java/com/uiuios/aios/activity/ControlActivity.java
View File

@@ -40,6 +40,7 @@ import com.uiuios.aios.view.RulerSeekBar;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -66,7 +67,7 @@ public class ControlActivity extends AppCompatActivity {
@BindView(R.id.tv_bt_ssid) @BindView(R.id.tv_bt_ssid)
TextView tv_bt_ssid; TextView tv_bt_ssid;
// @BindView(R.id.tv_font_size) // @BindView(R.id.tv_font_size)
// TextView tv_font_size; // TextView tv_font_size;
@BindView(R.id.seekBar) @BindView(R.id.seekBar)
RulerSeekBar seekBar; RulerSeekBar seekBar;
@@ -538,53 +539,136 @@ public class ControlActivity extends AppCompatActivity {
private boolean flashing = false; private boolean flashing = false;
private CameraManager cameraManager; private CameraManager cameraManager;
private void getFlashlight() { // private void getFlashlight() {
if (isFlashlightAvailable()) { // if (isFlashlightAvailable()) {
tv_flashlight_switch.setText("关");
cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
} else {
tv_flashlight_switch.setText("不可用");
cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
return;
}
// if (isFlashlightEnabled()) {
// tv_flashlight_switch.setText("开");
// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item));
// } else {
// tv_flashlight_switch.setText("关"); // tv_flashlight_switch.setText("关");
// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis)); // cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
// } else {
// tv_flashlight_switch.setText("不可用");
// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
// return;
// } // }
//// if (isFlashlightEnabled()) {
//// tv_flashlight_switch.setText("开");
//// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item));
//// } else {
//// tv_flashlight_switch.setText("关");
//// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
//// }
//
// cameraManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
//
// cl_flashlight.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// if (flashing) {
// try {
// String CameraId = cameraManager.getCameraIdList()[0];
// cameraManager.setTorchMode(CameraId, false);
// } catch (CameraAccessException e) {
// e.printStackTrace();
// }
// flashing = false;
// tv_flashlight_switch.setText("关");
// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
// } else {
// try {
// String CameraId = cameraManager.getCameraIdList()[0];
// cameraManager.setTorchMode(CameraId, true);
// } catch (CameraAccessException e) {
// e.printStackTrace();
// }
// tv_flashlight_switch.setText("开");
// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item));
// flashing = true;
// }
// }
// });
// }
cameraManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE); BroadcastReceiver mTimeUpdateReceiver;
cl_flashlight.setOnClickListener(new View.OnClickListener() { class TimeUpdateReceiver extends BroadcastReceiver {
@Override @Override
public void onClick(View view) { public void onReceive(Context context, Intent intent) {
if (flashing) { if (intent == null) return;
try { String action = intent.getAction();
String CameraId = cameraManager.getCameraIdList()[0]; if (action == null || action.isEmpty()) return;
cameraManager.setTorchMode(CameraId, false);
} catch (CameraAccessException e) { if (action.equals(Intent.ACTION_TIME_TICK)) {
e.printStackTrace(); //系统每1分钟发送一次广播
} updateTimeUi();
flashing = false; } else if (action.equals(Intent.ACTION_TIME_CHANGED)) {
tv_flashlight_switch.setText("关"); //系统手动更改时间发送广播
cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis)); updateTimeUi();
} else {
try {
String CameraId = cameraManager.getCameraIdList()[0];
cameraManager.setTorchMode(CameraId, true);
} catch (CameraAccessException e) {
e.printStackTrace();
}
tv_flashlight_switch.setText("开");
cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item));
flashing = true;
}
} }
}); }
} }
private void updateTimeUi() {
long time = System.currentTimeMillis();
SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
String timeText = timeFormat.format(time);
tv_flashlight.setText(timeText);
SimpleDateFormat format = new SimpleDateFormat("MM月dd日");
String dataText = format.format(time);
tv_flashlight_switch.setText(dataText);
}
private void getFlashlight() {
if (mTimeUpdateReceiver == null) {
mTimeUpdateReceiver = new TimeUpdateReceiver();
}
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_TIME_TICK);
filter.addAction(Intent.ACTION_TIME_CHANGED);
registerReceiver(mTimeUpdateReceiver, filter);
updateTimeUi();
// if (isFlashlightAvailable()) {
// tv_flashlight_switch.setText("关");
// cl_flashlight.setBackground(mContext.getDrawable(R.drawable.control_background_item_dis));
// } else {
// tv_flashlight_switch.setText("不可用");
// cl_flashlight.setBackground(mContext.getDrawable(R.drawable.control_background_item_dis));
// return;
// }
//// if (isFlashlightEnabled()) {
//// tv_flashlight_switch.setText("开");
//// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item));
//// } else {
//// tv_flashlight_switch.setText("关");
//// cl_flashlight.setBackground(getDrawable(R.drawable.control_background_item_dis));
//// }
//
// cameraManager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
//
// cl_flashlight.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// if (flashing) {
// try {
// String CameraId = cameraManager.getCameraIdList()[0];
// cameraManager.setTorchMode(CameraId, false);
// } catch (CameraAccessException e) {
// e.printStackTrace();
// }
// flashing = false;
// tv_flashlight_switch.setText("关");
// cl_flashlight.setBackground(mContext.getDrawable(R.drawable.control_background_item_dis));
// } else {
// try {
// String CameraId = cameraManager.getCameraIdList()[0];
// cameraManager.setTorchMode(CameraId, true);
// } catch (CameraAccessException e) {
// e.printStackTrace();
// }
// tv_flashlight_switch.setText("开");
// cl_flashlight.setBackground(mContext.getDrawable(R.drawable.control_background_item));
// flashing = true;
// }
// }
// });
}
private boolean isFlashlightAvailable() { private boolean isFlashlightAvailable() {
return getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH); return getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH);
@@ -763,5 +847,6 @@ public class ControlActivity extends AppCompatActivity {
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mWifiReceiver != null) unregisterReceiver(mWifiReceiver); if (mWifiReceiver != null) unregisterReceiver(mWifiReceiver);
if (mTimeUpdateReceiver != null) unregisterReceiver(mTimeUpdateReceiver);
} }
} }

5
app/src/main/java/com/uiuios/aios/manager/AmapManager.java
View File

@@ -27,6 +27,7 @@ public class AmapManager {
private LocationClientOption mOption; private LocationClientOption mOption;
private BDLocation mLocation; private BDLocation mLocation;
private CacheHelper mCacheHelper; private CacheHelper mCacheHelper;
private MMKV mmkv = MMKV.defaultMMKV();
private static final String AMAPLOCATION_JSON_KEY = "MAPLOCATION_JSON_STRING"; private static final String AMAPLOCATION_JSON_KEY = "MAPLOCATION_JSON_STRING";
public static final String LONGITUDE_KEY = "map_longitude_key"; public static final String LONGITUDE_KEY = "map_longitude_key";
@@ -74,7 +75,7 @@ public class AmapManager {
public BDLocation getNowMapLocation() { public BDLocation getNowMapLocation() {
if (mLocation == null) { if (mLocation == null) {
String aMapLocationjson = mCacheHelper.getAsString(AMAPLOCATION_JSON_KEY); String aMapLocationjson = mmkv.decodeString(AMAPLOCATION_JSON_KEY);
if (TextUtils.isEmpty(aMapLocationjson)) { if (TextUtils.isEmpty(aMapLocationjson)) {
return null; return null;
} }
@@ -147,7 +148,7 @@ public class AmapManager {
case BDLocation.TypeGpsLocation:// GPS定位结果 case BDLocation.TypeGpsLocation:// GPS定位结果
case BDLocation.TypeNetWorkLocation:// 网络定位结果 case BDLocation.TypeNetWorkLocation:// 网络定位结果
case BDLocation.TypeOffLineLocation:// 离线定位结果 case BDLocation.TypeOffLineLocation:// 离线定位结果
mCacheHelper.put(AMAPLOCATION_JSON_KEY, GsonUtils.toJsonString(location)); mmkv.encode(AMAPLOCATION_JSON_KEY, GsonUtils.toJsonString(location));
Log.e(TAG, "onLocationChanged: " + "定位成功"); Log.e(TAG, "onLocationChanged: " + "定位成功");
Log.e(TAG, "onLocationChanged: longitude = " + location.getLongitude()); Log.e(TAG, "onLocationChanged: longitude = " + location.getLongitude());
Log.e(TAG, "onLocationChanged: latitude = " + location.getLatitude()); Log.e(TAG, "onLocationChanged: latitude = " + location.getLatitude());

4
app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java
View File

@@ -37,7 +37,7 @@ public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar {
*/ */
private boolean isShowTopOfThumb = true; private boolean isShowTopOfThumb = true;
private int radius = 8; private int radius = 12;
public RulerSeekBar(Context context) { public RulerSeekBar(Context context) {
super(context); super(context);
@@ -60,7 +60,7 @@ public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar {
private void init() { private void init() {
//创建绘制刻度线的画笔 //创建绘制刻度线的画笔
mRulerPaint = new Paint(); mRulerPaint = new Paint();
mRulerPaint.setColor(mRulerColor); mRulerPaint.setColor(Color.parseColor("#d0cccc"));
mRulerPaint.setAntiAlias(true); mRulerPaint.setAntiAlias(true);
//Api21及以上调用，去掉滑块后面的背景 //Api21及以上调用，去掉滑块后面的背景

BIN
app/src/main/res/drawable-hdpi/font_size.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/drawable-hdpi/time1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

6
app/src/main/res/drawable/shape_thumb_icon.xml
View File

@@ -5,6 +5,8 @@
<size <size
android:width="@dimen/dp_14" android:width="@dimen/dp_14"
android:height="@dimen/dp_14" /> android:height="@dimen/dp_14" />
<stroke
<solid android:color="@android:color/holo_blue_light" /> android:width="@dimen/dp_2"
android:color="#e1e8f0" />
<solid android:color="#162136" />
</shape> </shape>

271
app/src/main/res/layout-land/activity_control.xml
View File

@@ -43,8 +43,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_36" android:layout_marginStart="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_36" android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_36" android:layout_marginBottom="@dimen/dp_36"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@@ -64,6 +64,53 @@
android:layout_weight="2" android:layout_weight="2"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_flashlight"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/control_background_item">
<ImageView
android:id="@+id/iv_flashlight"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/time1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_flashlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00:00"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView
android:id="@+id/tv_flashlight_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11月15日"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
app:layout_constraintTop_toBottomOf="@+id/tv_flashlight"
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_wifi" android:id="@+id/cl_wifi"
android:layout_width="0dp" android:layout_width="0dp"
@@ -74,8 +121,8 @@
<ImageView <ImageView
android:id="@+id/iv_wifi" android:id="@+id/iv_wifi"
android:layout_width="@dimen/dp_36" android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@@ -88,70 +135,29 @@
android:id="@+id/tv_wifi" android:id="@+id/tv_wifi"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="WIFI" android:text="WIFI"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_wifi" app:layout_constraintStart_toEndOf="@+id/iv_wifi"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView <TextView
android:id="@+id/tv_wifi_ssid" android:id="@+id/tv_wifi_ssid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:text="ssid" android:text="ssid"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_wifi" app:layout_constraintStart_toStartOf="@+id/tv_wifi"
app:layout_constraintTop_toBottomOf="@+id/tv_wifi" /> app:layout_constraintTop_toBottomOf="@+id/tv_wifi"
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/control_background_item">
<ImageView
android:id="@+id/iv_bt"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/bluetooth1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_bt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="蓝牙"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
app:layout_constraintStart_toEndOf="@+id/iv_bt"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_bt_ssid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ssid"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_bt"
app:layout_constraintTop_toBottomOf="@+id/tv_bt" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@@ -212,10 +218,8 @@
<com.uiuios.aios.view.RulerSeekBar <com.uiuios.aios.view.RulerSeekBar
android:id="@+id/seekBar" android:id="@+id/seekBar"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:max="3" android:max="3"
android:maxHeight="@dimen/dp_14" android:maxHeight="@dimen/dp_14"
android:minHeight="@dimen/dp_14" android:minHeight="@dimen/dp_14"
@@ -223,37 +227,40 @@
android:progressDrawable="@drawable/shape_progress_drawable" android:progressDrawable="@drawable/shape_progress_drawable"
android:thumb="@drawable/shape_thumb_icon" android:thumb="@drawable/shape_thumb_icon"
android:thumbOffset="0dp" android:thumbOffset="0dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/linearLayout"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/linearLayout"
app:layout_constraintTop_toBottomOf="@+id/textView21" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintVertical_bias="0.0" />
<TextView <ImageView
android:id="@+id/textView21" android:id="@+id/imageView"
android:layout_width="wrap_content" android:layout_width="@dimen/dp_36"
android:layout_height="wrap_content" android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:text="字体大小" android:src="@drawable/font_size"
android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent"
android:textSize="@dimen/sp_13"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/seekBar">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="start"
android:paddingStart="@dimen/dp_8"
android:text="标准" android:text="标准"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@@ -266,7 +273,7 @@
android:gravity="center" android:gravity="center"
android:text="大" android:text="大"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@@ -276,10 +283,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="end"
android:paddingEnd="@dimen/dp_8"
android:text="最大" android:text="最大"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@@ -314,6 +322,53 @@
android:layout_weight="2" android:layout_weight="2"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/control_background_item">
<ImageView
android:id="@+id/iv_bt"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/bluetooth1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_bt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="蓝牙"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_bt"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView
android:id="@+id/tv_bt_ssid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ssid"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_bt"
app:layout_constraintTop_toBottomOf="@+id/tv_bt"
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_battery" android:id="@+id/cl_battery"
android:layout_width="0dp" android:layout_width="0dp"
@@ -324,8 +379,8 @@
<ImageView <ImageView
android:id="@+id/iv_battery" android:id="@+id/iv_battery"
android:layout_width="@dimen/dp_36" android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@@ -338,69 +393,28 @@
android:id="@+id/tv_battery" android:id="@+id/tv_battery"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="电量" android:text="电量"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_battery" app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView <TextView
android:id="@+id/tv_electricity" android:id="@+id/tv_electricity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:text="100%" android:text="100%"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_battery" app:layout_constraintStart_toEndOf="@+id/tv_battery"
app:layout_constraintTop_toBottomOf="@+id/tv_battery" /> app:layout_constraintStart_toStartOf="@+id/tv_battery"
</androidx.constraintlayout.widget.ConstraintLayout> app:layout_constraintTop_toBottomOf="@+id/tv_battery"
app:layout_constraintVertical_bias="0.2" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_flashlight"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/control_background_item">
<ImageView
android:id="@+id/iv_flashlight"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/flashlight1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_flashlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="手电筒"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_flashlight_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="关"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
app:layout_constraintTop_toBottomOf="@+id/tv_flashlight" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
@@ -478,6 +492,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:maxLines="2"
android:text="未知" android:text="未知"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"

6
app/src/main/res/layout-land/item_weather.xml
View File

@@ -29,7 +29,7 @@
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:text="17:48" android:text="17:48"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="@dimen/sp_20" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toTopOf="@+id/iv_weather" app:layout_constraintBottom_toTopOf="@+id/iv_weather"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="@dimen/sp_20" android:textSize="@dimen/sp_20"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:text="15-22" android:text="15-22"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

359
app/src/main/res/layout-port/activity_control.xml
View File

@@ -43,7 +43,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_48" android:layout_marginBottom="@dimen/dp_12"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -56,6 +56,53 @@
android:layout_weight="4" android:layout_weight="4"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_flashlight"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/control_background_item">
<ImageView
android:id="@+id/iv_flashlight"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_24"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/time1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_flashlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00:00"
android:textColor="@color/white"
android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/tv_flashlight_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:text="11月15日"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
app:layout_constraintTop_toBottomOf="@+id/tv_flashlight" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_wifi" android:id="@+id/cl_wifi"
android:layout_width="0dp" android:layout_width="0dp"
@@ -66,9 +113,9 @@
<ImageView <ImageView
android:id="@+id/iv_wifi" android:id="@+id/iv_wifi"
android:layout_width="@dimen/dp_36" android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_24"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/wifi1" android:src="@drawable/wifi1"
@@ -80,27 +127,36 @@
android:id="@+id/tv_wifi" android:id="@+id/tv_wifi"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="WIFI" android:text="WIFI"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_wifi" app:layout_constraintStart_toEndOf="@+id/iv_wifi"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView <TextView
android:id="@+id/tv_wifi_ssid" android:id="@+id/tv_wifi_ssid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8" android:layout_marginTop="@dimen/dp_6"
android:text="ssid" android:text="ssid"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/tv_wifi"
app:layout_constraintStart_toEndOf="@+id/iv_wifi"
app:layout_constraintTop_toBottomOf="@+id/tv_wifi" /> app:layout_constraintTop_toBottomOf="@+id/tv_wifi" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bt" android:id="@+id/cl_bt"
android:layout_width="0dp" android:layout_width="0dp"
@@ -111,9 +167,9 @@
<ImageView <ImageView
android:id="@+id/iv_bt" android:id="@+id/iv_bt"
android:layout_width="@dimen/dp_36" android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_24"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/bluetooth1" android:src="@drawable/bluetooth1"
@@ -125,32 +181,27 @@
android:id="@+id/tv_bt" android:id="@+id/tv_bt"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="蓝牙" android:text="蓝牙"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_bt" app:layout_constraintStart_toEndOf="@+id/iv_bt"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView <TextView
android:id="@+id/tv_bt_ssid" android:id="@+id/tv_bt_ssid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:text="ssid" android:text="ssid"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_bt" app:layout_constraintStart_toStartOf="@+id/tv_bt"
app:layout_constraintTop_toBottomOf="@+id/tv_bt" /> app:layout_constraintTop_toBottomOf="@+id/tv_bt" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_battery" android:id="@+id/cl_battery"
@@ -162,9 +213,9 @@
<ImageView <ImageView
android:id="@+id/iv_battery" android:id="@+id/iv_battery"
android:layout_width="@dimen/dp_36" android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_24"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/battery1" android:src="@drawable/battery1"
@@ -176,167 +227,30 @@
android:id="@+id/tv_battery" android:id="@+id/tv_battery"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="电量" android:text="电量"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_battery" app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView <TextView
android:id="@+id/tv_electricity" android:id="@+id/tv_electricity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8" android:layout_marginTop="@dimen/dp_6"
android:text="100%" android:text="100%"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/tv_battery"
app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toBottomOf="@+id/tv_battery" /> app:layout_constraintTop_toBottomOf="@+id/tv_battery" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_flashlight"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/control_background_item">
<ImageView
android:id="@+id/iv_flashlight"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/flashlight1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_flashlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_16"
android:text="手电筒"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_flashlight_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="关"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
app:layout_constraintTop_toBottomOf="@+id/tv_flashlight" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_weight="2"
android:background="@drawable/control_background_item">
<com.uiuios.aios.view.RulerSeekBar
android:id="@+id/seekBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_32"
android:max="3"
android:maxHeight="@dimen/dp_14"
android:minHeight="@dimen/dp_14"
android:progress="0"
android:progressDrawable="@drawable/shape_progress_drawable"
android:thumb="@drawable/shape_thumb_icon"
android:thumbOffset="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView21"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/textView21"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:text="字体大小"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="标准"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="大"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="最大"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
</LinearLayout>
<!-- <SeekBar-->
<!-- android:id="@+id/seekBar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp_32"-->
<!-- android:layout_marginEnd="@dimen/dp_32"-->
<!-- android:max="3"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_font_size" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -434,6 +348,103 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_weight="2"
android:background="@drawable/control_background_item">
<com.uiuios.aios.view.RulerSeekBar
android:id="@+id/seekBar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:max="3"
android:maxHeight="@dimen/dp_14"
android:minHeight="@dimen/dp_14"
android:progress="0"
android:progressDrawable="@drawable/shape_progress_drawable"
android:thumb="@drawable/shape_thumb_icon"
android:thumbOffset="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/linearLayout4"
app:layout_constraintStart_toStartOf="@+id/linearLayout4"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView4"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8"
android:src="@drawable/font_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView4"
app:layout_constraintTop_toBottomOf="@+id/seekBar">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingStart="@dimen/dp_8"
android:text="标准"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="大"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:paddingEnd="@dimen/dp_8"
android:text="最大"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
</LinearLayout>
<!-- <SeekBar-->
<!-- android:id="@+id/seekBar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp_32"-->
<!-- android:layout_marginEnd="@dimen/dp_32"-->
<!-- android:max="3"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_font_size" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_location" android:id="@+id/cl_location"
android:layout_width="match_parent" android:layout_width="match_parent"

6
app/src/main/res/layout-port/item_weather.xml
View File

@@ -32,7 +32,7 @@
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:layout_marginTop="@dimen/dp_32" android:layout_marginTop="@dimen/dp_32"
android:text="17:48" android:text="17:48"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="@dimen/sp_20" android:textSize="@dimen/sp_20"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -53,7 +53,7 @@
android:id="@+id/tv_weather" android:id="@+id/tv_weather"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="@dimen/sp_20" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -66,7 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="15-22" android:text="15-22"
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/black" android:textColor="@color/white"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintEnd_toEndOf="@+id/iv_weather" app:layout_constraintEnd_toEndOf="@+id/iv_weather"
app:layout_constraintStart_toStartOf="@+id/iv_weather" app:layout_constraintStart_toStartOf="@+id/iv_weather"