From dc7a38c12ebb948969246fa332f1366a3bb02584 Mon Sep 17 00:00:00 2001 From: TrillGates Date: Fri, 17 Sep 2021 20:39:00 +0800 Subject: [PATCH] create main page for c5 --- app/proguard-rules.pro | 2 + .../ic/launcher/adapter/MainPageAdapter.java | 27 +++- ...epository.java => AppsC5P3Repository.java} | 2 +- .../launcher/presenter/LauncherPresenter.java | 4 +- .../launcher/presenter/MainPagePresenter.java | 17 +++ .../com/ic/launcher/view/MainPageView.java | 3 +- .../launcher/view/pager/MainPageViewC5P3.java | 79 +++++++++++ app/src/main/res/layout/item_main_page_c5.xml | 124 ++++++++++++++++++ .../main/res/mipmap-mdpi/icon_pedometer.png | Bin 0 -> 5873 bytes 9 files changed, 250 insertions(+), 8 deletions(-) rename app/src/main/java/com/ic/launcher/data/repository/{AppsC53Repository.java => AppsC5P3Repository.java} (97%) create mode 100644 app/src/main/java/com/ic/launcher/view/pager/MainPageViewC5P3.java create mode 100644 app/src/main/res/layout/item_main_page_c5.xml create mode 100644 app/src/main/res/mipmap-mdpi/icon_pedometer.png diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index be4edd4..c4c0733 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -76,6 +76,8 @@ # 保留R下面的资源 -keep class **.R$* {*;} +# 保留反射内容 +-keep class com.ic.launcher.data.repository.* {*;} -keepclassmembers class **.R$* { public static ; } diff --git a/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java b/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java index 39bbdc2..2618fba 100644 --- a/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java +++ b/app/src/main/java/com/ic/launcher/adapter/MainPageAdapter.java @@ -1,5 +1,6 @@ package com.ic.launcher.adapter; +import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,11 +12,13 @@ import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.widget.ViewPager2; +import com.ic.iclooger.ICLogger; import com.ic.launcher.R; import com.ic.launcher.data.AppItem; - +import com.ic.launcher.utils.SystemUtils; import com.ic.launcher.view.MainPageView; +import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.List; @@ -50,12 +53,28 @@ public class MainPageAdapter extends RecyclerView.Adapter " + idNum); + ICLogger.d("protocol ==> " + protocol); + String targetName = "com.ic.launcher.view.pager.MainPageView" + idNum + "P" + protocol; + ICLogger.d("targetName ==> " + targetName); + Class clazz = Class.forName(targetName); + Constructor constructor = clazz.getConstructor(Context.class); + itemView = (View) constructor.newInstance(parent.getContext()); + } catch (Exception e) { + e.printStackTrace(); + itemView = null; + } + //MainPageViewC5P3 //主页面 - itemView = new MainPageView(parent.getContext()); - ((MainPageView) itemView).initViewModel(); + if (itemView == null) { + itemView = new MainPageView(parent.getContext()); + } ViewPager2.LayoutParams layoutParams = new ViewPager2.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); diff --git a/app/src/main/java/com/ic/launcher/data/repository/AppsC53Repository.java b/app/src/main/java/com/ic/launcher/data/repository/AppsC5P3Repository.java similarity index 97% rename from app/src/main/java/com/ic/launcher/data/repository/AppsC53Repository.java rename to app/src/main/java/com/ic/launcher/data/repository/AppsC5P3Repository.java index 9a00163..2b0354b 100644 --- a/app/src/main/java/com/ic/launcher/data/repository/AppsC53Repository.java +++ b/app/src/main/java/com/ic/launcher/data/repository/AppsC5P3Repository.java @@ -10,7 +10,7 @@ import java.util.List; /** * 此类不可以被混淆，由反射去创建 */ -public class AppsC53Repository implements IAppListRepository { +public class AppsC5P3Repository implements IAppListRepository { @Override public List getAppList() { diff --git a/app/src/main/java/com/ic/launcher/presenter/LauncherPresenter.java b/app/src/main/java/com/ic/launcher/presenter/LauncherPresenter.java index 9c971c1..8e2c6e8 100644 --- a/app/src/main/java/com/ic/launcher/presenter/LauncherPresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/LauncherPresenter.java @@ -46,14 +46,14 @@ public class LauncherPresenter extends BasePresenter { //动态创建即可 //App列表目录，动态创建 //注意不要混淆了，否则反射就没用了 - //data/repository/Apps+numID+protocol+Repository,比如说：AppsC57Repository ,numberId = C5，7为协议号 + //data/repository/Apps+numID+P+protocol+Repository,比如说：AppsC57Repository ,numberId = C5，P7为协议号 try { String idNum = SystemUtils.getSystemProperties("persist.sys.id_num"); String protocol = SystemUtils.getSystemProperties("persist.sys.protocol_no"); ICLogger.d("property ==> " + idNum); ICLogger.d("protocol ==> " + protocol); if (!TextUtils.isEmpty(idNum) && !TextUtils.isEmpty(protocol)) { - String targetName = "com.ic.launcher.data.repository.Apps" + idNum + protocol + "Repository"; + String targetName = "com.ic.launcher.data.repository.Apps" + idNum +"P"+ protocol + "Repository"; ICLogger.d("target reposition ==> " + targetName); appListRepository = (IAppListRepository) Class.forName(targetName).newInstance(); ICLogger.d("create repository okay.."); diff --git a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java index def41da..2f548c3 100644 --- a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java @@ -54,6 +54,8 @@ public class MainPagePresenter extends BasePresenter { public MutableLiveData bodyTempValue = new MutableLiveData<>(); //环境温度 public MutableLiveData envTempValue = new MutableLiveData<>(); + //步数 + public MutableLiveData stepCountValue = new MutableLiveData<>(); private final Context mContext; @@ -72,6 +74,12 @@ public class MainPagePresenter extends BasePresenter { updateTime(null); //注册广播，监听灭屏和亮屏 listenerScreenState(); + //获取步数 + getStepCount(); + } + + private void getStepCount() { + getValue(KEY_STEP_COUNT); } private final BroadcastReceiver mScreenStateReceiver = new BroadcastReceiver() { @@ -282,6 +290,14 @@ public class MainPagePresenter extends BasePresenter { updateEnvTemp(); } }); + context.getContentResolver().registerContentObserver(Uri.parse(SETTINGS + ".sport_step_count"), + true, new ContentObserver(null) { + @Override + public void onChange(boolean selfChange) { + //更新血压 + getStepCount(); + } + }); } private void getValueByKey(String key) { @@ -323,6 +339,7 @@ public class MainPagePresenter extends BasePresenter { public static final String KEY_HEART_RATE = "heart_rate"; public static final String KEY_ENV_TEMP = "env_temperature"; public static final String KEY_TEMP = "body_temperature"; + public static final String KEY_STEP_COUNT = "sport_step_count"; private void updateTemperature() { diff --git a/app/src/main/java/com/ic/launcher/view/MainPageView.java b/app/src/main/java/com/ic/launcher/view/MainPageView.java index 7cca92c..6b17865 100644 --- a/app/src/main/java/com/ic/launcher/view/MainPageView.java +++ b/app/src/main/java/com/ic/launcher/view/MainPageView.java @@ -38,9 +38,10 @@ public class MainPageView extends LinearLayout { R.layout.item_main_page, this ); initView(); + initViewModel(); } - public void initViewModel() { + private void initViewModel() { ICLogger.d("initViewModel..."); mainPagerPresenter = MainPagePresenter.getInstance(getContext()); mainPagerPresenter.dateValue.observeForever(dateValue -> { diff --git a/app/src/main/java/com/ic/launcher/view/pager/MainPageViewC5P3.java b/app/src/main/java/com/ic/launcher/view/pager/MainPageViewC5P3.java new file mode 100644 index 0000000..74e1144 --- /dev/null +++ b/app/src/main/java/com/ic/launcher/view/pager/MainPageViewC5P3.java @@ -0,0 +1,79 @@ +package com.ic.launcher.view.pager; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.ic.iclooger.ICLogger; +import com.ic.launcher.R; +import com.ic.launcher.presenter.MainPagePresenter; + +public class MainPageViewC5P3 extends LinearLayout { + + private MainPagePresenter mainPagerPresenter; + private TextView dateView; + private TextView timeView; + private TextView weekView; + private TextView heartRateView; + private TextView bloodOxygenView; + private TextView stepCountView; + + public MainPageViewC5P3(@NonNull Context context) { + this(context, null); + } + + public MainPageViewC5P3(@NonNull Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public MainPageViewC5P3(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + LayoutInflater.from(getContext()).inflate( + R.layout.item_main_page_c5, this + ); + initView(); + initViewModel(); + } + + public void initViewModel() { + ICLogger.d("initViewModel..."); + mainPagerPresenter = MainPagePresenter.getInstance(getContext()); + mainPagerPresenter.dateValue.observeForever(dateValue -> { + //ICLogger.d("dateValue == > " + dateValue); + dateView.setText(dateValue); + }); + mainPagerPresenter.timeValue.observeForever(timeValue -> { + //ICLogger.d("timeValue == > " + timeValue); + timeView.setText(timeValue); + }); + mainPagerPresenter.weekValue.observeForever(weekValue -> { + weekView.setText(weekValue); + }); + mainPagerPresenter.bodyTempValue.observeForever(bodyTempValue -> { + stepCountView.setText(bodyTempValue); + }); + mainPagerPresenter.oxygenValue.observeForever(oxygenValue -> { + bloodOxygenView.setText(oxygenValue); + }); + mainPagerPresenter.heartRate.observeForever(heartRate -> { + heartRateView.setText(heartRate); + }); + mainPagerPresenter.stepCountValue.observeForever(stepCount -> { + stepCountView.setText(stepCount); + }); + } + + private void initView() { + dateView = findViewById(R.id.date_tv); + timeView = findViewById(R.id.time_tv); + weekView = findViewById(R.id.week_date_tv); + heartRateView = findViewById(R.id.heart_rate_tv); + bloodOxygenView = findViewById(R.id.blood_oxygen_tv); + stepCountView = findViewById(R.id.step_count_tv); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/item_main_page_c5.xml b/app/src/main/res/layout/item_main_page_c5.xml new file mode 100644 index 0000000..9283ee8 --- /dev/null +++ b/app/src/main/res/layout/item_main_page_c5.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-mdpi/icon_pedometer.png b/app/src/main/res/mipmap-mdpi/icon_pedometer.png new file mode 100644 index 0000000000000000000000000000000000000000..8881488de77a48ea5e710a4f81dde7809583feaf GIT binary patch literal 5873 zcmVKLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z3?4~DK~#9!V)_67KLavgfiX_Jy3BC<<70?G^_gkCGF)Qw{{H{#z{0@5z|d@xS!of56$ncHx7Cc`H8euT@H-`SBR%qjFXS=~SP;PZ1? zO1#qQtMBd3hbxFwai5l<6*7%^hQa?HtJ0DZ{n&iD`40cTWSnPYL3Z>1jEjs63=9kh zo}Y6T;g^2HKi}>T00030|HAMXI$-(n_ZP$aU!R1e7JIzi+kOj0SXQbFl{VH zUtVM?KRIbvlWB$zKO2v&+m_5jt6jUTzW@DsoPmLXfhBNf@z+m@hd7tq-j?*{$A_)g z!`ErX?5kZ>W)P>xz`(%3vfizSlX0fe|NVZm86DTh|NokHM*8g26S~2H3mN`1{AXbK z^ZzeHw`Cz?;(> zn0l~zg9^XwPLyzX|LgOcnRc~|9J5US|4ci>9>2eC28+9lC4;++C5qqEG=mr!7#J9q zJGUhR#Pa|De}*4_e=&Uj`;+1GudfVTEF8Qxo03l-^Pg|Z&C2?bgIQ#l~hKHY@S2E7fZ?ljzI-xD7bak3-HDj7)5JSbu$vuoS zjsAa1I>O7v!tsR#SKyTB#kBLVa<*q^1~Yi?$lto{!9lOPpB_(E<(JR|9)zIM;Lc^oO;P;`{&SyWh(`vkEg?7#f`x05GT-1_1(hJ``OtWEhMjy2PZDdJ=j{ zkFbg)>~{oMdaXHo<_Q3RM$iyfn^`RD zs^s=Ym$O*eKD{HqMqN$j8dcFi%v?~fXhmsn?Ri;O1-Di3kW)L*{Ka|c+K$8*!fQFc z7u>Vji&LKT)La}KQ#Gr#KV2rnQTD-Lkb0fbmFAptgIBta-y}e|-ARYR0!TkUi_hJ3p<#*(h75zo*Lmkx5Ab@<;n%t z#}2T=1aH5!?{E6naa7#-I9f3_Y@t;5nKdZdJl0#RZlL~_Nl#I@yYY-m+fbJvqU>nC zjfu_S?nv1Rn|yB1%UwCv<^~JFD?29RSDuvC^0KWg=Pv>X0@GX=B{c>8F>KSc4+**RXhjb7%VQd>L2@f(koji5Z~ti9>e)8!w!gp5d(QKm^E>Z*-rw(hvY>n_NB{t@MF{|4 zN;VB*bP@mnUM6!&tG&XRH;p$(eF%(`)i4>DUX?Hc87Zd_Q zKw!JcSKv)`g_*8KcwY?=AOML#{CxXwM>yBJxb6TrEYY^F=oa_ubPfyj3%c(5jZTl( zPDrN&(=rKIs~Llnru7HibH)t3YDWa5xJ*8*D&fMV_OeZYq2Q>spgP?-Cd5oxuQjoe zv+r=-&#e58at|*Z=iG4f4T5`v%`hq%2Mou^06+(TU;w}X;2Z!Hel!98&?A_VPP=a7 z#^yX36KU$J7r1ib+p?=TjU4>e9>2=IFHq)9B$tFGreon)z-$wulj2GtlUBsP^o^6HOQQ0s#S#Nx)p) zti@N~Ew^sC&9xUrHsP0YU@}#|gQew~^fzz8Pc! zF@r*+*hJntnOY{|I`5k2e_<9;?x3Bz#g&Kavahs`bi%DZJ{T$K0GU7ngn)pqqE<*z zTOqw}xXn6Ka4lq)xo;`}{NsZp0RU_@_CDmIX;Zz2cl=C_u-Fd>M86^tS9r>C-(DP` zgtZ{l<;I%RaIL%2o5^EWBsXRm9JPyJ*=txP_lyrrJ{%G(YZ+<(v3^)UGgQ)Ur>dEV zM9+lOi^7tvj+*mJB{H-Fe-8zFb&FR7Pz(hULcE#hmS{j#oU4%BbTQ^+b9RJ#@s45u z1Qu#oJxFngWZJ5k7N$8x6&lX|5-IED?OIh5{>)m=%Uqkni0Y(_-PMVy=`JxL8VV`{0W{C71J>K(IKtwq<-F?;!E!_j3V=_D(aAA6A_b(l3<8ZjIqLE%gKKX_Udd|B4`?6jHp+2JSg$5O zr;mb=|5PHv$D6@8Iw?G|FpQqFJOQ{*>z6Wl>|}O*29w>8$yA=DI>NFIiQk~_cA}uG zLZ(Po0Dq%3V5~$fJ!Z!+yU|;7rnIYKm0q@2caSkXGtDV#Cj}u%{*@cOjTaK}-ET~N zY}dM|9&x|IlZnASF%QlhSX;)-1ssEA z+73K_+8RdfQ0s#*v-LISTn{?$tU7w@$;6<3G(R<_!ZY2A^nbb9==AvHW<&RQnv!mO zNq6O33X#N0X}%P4r;pD^2t+KJpNgWGjEqUA5UttT{jm$e68>`uX2O_6{M3u;5*oQB zAe4lVw6Y!-f8F$4Xhl<^b~$KR<+Y7=HOM2BH(g+)PV7Z> zc_&`1ZV8LkEdc<)L&p(3bR6Ga?%O{vAo1-9w=Wj`HU47&!{ZKs7&JO500000NkvXX Hu0mjfeG_3J literal 0 HcmV?d00001 -- 2.17.1