From 6f073ef28d94202eac2d94ad79dcb16bbdfc1b1b Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Thu, 17 Nov 2022 09:37:42 +0800 Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uiuios/aios/activity/ControlActivity.java | 165 ++++++-- .../com/uiuios/aios/manager/AmapManager.java | 5 +- .../com/uiuios/aios/view/RulerSeekBar.java | 4 +- app/src/main/res/drawable-hdpi/font_size.png | Bin 0 -> 2698 bytes app/src/main/res/drawable-hdpi/time1.png | Bin 0 -> 3341 bytes .../main/res/drawable/shape_thumb_icon.xml | 6 +- .../main/res/layout-land/activity_control.xml | 271 ++++++------- app/src/main/res/layout-land/item_weather.xml | 6 +- .../main/res/layout-port/activity_control.xml | 359 +++++++++--------- app/src/main/res/layout-port/item_weather.xml | 6 +- 10 files changed, 468 insertions(+), 354 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/src/main/java/com/uiuios/aios/activity/ControlActivity.java b/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java index e785d4f..ad43865 100644 --- a/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java @@ -40,6 +40,7 @@ import com.uiuios.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; @@ -66,7 +67,7 @@ public class ControlActivity extends AppCompatActivity { @BindView(R.id.tv_bt_ssid) TextView tv_bt_ssid; -// @BindView(R.id.tv_font_size) + // @BindView(R.id.tv_font_size) // TextView tv_font_size; @BindView(R.id.seekBar) RulerSeekBar seekBar; @@ -538,53 +539,136 @@ public class ControlActivity extends AppCompatActivity { private boolean flashing = false; private CameraManager cameraManager; - private void getFlashlight() { - 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 { +// private void getFlashlight() { +// 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("关"); +//// 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() { - @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; - } + 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; + + 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); + 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() { return getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH); @@ -763,5 +847,6 @@ public class ControlActivity extends AppCompatActivity { protected void onDestroy() { super.onDestroy(); if (mWifiReceiver != null) unregisterReceiver(mWifiReceiver); + if (mTimeUpdateReceiver != null) unregisterReceiver(mTimeUpdateReceiver); } } diff --git a/app/src/main/java/com/uiuios/aios/manager/AmapManager.java b/app/src/main/java/com/uiuios/aios/manager/AmapManager.java index 4383657..60e217a 100644 --- a/app/src/main/java/com/uiuios/aios/manager/AmapManager.java +++ b/app/src/main/java/com/uiuios/aios/manager/AmapManager.java @@ -27,6 +27,7 @@ public class AmapManager { private LocationClientOption mOption; private BDLocation mLocation; private CacheHelper mCacheHelper; + private MMKV mmkv = MMKV.defaultMMKV(); private static final String AMAPLOCATION_JSON_KEY = "MAPLOCATION_JSON_STRING"; public static final String LONGITUDE_KEY = "map_longitude_key"; @@ -74,7 +75,7 @@ public class AmapManager { public BDLocation getNowMapLocation() { if (mLocation == null) { - String aMapLocationjson = mCacheHelper.getAsString(AMAPLOCATION_JSON_KEY); + String aMapLocationjson = mmkv.decodeString(AMAPLOCATION_JSON_KEY); if (TextUtils.isEmpty(aMapLocationjson)) { return null; } @@ -147,7 +148,7 @@ public class AmapManager { case BDLocation.TypeGpsLocation:// GPS定位结果 case BDLocation.TypeNetWorkLocation:// 网络定位结果 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: longitude = " + location.getLongitude()); Log.e(TAG, "onLocationChanged: latitude = " + location.getLatitude()); diff --git a/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java b/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java index 9302370..183707e 100644 --- a/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java +++ b/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java @@ -37,7 +37,7 @@ public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { */ private boolean isShowTopOfThumb = true; - private int radius = 8; + private int radius = 12; public RulerSeekBar(Context context) { super(context); @@ -60,7 +60,7 @@ public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { private void init() { //创建绘制刻度线的画笔 mRulerPaint = new Paint(); - mRulerPaint.setColor(mRulerColor); + mRulerPaint.setColor(Color.parseColor("#d0cccc")); mRulerPaint.setAntiAlias(true); //Api21及以上调用，去掉滑块后面的背景 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..84e2d3f9f3cad902dfeb670a8dada964d8d17312 GIT binary patch literal 2698 zcmV;53U&2~P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ`5J^NqRCwC#oolRJMHPU*v+rpu7*eH*2uf23;25q{3iL zpa;EI?m5uW&~Qhx4EnU@#Ix0obhzH{gAWU?t+qsKPHL;IwlyaOm))otmfOP>(M8u? zazI^nQo{|d%Wi}UxP}`b!gNTZOF|I zD+)D2b(DU+2N(~$3H%$_4BP^2j~MXKkeF-9F>fR*)N%L2z(U|GV3!P?Ex=vCH-YCP z2AwO~l^1YNfIoOK@WmYZF8~(zW(Db=q<}k;{SaMhe(EJH!@nh+Xs7 zHKcCjBw%%wyJ}m&p>@s20l#-p&NILXz>8Jws%@+?G|L?geBV)72La!z^3+LE2r;d7 znw|=|lG(sv5l@{O-2x6xF0jyf8u*c=r`!X4Ir8~&M`Lh^j@1<45#dK|1>Og2)9>d1 zH(B@*CjgID&EZNSv))A(*R^;UT!7nwr50s>ql#9XWx*j@?*!m4z-|Ve&A{QnYc2oZ z2iO3-U8v&>;NB`(aT1aB&K2MS{J0I=p>BJLMIDtJi`!Xnh}JtASPM)x==>Kr6nHk{ z^Rd8RfpJ1z^K`df2`f$_vEI`JxB&MU-~zk^e8-}$#Z|K6SO8yap>vI;&Q?L^U|>O2 z0fz|pDBz=l&SStzi?ZItE^>7_*~^YmL5>0N`4-o8ZI1G;1)j99;!COkxYfxDZBb!Q zU?Z@HFt$zvcH}7cT;OIw=S5Uz$bTY)JkZX9L$u!W1h{BWJ93tLEAS^lXB_bP*sXZD z1&6kv-vriRUI^&dWAug&%AXGWT+rDL90~MA2KfI80U=xPnaHa=zvvJysQj!I7DL39 zF4MHW;QlV_Sq1b8I%9$N#v1tu)q)pU z=qzZXdbJ6)IB^&8%3x@KPX~S@==AD2 zY*8{67!%>#w=LjiVB_!k7CK7`zJ`~mjx-u+nuZd=It&#)YzPj~F(qB!(Ws=q$*6ql ze`x3HN#J3^j9I549SDA&MMJx}B(Rt2fJcv^;oYvUZ(C?iRtOe67Wf;mw?XG$I^f{* z27V8?Fo*uLsFkWv_B#dBJ7&9)m+z173q#waN4b zQR%Q7JYCOf2V?z-s3iSTC4}kG$pTzZ33a~U&UNI-T|)o~6d?e%nHu@psJ$!jB}Zi) zWBJ<(ce2WCWryhQd9*?23E&gJ8#ygvXy@G)>=z3@>v*2sr>9jr%euj3Pm?|^zy-Bs zWu?~3>ku|j={zg6WlD#y%(f_VJMf@(sNOH=?uXj$ddEn#;PE<0u&bx~wxQB{`V4`V zwZgFVJa7ssP7UyF;B!K~D}hr-;ut)~BV15f8K(4`X%_e6ieYd;CFQLXzH<`r?lJ+F z@xZ3h*rnvSmT9z4Xm9EOg-Nym%iH{4imr`9?RP3I&{2kb2$)nty`wT5wJFF6e!Zxj z5v_6u@_O;CvizO00AEm2z3Vby*f>{NSs$B`({B$!?L8h5fcFQcmIV0fjPChN;d|>b zN2P4ihvt<9*!LK`z+!6TTKe=D`(T^TPDO1|K>*lq`20SyQ+|eIDzLBbG1&LGup9Ex zgRcNr>A&3`Sl*+ZqsPcT>};lVlTZovlH7**gn+jJA1B{NIVbaA@E0>(Wbp%+ppxKx z$eyT3nJKY-wVvuoGD**)#~5_hpmM%^^_l~|$6%X-L$CLEJ!c^AT3Bvb)<)phg3c7+ zBV{;QK3deVsO$)ntU{fm;Y*}-+t*R+yS8GJadM8Q-`n1f7|{?!EyREfX!QWfOABtV@}S94fsfXPIvRHwrqtqfVx;R2MxT`OJ$S;CER~ z3QhhK_=5(L=hcfG*_!9ef_-cNZ)ykR0E5m>)Vis!Wb=bjr{;|^==1|GlRw1RkIFAI zeQ!W}(`yTaJ4nk#qy+(ii_yA1zZH=52B9gHOWf+<`I7YITOQ&>`yW2wZ@|iT?1Yap!I%|aAZ!=fZH8L z>MCqG9u)>O9pU>7DrNR{Pd9W7D*bjsAb|Vz@89IG%mI@HyR_nk$mcWPo-$dT7wrP@F354`ov8DjN1AihDzhBUUeb1R)OJeUPMJQYod}aGM=j;~l0ASK zg3jZ>*Yq5+;pm3X7wVmi+TF3jL0wjWUCfDXoU0o>Tgr6QE=H3qCEwzLjXY)1uogN3 zj7=Av*%~b66#X*ED&TjX0ZXemJAk_jsCOM|gSgb=?dRHhO@O-@i%+)D`JrdH6Ob3} ze~WrDX%TXph0ij>we{KnPCLArCfS1jtsK*lSB~y1u>L!d_ckv;4xi@clyurM1n<}+ z%V?ipT%^pkXmocMSpPQUr?A+*7dX)z}UCT1mX?iA4-Wgno`w{PXuVs1do1bteuZK_-8k2MX6E;2Ls(a9sngAqNH* zI*VlGX*_krt7OASVrq>w+^_%-L9V;(67NruU3A@L2jHtDRcfuZ)s}0)Bi))ynPD_b zY{iXXud0LXW~WG$fQSF^s)8;RYzTm>3OWd|Apx!m=%B!c2)Ok|5drKVp@t4PblAZ| zjR~*`HlBbFuQ$5TYm+#o-3@QF{3YXkR#~R9qm};+0P4tiHF$IO(EtDd07*qoM6N<$ Eg8XnH$^ZZW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3b9ffc03132748a5304448b2e3cbd65e0bee9aa9 GIT binary patch literal 3341 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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 5722823..f2171a8 100644 --- a/app/src/main/res/drawable/shape_thumb_icon.xml +++ b/app/src/main/res/drawable/shape_thumb_icon.xml @@ -5,6 +5,8 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_control.xml b/app/src/main/res/layout-land/activity_control.xml index 28fdac5..d83e2ba 100644 --- a/app/src/main/res/layout-land/activity_control.xml +++ b/app/src/main/res/layout-land/activity_control.xml @@ -43,8 +43,8 @@ + + + + + + + + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.32" /> + app:layout_constraintStart_toStartOf="@+id/tv_wifi" + app:layout_constraintTop_toBottomOf="@+id/tv_wifi" + app:layout_constraintVertical_bias="0.2" /> - - - - - - - - + app:layout_constraintStart_toStartOf="@+id/linearLayout" + app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/imageView" + app:layout_constraintTop_toBottomOf="@+id/seekBar"> + + + + + + + + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.32" /> - - - - - - - - - + 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.2" /> @@ -478,6 +492,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16" + android:maxLines="2" android:text="未知" android:textColor="@color/white" android:textSize="@dimen/sp_12" diff --git a/app/src/main/res/layout-land/item_weather.xml b/app/src/main/res/layout-land/item_weather.xml index ba1ad16..db8cef0 100644 --- a/app/src/main/res/layout-land/item_weather.xml +++ b/app/src/main/res/layout-land/item_weather.xml @@ -29,7 +29,7 @@ android:maxLines="1" android:singleLine="true" android:text="17:48" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintBottom_toTopOf="@+id/iv_weather" app:layout_constraintEnd_toEndOf="parent" @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:text="15-22" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-port/activity_control.xml b/app/src/main/res/layout-port/activity_control.xml index 5620200..a08ca6d 100644 --- a/app/src/main/res/layout-port/activity_control.xml +++ b/app/src/main/res/layout-port/activity_control.xml @@ -43,7 +43,7 @@ + + + + + + + + + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> + + + + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> - - - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.3" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,7 +53,7 @@ android:id="@+id/tv_weather" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="@dimen/sp_20" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:text="15-22" android:layout_marginTop="@dimen/dp_8" - android:textColor="@color/black" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintEnd_toEndOf="@+id/iv_weather" app:layout_constraintStart_toStartOf="@+id/iv_weather"