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 0000000..eac86f3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/font_size.png differ
diff --git a/app/src/main/res/drawable-hdpi/time1.png b/app/src/main/res/drawable-hdpi/time1.png
new file mode 100644
index 0000000..3b9ffc0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/time1.png differ
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" />
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+