From f6d7269d3d1db3ff08fdaa03f3eca4b77fafd990 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Mon, 25 Dec 2023 18:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BC=98=E5=8C=96/bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zj365/dc/activity/MainActivity.kt | 21 +++++- .../dc/fragment/DynamicManagementFrag.kt | 29 +++++--- .../java/com/zj365/dc/fragment/MineFrag.kt | 8 ++- app/src/main/java/com/zj365/dc/vm/LoginVm.kt | 6 ++ app/src/main/java/com/zj365/dc/vm/MainVm.kt | 3 +- app/src/main/res/layout/item_health.xml | 21 +++--- app/src/main/res/mipmap-xhdpi/bg_xl.png | Bin 7759 -> 5298 bytes app/src/main/res/mipmap-xxhdpi/bg_xl.png | Bin 15262 -> 11095 bytes app/src/main/res/mipmap-xxxhdpi/bg_xl.png | Bin 0 -> 14110 bytes .../com/xty/base/dialog/AppUpdateDialog.kt | 6 +- .../java/com/xty/base/h5/CloudJSBridge.kt | 13 +++- .../src/main/java/com/xty/base/h5/WebUtils.kt | 2 +- .../main/java/com/xty/base/utils/AppUpdate.kt | 6 +- base/src/main/res/layout/dialog_updata.xml | 7 ++ common/src/main/java/com/xty/common/Const.kt | 4 ++ .../java/com/xty/common/util/CommonUtils.kt | 25 +++++-- .../res/drawable/shape_bg_health_round.xml | 4 +- .../layout/layout_customer_date_picker.xml | 1 + .../mipmap-xxhdpi/ic_niaosuan_selected.png | Bin 3038 -> 2856 bytes .../com/zj365/mime/act/BaseInfoChangeAct.kt | 65 ++++++++++++++++-- .../main/res/layout/act_base_info_change.xml | 1 + .../main/java/com/xty/network/model/Update.kt | 2 +- 22 files changed, 180 insertions(+), 44 deletions(-) create mode 100644 app/src/main/res/mipmap-xxxhdpi/bg_xl.png diff --git a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt index 072a3aa..8e17209 100644 --- a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt +++ b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt @@ -35,6 +35,7 @@ import com.xty.base.dialog.AppUpdateDialog import com.xty.base.dialog.DialogActivities import com.xty.base.vp2.VpAdapter import com.xty.common.Const +import com.xty.common.LogUtils import com.xty.common.MMkvHelper import com.xty.common.aMapUtils.AmapInit import com.xty.common.arouter.ARouterUrl @@ -159,6 +160,24 @@ class MainActivity : BaseVmAct(), Consumer { mViewModel.getBanners(userId,3) mViewModel.getIsDemonstate() mViewModel.searchInviteInfo() + + if(EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION)) { + AmapInit.startLocation(this) { + LogUtils.e("DynamicManagementFrag","${it.city}") + MMkvHelper.put(Const.LONGITUDE,it.longitude) + MMkvHelper.put(Const.LATITUDE,it.latitude) + MMkvHelper.put(Const.PROVINCE,it.province) + MMkvHelper.put(Const.CITY,it.city) + MMkvHelper.put(Const.DISTRICT,it.district) + // mViewModel.getWeather() + + } + }else{ + EasyPermissions.requestPermissions(this,"申请定位权限", + 0x00022, + Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION); + } // mViewModel.getBindList(BaseDeviceBindListAct.DeviceType.BODYFAT.type) } @@ -279,7 +298,7 @@ class MainActivity : BaseVmAct(), Consumer { mViewModel.updateLive.observe(this) { if (!it.data.url.isNullOrEmpty()) { - dialog.showUploadDialog(it.data.url!!, it.data.log,it.data.versionName ,it.data.isupdate) { show -> + dialog.showUploadDialog(it.data.url!!, it.data.log,it.data.name ,it.data.isupdate) { show -> isDialogShow = show } } diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index 13cacc2..b43165c 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -624,20 +624,29 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission mViewModel.getMySetting() mViewModel.getTips() mViewModel.getRank(2) - if(EasyPermissions.hasPermissions(requireContext(), Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION)) { - AmapInit.startLocation(requireContext()) { - MMkvHelper.put(Const.LONGITUDE,it.longitude) - MMkvHelper.put(Const.LATITUDE,it.latitude) - mViewModel.getWeather() + if(MMkvHelper.contains(Const.LATITUDE) && MMkvHelper.contains(Const.LONGITUDE)){ + mViewModel.getWeather() + }else{ + if(EasyPermissions.hasPermissions(requireContext(), Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION)) { + AmapInit.startLocation(requireContext()) { + LogUtils.e("DynamicManagementFrag","${it.city}") + MMkvHelper.put(Const.LONGITUDE,it.longitude) + MMkvHelper.put(Const.LATITUDE,it.latitude) + MMkvHelper.put(Const.PROVINCE,it.province) + MMkvHelper.put(Const.CITY,it.city) + MMkvHelper.put(Const.DISTRICT,it.district) + mViewModel.getWeather() + } + }else{ + EasyPermissions.requestPermissions(this,"申请定位权限", + 0x00022, + Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION); } - }else{ - EasyPermissions.requestPermissions(this,"申请定位权限", - 0x00022, - Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION); } + } /** diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index a025247..f62bde1 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -281,7 +281,11 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { } binding.llUpGraded.setOnClickListener { - mViewModel.getVersionNew(BuildConfig.VERSION_CODE) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + mViewModel.getVersionNew(BuildConfig.VERSION_CODE) + } } binding.llCustomerService.setOnClickListener { @@ -319,7 +323,7 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { mViewModel.updateLive.observe(this) { if (!it.data.url.isNullOrEmpty()) { - dialog.showUploadDialog(it.data.url!!, it.data.log,it.data.versionName ,it.data.isupdate) { show -> + dialog.showUploadDialog(it.data.url!!, it.data.log,it.data.name ,it.data.isupdate) { show -> } }else{ CommonToastUtils.showSucceedToast("已经是最新版本") diff --git a/app/src/main/java/com/zj365/dc/vm/LoginVm.kt b/app/src/main/java/com/zj365/dc/vm/LoginVm.kt index ce6f21d..c8d2662 100644 --- a/app/src/main/java/com/zj365/dc/vm/LoginVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/LoginVm.kt @@ -4,6 +4,7 @@ import android.text.TextUtils import android.util.Log import androidx.lifecycle.MutableLiveData import com.google.gson.internal.LinkedTreeMap +import com.tamsiree.rxkit.RxRegTool import com.tamsiree.rxkit.RxTool import com.xty.base.vm.BaseVm import com.xty.common.Const @@ -34,6 +35,11 @@ class LoginVm() : BaseVm() { if (account.isEmpty()) { CommonToastUtils.showToast(R.string.please_input_phone) return + }else{ + if(!RxRegTool.isMobileSimple(account)){ + CommonToastUtils.showToast(R.string.please_input_ok_phone) + return + } } if (pwd.isEmpty()) { CommonToastUtils.showToast(R.string.please_input_new_pwd) diff --git a/app/src/main/java/com/zj365/dc/vm/MainVm.kt b/app/src/main/java/com/zj365/dc/vm/MainVm.kt index c6a6753..92ce411 100644 --- a/app/src/main/java/com/zj365/dc/vm/MainVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/MainVm.kt @@ -15,6 +15,7 @@ import com.xty.network.model.RespBody import com.xty.network.model.UnReadMessageBean import com.xty.network.model.Update import com.xty.network.model.UserEquipmentInformationizationBean +import com.zj365.dc.BuildConfig import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.launch @@ -64,7 +65,7 @@ class MainVm : BaseVm() { } fun getVersionNew() { startHttp { - var response = apiInterface().getVersionNew(1/*BuildConfig.VERSION_CODE*/) + var response = apiInterface().getVersionNew(BuildConfig.VERSION_CODE) response.getCodeStatus(updateLive, nowData) } } diff --git a/app/src/main/res/layout/item_health.xml b/app/src/main/res/layout/item_health.xml index 048a8b5..dd0c4f4 100644 --- a/app/src/main/res/layout/item_health.xml +++ b/app/src/main/res/layout/item_health.xml @@ -3,19 +3,21 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/dp_144" + android:layout_height="wrap_content" + android:minHeight="@dimen/dp_125" android:layout_gravity="center_horizontal" tools:ignore="MissingDefaultResource"> + app:layout_constraintBottom_toBottomOf="parent" + /> @@ -60,17 +62,17 @@ android:id="@+id/ll_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/dp_17" + android:paddingBottom="@dimen/dp_13" android:gravity="center_horizontal" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/ll_health_title"> + > ~j0=_OQ=5^0L`5Yf;(7%38pG(nJ#v{3yihh79lK$`R>p_fP# z5s)TLKnw_xUPI5#x#xelcZ~afAMSnFdyVn!wZA#n{N`F?trcsikEEyNqy+!~^jex4 z#^iQ}{2YR*$nR7A^?Y(e;cbjW0IEm02><|#o0f*UX~5&H+#okAv(SOjmZZS%8yxd^ zWkvo+J0($WPC(}#?1!QuM>A8_SmgR0+xrC!x3zlSVaKsyU&|*o7A~DEW6c_W^Hr3u zCiw|6ed-y!!$hky`yt&r`Oen>%&V-}4K2^jx`DSFEu$v6bsp>n-1GKc+ffQOI->o& zq>;;zk)5<9g|)@!qAd^j5~N@Jh2Xyi*3iZnf7YOHw!6t0J=YaRinEW^{`0vyS^;!+ zcJ_6d2lSPH>=slp!sSG`WX20lB;G>#7R_oJRK zDE3D`P2ZZ(#1?^Ur+<2_dbP}LP*YKv!mhK$#hc#IbIlx@luDQ*mX?-gCB(Z>hnq94 zudlz4ee#I4qG&?Gx=aej%a%BlIl2~db%`kG{+Nhm8e_fAziCl`ibjOjTj>+HdCfzX z9yS|Z7>M(hJ|B8F70}Ll>v0vL*4&(-|8XiNS921iGjpebK9U1FY-&c|?0GRdc(f5> zAqr}-sy=Qt{NO0uRt`S$dR|vQDIqHB=9sOEvk6?L!2hX4E(q(o;K|;8LIHn(@dyE~POlIi5{RG1svUCE>|EaEmoQ zAs)*#$jXv$R9*YD5C7b3LM|gdgBBRtds+j!RBiuqsK%66@A7 zEH`Y)ZqIf7{&EJ1m ze#awaUWV4Tw%4g{>bO676pNzHt9*-7SwF9G#q>wyi(JbRpP!gGYIL7}HsT;d%q|Hm zeJ8pQ1&M?(2}Yp<19Bf`=w=PfY~uKf7yCHC3n#~SyAGfyOP zAS5dJw)cW|iNd|=JbvI1OQm$7*p6%F6CNIJ?%-dOWhRjm9Ua@P#<6?)Snfd>-M3~r zp^lC@*P(Ilfw5+*xi1M8%dCVKo4BCumXMwp`ml1BxvVus)@2%ry`~-~XGPC4s8kZB zk3GoO&h95)BDcc6O_}LuScY~2U+Ce{(P_LdS$=#_i50B$8a+LM;A7!!{qVJsS))DH zqo4Gn;ALm#pu<(FaSlF6Ll*?rL|~TKl#~<{PIH-W=(ih|nK}k6_SucC5eKV9X0Jy) zX?WCVTsGNDYkYI~PtWPVNFEg;VLO#E(pa#3ZnqY6bRyVvo@^>yY; zWMaFrjLc6X?bGRq3N3Ty%57=U=seCjY}J(itpO~-!)@UOKG*;Ip0$}-7qG?9mx&o1 zyhIw6UkW{+C!M9`wdZCB{l>cv5D!3HgN{?aeeYUd9JyBMmW{Mc%kf9$v0jaI5J`cG z3wy}rw>oy+nmiyeSy@@NU_x->*3amZu^2_yAW!V(|u26-iORl z>zw?G**O9a{QXA-mHe;F#4^rA!oCu)PC$SrZet z;NUlTawAH+%@Qd5RlHg+SJJ>Rk~eV0e}ZtBW@U(>q=39a=F6$5T&^^Xss?q}SJH;1 zm+#GlGUDt^weD7QH3kuFHd?PBnJ+~pAtzDY-yeVR<6c{0;8VSrTwix~&z_m-tA;AqFOwp8jnM|LwGkfrd-b5(#DC@g+_zzm(7vF^}h9lw*4;RO&XomJ!OH-3o=c%$m z?X8go^sk6LF6UNTw_rEoHs8&-dJa!@0H}H$eNjMcdb_c+6zJlxVm*40J~*h=W%%iw znqfrsTCf=|fZATSZLe;?kMCXjF%SmEbZ0~;Bpxgu3?!+c4fJxoxsi45^J_!ByBvL# zl(KrVcZx;BwFo5x#O)A$qjY)<9S~ZZkLKf1I_6`z#t^of*yWnRl=o`)*H+I*`xl{c z>@Y@tc5NCE>kY`Fr=K;kaP9ouKYgHoaapI=sAspnq015N$47-T)P{al4u63=BY#d% zul>dU^9KBfE9jShZJJU{)u1=WwAqMwT$=;+27xffGhoYmjD9Z#K_z!jfnL9PbErFU z$Z9QskTSgvmTRCsFN#!`GW`>5br0C^k{hzgDR5tuEII&m?=}Vl2SRkAR#8+G;22H- zMK}oh3f>H+2STph1^|IHaH()lMotiv-4y@=F=5caWdS)bTxt>k1`7djppW;RAsF;~ z3J63K5J3|a{}l?r8U6uMaz)nDmOe*h>(|jwFG`M&tdcaYhV!Tu*^1F%)7kwU-dLFa?-Z*gZj*hivJEbirj& z8hGvh5(RpSi*xk2?rkP_N{S1*tg8G(>0*A&pCZGif@9`nt)5c)CfuYa%j{CZ8HG-q)W$q0M$~b`Tb4_U;%x_y~|IKE)ph> z{-2siFc$ugfg2bymn;C_Ur;iG2r;{eZfaT(oL2|04H-dOpNH=dKP zB!w_4D7t0)_2U}=++0{t8=HGe$dl!tb-9LP#Y-+D~dNO@s_}0%WD@9H@ zB@ZQ7FFQL`A8^?FkghI$gkGCj*&6f)X}FP z=*<43DoI?!TaRI%Y90X# z(24j^pNkWLh`nxa1Ml}%wR-_pTOTT4*|LAJb(?59-dr~DI=mA^5ugJ8ARDfTQ&slc zT#vkWZwjaD7>+DP;QY4cidVc88XFo+rsVW$aAQX{p}{+gf5g3Wd*+1tL=ValHf+)e z-uN+A$Z)-4ipUnsT2~!8^%i-}fa!EvZ{p&6XUO@Lmf2Jd1mWDk7Cs#bZ)1AJoX}Ez zKGE~iK>5xcbLBiuq4mJ~&l?i)HlZ_3k83^oO3KSsRdVxrc%~YIjyF%atf#xQz_Cr@ z5-XHIaUrx)qW6#9SmrR|c5kmUvhni+`kppK?Tf+s*~-ssFPWK{T`Map@CLjgJ`ZKG zHwB}7YIX&7?V(?*LD~}&69$*->tpx)%1n*SZljE)7W*_kYBDcQ>{YUL$Cb954>E6s z5Pmta+@JjfEkc(t zWXulT(5lx5Q?Z-v@fkx;<{JIBa$a`r{dI%BCxCsZSELkh%fkuSxVkJ${bz8g!+h4S zO#f>4c~!Q`nwrtl^iY8rM38i-!57)#nL^@H*H#SIvl9w_(7@4_mCPr1E#NYNpWk8q z;`AWQZ+~U*Vek@BWfV_pNlQx$El4IZ@P6m8;z!{hR~nZ&ckYNk4GIe4ZC`uaMLwFI z*oQVZubBOygnnHl?|QM9w~(P1_#K1C?WmlC{ti3R)C}%7C0?hGjt%BacE~CAa|@+4vVqTJtS7Mn-Tjwz~q8U)$q@c92bf--1 zyo-7+?NblGwzFaU?$=1Z`2joW3>~cFa87R`k5Z^ouD+T&c#s)!lA@{#hf@JB9BK_E zSiAf$`q*rIBD=MkVfgbJFB!s-2-C9y!ymwrx4bZ6)Xd=Dr@UR0`><^MU2TCB&BYMn z!n}Ev#gV(2Sy%?d?n_6eA@|QALuca^l>aN-L1XYzSQSd*3O~m7INQ&xO? z+Me*T6o0vzToFh;ztW~lwShdBE!$dK{e;p6m2MVuAT+(ULpip!hD_tOQpA_!XQPs{ zp+lUeaf|}#J=v;!0J!r!NS7A{MrI37U$6|N z=I@F4G~bZD7P&9)B%-L)<}tEbFYi8gxT+!HSAifrFf*H$LZqfcqDjF)yGYhNGhp!G zS|IOUaF^e1cav;+IivM-GbDTzl>x%_LBXn?)VadmZ#+b=H6(dOvHzoIRUW#?D4 z*R{6d2Lhlr)+ z-pJj!4H0%V$(2#g{p!9xi>}ZPKELYd%osg7*6o3ln%Q5(Pqfifa<5g8f%161>Wz^$ zdGj(;*ZqF{-dvu!1lBFPuqP=6j)7cp+oB4s8y$a$n^~7$q$iVT17Vrui;CuI>Wbhc ze^(D=ORVI#7IPs~p~D5K#kuACdzm)*3b7dJ`Qc`iRr$#m-R5V}==Z-iasXMeHu<@_ zGBE2c;`n=4^rM?4$089&QC8a)4UKA~UeAIRbJN4+w_=-)%2H}iHVK3Rd>M;gmiDBa zo(1g2O}50aye^Kd){^-6w72j^i`*>-^SI&(S@Qg@_41b=($%Z0tCQ|Gpxx;EnJ3Td zDu=i*z0bEjPj-E5bFv5?;AG(KBU zG?!qV?S?0=9z@SgZ|rzWW_&4yot!Zv7RP=+p`%_Km-OX7Q3YEufSPreedV;ThlZ3@ zo8=AMmb~c4pBOf8P;ggMfO7b|+a{HbIJZ3{<-gs&UisYcJIP{O?uYL*SGZ&Aq}}ut Z$&h4G&Z4)UO}>N#Xx-P>s79b8{sT!Ab};|| literal 7759 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 MAM@L_w_Fqc4}saVng9R* diff --git a/app/src/main/res/mipmap-xxhdpi/bg_xl.png b/app/src/main/res/mipmap-xxhdpi/bg_xl.png index c33871496a7046261033952fd68fdbc7c4759b04..75e11824b4390adcfa062a9879527500dc08613b 100644 GIT binary patch literal 11095 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 literal 15262 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 Qfm;^6dq&zNS`T0TAB;bQ3IG5A diff --git a/app/src/main/res/mipmap-xxxhdpi/bg_xl.png b/app/src/main/res/mipmap-xxxhdpi/bg_xl.png new file mode 100644 index 0000000000000000000000000000000000000000..7ef77db2ec12bd54115a33c1863c83fc9b2e3310 GIT binary patch literal 14110 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 literal 0 HcmV?d00001 diff --git a/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt b/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt index a75ecd7..16f3c98 100644 --- a/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt +++ b/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt @@ -77,19 +77,17 @@ class AppUpdateDialog( isShow.invoke(false) return } - + binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE isShow.invoke(true) loadPath = url show() - binding.mCancelUpdate.visibility = if (isUpdate) View.GONE else View.VISIBLE - if (!log.isNullOrEmpty()) { binding.mTvLog.visibility = View.VISIBLE binding.mTvLog.text = log } - binding.mVersionName.text =versionName + binding.mVersionName.text ="V${versionName}" uploadManager.uploadApk(loadPath, { binding.mProgress.progress = it binding.mTvProgress.text = "${it}/100" diff --git a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt index 36fff99..058a753 100644 --- a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt +++ b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt @@ -18,13 +18,14 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) { str?.apply { val userId = if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") { "" - } else { LogUtils.e("CloudJSBridge","str") + } else { MMkvHelper.getLong(Const.USER_ID).toString() } val jsonObject = JSONObject() jsonObject.put("statuHeight", WebUtils.getStatesBar()) - jsonObject.put("token", MMkvHelper.getString(Const.Auth_Token)) + jsonObject.put("token", MMkvHelper.getString(Const.Auth_Id)) + jsonObject.put("dpi",WebUtils.getDensityDpi()) jsonObject.put("userId", userId) jsonObject.put("isAPP", 1) @@ -55,4 +56,12 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) { } + fun gotoScienceDetail(str: String?){ + LogUtils.e("CloudJSBridge","gotoScienceDetail str") + str?.let { + + } + ToastUtils(context).showToast("敬请期待") + } + } \ No newline at end of file diff --git a/base/src/main/java/com/xty/base/h5/WebUtils.kt b/base/src/main/java/com/xty/base/h5/WebUtils.kt index 20d4ecf..1f899fd 100644 --- a/base/src/main/java/com/xty/base/h5/WebUtils.kt +++ b/base/src/main/java/com/xty/base/h5/WebUtils.kt @@ -24,7 +24,7 @@ object WebUtils { @Synchronized fun getDensityDpi(): Int { - val displayMetrics = ContextUtils.getApplication().resources.displayMetrics + val displayMetrics = ContextUtils.getContext().resources.displayMetrics return displayMetrics.density.toInt() } } \ No newline at end of file diff --git a/base/src/main/java/com/xty/base/utils/AppUpdate.kt b/base/src/main/java/com/xty/base/utils/AppUpdate.kt index 40716c4..db96614 100644 --- a/base/src/main/java/com/xty/base/utils/AppUpdate.kt +++ b/base/src/main/java/com/xty/base/utils/AppUpdate.kt @@ -23,8 +23,8 @@ class AppUpdate(var context: Activity) { isShowNotification = false isShowBgdToast = false dialogImage = R.drawable.shape_bg_health_round - dialogButtonColor = ContextCompat.getColor(context, R.color.col_009) - dialogProgressBarColor = ContextCompat.getColor(context, R.color.col_009) + dialogButtonColor = ContextCompat.getColor(context, R.color.col_02c) + dialogProgressBarColor = ContextCompat.getColor(context, R.color.col_02c) setButtonClickListener { } @@ -51,7 +51,7 @@ class AppUpdate(var context: Activity) { }) } - manager.setApkName("ay_android.apk") + manager.setApkName("zj365_android.apk") .setApkUrl(url) .setSmallIcon(R.mipmap.ic_upload).configuration = configuration diff --git a/base/src/main/res/layout/dialog_updata.xml b/base/src/main/res/layout/dialog_updata.xml index 68165e4..2858d16 100644 --- a/base/src/main/res/layout/dialog_updata.xml +++ b/base/src/main/res/layout/dialog_updata.xml @@ -19,6 +19,12 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_213" > + + \ No newline at end of file diff --git a/common/src/main/res/layout/layout_customer_date_picker.xml b/common/src/main/res/layout/layout_customer_date_picker.xml index b8b2279..8d0e6a8 100644 --- a/common/src/main/res/layout/layout_customer_date_picker.xml +++ b/common/src/main/res/layout/layout_customer_date_picker.xml @@ -48,6 +48,7 @@ android:id="@+id/check_brithday" android:layout_width="wrap_content" android:layout_marginLeft="@dimen/dp_31" + android:visibility="gone" android:layout_height="wrap_content" android:background="@drawable/selector_check_birthday" android:button="@null" diff --git a/common/src/main/res/mipmap-xxhdpi/ic_niaosuan_selected.png b/common/src/main/res/mipmap-xxhdpi/ic_niaosuan_selected.png index b88064fba53c1e15cf9f29b1876b819045ad5b6a..fa0fcb2ebd2427a2114573fede16a4e308ef2d64 100644 GIT binary patch delta 2837 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 O0000() { isBind = it.getInt("isBind", 1) binding.title.mTvTitle.text = "完善信息" } + + + } @SuppressLint("SetTextI18n") @@ -262,10 +272,15 @@ class BaseInfoChangeAct : BaseVmAct() { // 2->binding.checkBirthday.isChecked = true // } birthdayType = it.birthdayType - city = it.city - provincey = it.province //表示省 - district = it.district //区 - binding.mArea.text = "${it.province ?: ""} ${it.city ?: ""} ${it.district ?: ""}" + if (TextUtils.isEmpty(it.city) || TextUtils.isEmpty(it.province) || TextUtils.isEmpty(it.district)){ + getLocaltion() + }else{ + city = it.city + provincey = it.province //表示省 + district = it.district //区 + binding.mArea.text = "${it.province ?: ""} ${it.city ?: ""} ${it.district ?: ""}" + } + if (it.height > 0){ binding.mHeight.setText("${it.height}") } @@ -403,6 +418,10 @@ class BaseInfoChangeAct : BaseVmAct() { CommonToastUtils.showToast("请输入紧急联系人联系方式") return } + if (!RxRegTool.isMobileSimple(otherPhone)){ + CommonToastUtils.showToast("紧急电话不得少于11位") + return + } if (otherPhone == binding.mPhone.text.toString()) { CommonToastUtils.showToast("紧急联系人电话不能与本人电话一致") return @@ -606,6 +625,44 @@ class BaseInfoChangeAct : BaseVmAct() { } } + fun getLocaltion(){ + if(MMkvHelper.contains(Const.PROVINCE) && MMkvHelper.contains(Const.CITY) && MMkvHelper.contains(Const.DISTRICT)){ + open_province = MMkvHelper.getString(Const.PROVINCE) //表示省 + provincey = MMkvHelper.getString(Const.PROVINCE) //表示省 + open_city =MMkvHelper.getString(Const.CITY) //市 + city = MMkvHelper.getString(Const.CITY) //市 + open_area = MMkvHelper.getString(Const.DISTRICT) //区 + district = MMkvHelper.getString(Const.DISTRICT) //区 + binding.mArea.text = "$open_province $open_city $open_area" + + }else{ + if(EasyPermissions.hasPermissions(this, Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION)) { + AmapInit.startLocation(this) { + LogUtils.e("DynamicManagementFrag","${it.city}") + MMkvHelper.put(Const.LONGITUDE,it.longitude) + MMkvHelper.put(Const.LATITUDE,it.latitude) + MMkvHelper.put(Const.PROVINCE,it.province) + MMkvHelper.put(Const.CITY,it.city) + MMkvHelper.put(Const.DISTRICT,it.district) + + open_province = MMkvHelper.getString(Const.PROVINCE) //表示省 + provincey = MMkvHelper.getString(Const.PROVINCE) //表示省 + open_city =MMkvHelper.getString(Const.CITY) //市 + city = MMkvHelper.getString(Const.CITY) //市 + open_area = MMkvHelper.getString(Const.DISTRICT) //区 + district = MMkvHelper.getString(Const.DISTRICT) //区 + binding.mArea.text = "$open_province $open_city $open_area" + + } + }else{ + EasyPermissions.requestPermissions(this,"申请定位权限", + 0x00022, + Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION); + } + } + } + override fun onDestroy() { AmapInit.stopLocation() diff --git a/mine/src/main/res/layout/act_base_info_change.xml b/mine/src/main/res/layout/act_base_info_change.xml index fbff2a1..0bfcef0 100644 --- a/mine/src/main/res/layout/act_base_info_change.xml +++ b/mine/src/main/res/layout/act_base_info_change.xml @@ -226,6 +226,7 @@ android:layout_height="wrap_content" android:textColor="@color/col_313" android:textSize="@dimen/dp_14" + android:visibility="gone" android:id="@+id/tv_cal_type" android:layout_marginRight="@dimen/dp_5" android:layout_toLeftOf="@+id/mBirthday"/> diff --git a/network/src/main/java/com/xty/network/model/Update.kt b/network/src/main/java/com/xty/network/model/Update.kt index 9d25b36..9620b20 100644 --- a/network/src/main/java/com/xty/network/model/Update.kt +++ b/network/src/main/java/com/xty/network/model/Update.kt @@ -2,7 +2,7 @@ package com.xty.network.model class Update{ var log: String?=null - var name: String?=null + var name: String="" var url: String?=null var isupdate: Int = 0//0:非强制更新 1：强制更新 var versionName:String = ""