From 2ae033b3f5f064bc36ecc08c86be3e627821b71c Mon Sep 17 00:00:00 2001 From: fanhuitong <981964879@qq.com> Date: Tue, 15 Nov 2022 15:23:20 +0800 Subject: [PATCH] =?UTF-8?q?version:6.2=20fix:=20update:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B4=9F=E4=BA=8C=E5=B1=8F=E6=89=8B=E7=94=B5=E7=AD=92=E4=B8=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../uiui/aios/activity/main/MainActivity.java | 2 +- .../uiui/aios/fragment/ControlFragment.java | 131 +++-- app/src/main/res/drawable-hdpi/font_size.png | Bin 0 -> 1559 bytes app/src/main/res/drawable-hdpi/time1.png | Bin 0 -> 3341 bytes .../main/res/drawable/shape_thumb_icon.xml | 2 +- .../main/res/layout-land/fragment_control.xml | 281 +++++----- .../main/res/layout-port/fragment_control.xml | 484 +++++++++--------- 8 files changed, 446 insertions(+), 458 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/font_size.png create mode 100644 app/src/main/res/drawable-hdpi/time1.png diff --git a/app/build.gradle b/app/build.gradle index 602363c..d8e2e6e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 52 - versionName "6.1" + versionCode 53 + versionName "6.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java index b30bed2..71c0700 100644 --- a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java @@ -145,7 +145,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { }); mViewPager.setAdapter(mBaseFragmentPagerAdapter); - mViewPager.setOffscreenPageLimit(2); + mViewPager.setOffscreenPageLimit(5); mMagicIndicator.setNavigator(scaleCircleNavigator); ViewPagerHelper.bind(mMagicIndicator, mViewPager); if (mFragments.size() > 1) { diff --git a/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java b/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java index 781dc31..ceafd9b 100644 --- a/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java +++ b/app/src/main/java/com/uiui/aios/fragment/ControlFragment.java @@ -25,7 +25,6 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; @@ -42,6 +41,7 @@ import com.uiui.aios.view.RulerSeekBar; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -60,8 +60,8 @@ import butterknife.ButterKnife; public class ControlFragment extends Fragment { private static final String TAG = ControlFragment.class.getSimpleName(); - @BindView(R.id.iv_back) - ImageView iv_back; +// @BindView(R.id.iv_back) +// ImageView iv_back; @BindView(R.id.tv_wifi) TextView tv_wifi; @@ -581,51 +581,89 @@ public class ControlFragment extends Fragment { private boolean flashing = false; private CameraManager cameraManager; - private void getFlashlight() { - 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)); -// } + BroadcastReceiver mTimeUpdateReceiver; - cameraManager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE); + class TimeUpdateReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + if (intent == null) return; + String action = intent.getAction(); + if (action == null || action.isEmpty()) return; - 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; - } + if (action.equals(Intent.ACTION_TIME_TICK)) { + //系统每1分钟发送一次广播 + updateTimeUi(); + } else if (action.equals(Intent.ACTION_TIME_CHANGED)) { + //系统手动更改时间发送广播 + updateTimeUi(); } - }); + } + } + + 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); + mContext.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; +// } +// } +// }); } @@ -694,7 +732,7 @@ public class ControlFragment extends Fragment { } }); } - },1999); + }, 1999); } private AMapLocationClient locationClient; @@ -811,5 +849,6 @@ public class ControlFragment extends Fragment { public void onDestroy() { super.onDestroy(); if (mWifiReceiver != null) mContext.unregisterReceiver(mWifiReceiver); + if (mTimeUpdateReceiver != null) mContext.unregisterReceiver(mTimeUpdateReceiver); } } diff --git a/app/src/main/res/drawable-hdpi/font_size.png b/app/src/main/res/drawable-hdpi/font_size.png new file mode 100644 index 0000000000000000000000000000000000000000..eac86f376d773d45aebb68c64002c696bdd9d298 GIT binary patch literal 1559 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 Xxzy0DY0`eH00000NkvXXu0mjfhP6hn literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/shape_thumb_icon.xml b/app/src/main/res/drawable/shape_thumb_icon.xml index 3d62cd5..925c488 100644 --- a/app/src/main/res/drawable/shape_thumb_icon.xml +++ b/app/src/main/res/drawable/shape_thumb_icon.xml @@ -6,5 +6,5 @@ android:width="@dimen/dp_14" android:height="@dimen/dp_14" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_control.xml b/app/src/main/res/layout-land/fragment_control.xml index f360f31..2f2d5b8 100644 --- a/app/src/main/res/layout-land/fragment_control.xml +++ b/app/src/main/res/layout-land/fragment_control.xml @@ -7,52 +7,15 @@ android:background="@drawable/control_background" tools:context=".fragment.ControlFragment"> - - - - - - - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + @@ -102,58 +113,16 @@ android:id="@+id/tv_wifi_ssid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_8" android:text="ssid" android:textColor="@color/white" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/iv_wifi" - app:layout_constraintTop_toBottomOf="@+id/tv_wifi" /> + app:layout_constraintEnd_toEndOf="@+id/tv_wifi" + app:layout_constraintStart_toStartOf="@+id/tv_wifi" + app:layout_constraintTop_toBottomOf="@+id/tv_wifi" + app:layout_constraintVertical_bias="0.285" /> - - - - - - - - + app:layout_constraintStart_toStartOf="@+id/linearLayout" + app:layout_constraintTop_toTopOf="parent" /> - + + + + + + + + + @@ -352,57 +369,15 @@ android:id="@+id/tv_electricity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_8" android:text="100%" android:textColor="@color/white" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/iv_battery" - app:layout_constraintTop_toBottomOf="@+id/tv_battery" /> - - - - - - - - - + app:layout_constraintEnd_toEndOf="@+id/tv_battery" + app:layout_constraintStart_toEndOf="@+id/tv_battery" + app:layout_constraintStart_toStartOf="@+id/tv_battery" + app:layout_constraintTop_toBottomOf="@+id/tv_battery" + app:layout_constraintVertical_bias="0.285" /> diff --git a/app/src/main/res/layout-port/fragment_control.xml b/app/src/main/res/layout-port/fragment_control.xml index ffc52c4..baf5b88 100644 --- a/app/src/main/res/layout-port/fragment_control.xml +++ b/app/src/main/res/layout-port/fragment_control.xml @@ -7,50 +7,14 @@ android:background="@drawable/control_background" tools:context=".fragment.ControlFragment"> - - - - - - - - + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -223,11 +46,12 @@ 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:layout_marginTop="@dimen/dp_28" android:text="手电筒" android:textColor="@color/white" android:textSize="@dimen/sp_16" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.25" app:layout_constraintStart_toEndOf="@+id/iv_flashlight" app:layout_constraintTop_toTopOf="parent" /> @@ -235,110 +59,164 @@ android:id="@+id/tv_flashlight_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_12" android:text="关" android:textColor="@color/white" android:textSize="@dimen/sp_12" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@+id/tv_flashlight" app:layout_constraintStart_toStartOf="@+id/tv_flashlight" app:layout_constraintTop_toBottomOf="@+id/tv_flashlight" /> + + + + + + + + + + + - + android:layout_weight="4" + android:orientation="horizontal"> - + - - - + + app:layout_constraintHorizontal_bias="0.25" + app:layout_constraintStart_toEndOf="@+id/iv_bt" + app:layout_constraintTop_toTopOf="parent" /> + + + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintEnd_toEndOf="@+id/tv_battery" + app:layout_constraintStart_toStartOf="@+id/tv_battery" + app:layout_constraintTop_toBottomOf="@+id/tv_battery" /> + - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +