From 5009c121be04ab3f925145eb380e8352e3d642fc Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 25 Nov 2020 19:33:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[rm]=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icon_heart_second_other_light.png | Bin 2184 -> 0 bytes .../icon_heart_unchoose_other_light.png | Bin 2039 -> 0 bytes .../drawable/icon_heart_second_other_light.png | Bin 822 -> 0 bytes .../drawable/icon_heart_unchoose_other_light.png | Bin 771 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_other_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_other_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_other_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_unchoose_other_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_other_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_other_light.png deleted file mode 100644 index 1c495555411916429dddc9b1b00dda5f28294ca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2184 zcmV;32zU31P)Px-LP~T$=t!6^5?qnzS2?XBMcdqsdFszWd(2 z_xSmI@4IW#N>v1Ja^E@k{P=!8-=F6ggQxbXO_$jY4j%d`TRXFH!Q&%VLt4r6e^X{>_2DZNK1Zea^Ms6Y{s05~o4YTQM%hm)JMO z$XtK_w%_6F`e*XqbyxLSKD~7RrqSsB%`fL;Lqi9*JpTBh@ABJTY;OYuxd0slPj(IL z$MC#}%o`KteIpGfwS0kYRYnz)RjjWX=c+zR6YLg~P#Z1~w}71s!TPETrYft)PDnjX zO&tsCkOpCp;Hp+^wNUV{iM2L-NQ#Ae2)f8QV#6M(JO9u_ov(PJ+Oe@Xgdo$c>r-r~ zrl~(WFwl91bJslw5B_%T@Ap`q3+ztdL6b~fPQYKU6p#GzCYX1DY+&-)H_9I*V^Y_JdZfpi?yq;94KgsO0Z*6Y93|(86#|7!-LWjHh_L)?uB8)0{Lo+@QFA#dmEwayJwgo=dq*U#( zT0Mf6J0XsF!03!%>pEN&S;t6V%$R6t$!zcm1kjNw;>00((q#h427f>VI$ayc1d*D# zIRXl!_tvJ6EK)-jSfGM9g)j<4hqNQqhX~^;(57UDG2{`d#Xl$nf|>ge1l*v1>{Bpi z#6f_mk-l}djx`Vv=BxCst&0Wm9`L5w?CrsvOx$0xo3A-~Cl zq$-S_iCN<^-D@a}5lVdx2SSueh$@w>qnM)=RCTsy?Xi;`5b|`+hyo}SX30uo8Y4cy zBni=MWooosMyYK+D{|-VW2d%HwXUZTce1V!CO~(bAn=NVK|{1_SJ(47gIoxmu;Tg1 zv58*TXpr_uI0H4fnQvcT*YB?tz$MoS;owJ)|LH4<4L^$!H?#v>3I^TJ{VM@nf5T_8 zb=?p4?Hk#0!$p{6n&`t~v^a6}J21o}h`*aS@y^Te=SxGQYKW7^yeaOrhY!P6SD(Sb zK^){aZ%IwM8GduL2)4!8i-@t>hwPZOS)?!y?M~#{DUr87+4eoamg#hC)Q62mJ;6z$ ziKkdhWyC2#v=9#E_??9^36ThE1AdV%1STN_DTpwM zk-3>`Fo!cI@t8;K#oB^|3qENy!Wxg1zgbbQM5IIj;t6IZxoc zPFL}^CA;^4qHu3@js>X%MD43MWt z0?DtS86kjZNotay3i?gLS>5A0lH^$cEqTk2ik?j5j5D5e%Fz;j_ z1W<_J*`gLu5*TA!bS-Cg?C9Y2TN8n;xpVyFqif#x{u1Orm$@Sc1|S9%JSW8#q_lLR zkC*}=HKgg`0++c1;#F(s^kP`&yx@dDjLy!?bRFsG+46>h<7Y*Yx6eESZOrGw#*O}5 z68#bwT?|qNsAdl)HK#Ig%_au5o~)<~xar3@iqweSXEg)&ApK_jz~MPtsZ5m_V^ z&OzH1MDiKl%+c=--QDio-)DyrygM{Q@RMZ}O$kaM!N)m=`y}ICVjQfjoC)%P>B<{p z0*m|&hs-46CEK98R{l`_zkOK#r(PHx!oq$o&I?<*LVG|fd2%S!0)DCd+8hi0000< KMNUMnLSTXh6fCy@ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_other_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_other_light.png deleted file mode 100644 index 09ab4af9e358c0e0388249c2207cab6a1727ea6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2039 zcmVPx+u}MThR9FeUm(6coM;XTF>pD$ZvPl;t1|*<>SX6)jQBnadEI?G28WP;lG)`=n zx>cnJ33Z>pA+=*)f2N5W5-->wMMCUgfvAWCT~)$KX;adM5H)p@HrMx@8Gg@<&$Ug{ zs0fLpd+&U`^Um`=@5h{L49~Ig`6Ftlrx*9Awd3P+zp&oja>n1V)~~c$cExJtc>Cm& zE`=K*`1hWE`ib9bELdI#vQPb`a>;KE7EuKT|V{`y4xsaV)xyL-Xk9;2)dyP3`RL*@rhxG=qt$ z`F)d<3;UaKyS@0}EWkAuZ!e%4aKa+ct`kBApN|a2nQpRn6^n#p)dss7+2CU8CT~`q zO$?Ilf_~MxL|=f}#Gc#-!SM zTbUTHKL7mCuNM~=x8J;3J(iNMaY=CNO6Z20vlRgCvRo*N`*3`~8 z1QSZx$Q<#KH^|x)ZKF`|Q5IiQt|R4fGTjof*hx*_hE31P(KRZvB;!k-Zm-bou>|l8uY_ z`}=IlineYIZyh+W_l=F~O~0pPe0=^}&Y7=3Zg9^1`MKu~z0wG&J$LThmP?mbzK6%| zHKw|9`}U6WM~?iM$j2PPA3whE0&Xszk(ZpSp}F>c+u5Wf#JIr*KkK!s$dQ=qV92?VC`u&VnnF%)!e99_JiNE3;6q9@F*9@G>nVku zbk~AwU4ayH2mYx+AbCB#+$qEIt7{^Ju(O~k^+RUdNx?@d(ZclfnJ;4UF1oo8edG-$ z;k!LEGfSVHo-ViT-Q;@a0NsvHy|mlK`k^{;lM!g1_#w9lU=|rGo)i*T?h9-o6$A1R5lIv}`o`F$Nc2_2?DE*ylgkai8OX6?Gv9H}?$$vl z$eYlvyo{D0By`9nB?SFk&!tqr95pHZt{}0Gu$5G70HceG7T1!aHsa~1ET^`shDVxw z4p-NOk&y!zEg&AE9DSFVkF?o(vEWhopKN5HC>OW{O%xiyN!GJjA1QBGCJr zn*|vbaT3fh-D<%~&fZ8O!VCZ@sNQ!!8DO6hkxL;PseG`K>szk&#cJpmESWa(yM1pHPM`Eo8*o0S8}kv zI641AI-m0fU+2&um!b#EUjacr^#V|!#G~5s9SxVqYXYi#V`+d97oM1xWXK6tbn(=KI$>WAUF)bR>fUBxBpl^F^;t$5bf z`uHXT$N^bE_W&u5GJ_f1^~;xETRwX9sN9yHO+cDS&UgGfd6>BB&j+u$AzRe+QJk5< z`W6-z%NuKLT%~ZeY>Qyc7iI<+TmIVUQ$M``I1JkS+!074!ohZK?({cdw;u|Kn{_t` zRAFb`^1=`t&@05oUa6-Xl_KwO8s3EtB$Hz*ET)C2{esMol- z07hDlbS0BpzBu2HxB#_kZi_&l`WLKmETR_-`mN Vp8QJdlGp$M002ovPDHLkV1j}7_BQ|k diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_other_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_other_light.png deleted file mode 100644 index e26dbe8a7bf4deb95504989940b92596bda2c7a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 822 zcmV-61Ihe}P)Px%@JU2LR5%fpQeB8mQ50Tl?R{qM#DsSwnxuGTCU+)(@jyf}`JG{g5=P{~+mJjE zQKTligOdC|DJ98IQ-ow@8Z%0XnUs5*x_5BTIdjhP?Q`d9Qz) z=;-M1#KnV)(&~9rYRu0Si}OW{) z)2mnS&T$)DSia;)O1R>DY5ltrV%)bUy+AuVZ`X|5BG%^S)Q_Q0&rxbprLCIJ_wNs1 zxNvz7F)wG5YrA)Ey~)|74QdE_q$Ip^P18fj3s^YMECsgS9qY$&(v^vsVw{Tb2tELC z9-WOCqPaGV6^9C-V1=*7WCiYmC9lebh~w81svgE9KaMDXqrm3?z~mfQbGvqIdLlJX zyH12LopZn-g6-mE!IxD4T3Z{hxGt0HpZ%<>EmS(=fG*owlij(a@%nfhe#hPE+Eba# ztyRA_#sc`XC^h^=UxIR;xb9#Flfov%ET6@iwU<_IhN9@0u$f58u!nryh!2nt{70f6 z$L-fo@iSpfNZ3hoL~ue}%sP#O=oOM4fFwYnoJ&^L00>6{GO1#k&|*W4COZubOK~rl zh_$?G@+QVy3vg6amHQJ`o0 z_O)-F-wyxBc%QC23s3f!%r22V-rBZD(E<`3QIW{>wYIM78K3wUQTebpU3(gY2c4>} z<^zo?P!Y#{EiD`R%b5RKyB97vnYngn=D(7D0URnib|Etf3jhEB07*qoM6N<$g874n A)c^nh diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_unchoose_other_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_unchoose_other_light.png deleted file mode 100644 index c1dbeacc1d3302096eb5ff9814a99f02f4438cde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 771 zcmV+e1N{7nP)Px%y-7qtR5%fpQ%h@8Q4pS)b8gb&PAVeUpn@)3hzbfyb>q&38&ND`ASt#`!JYg5 z1*N6UqZe$gwGp8|Kyc+_<<d!auHE&JU@}#1|}>{t+sNpR$Dz6e4Yaa%qj1E zBBDFYvdzrK3nhXW?j4Q5kY{QuiaOp?f*Cr_Ns?0n8wyp216(+j%E}c%bwCW&4*qbY zo5kYQW;bKUZ@s>DK91K%cZ7&%W}fMhkq_f&UxtTytyC)gnxDUag0(KV)V-aazVR*) zcL$AkL^vVg4tu}NIx?YYP=-P5d+k{g7EYNs@kFUeWW9yeg8nGgde>g`N+~m;iqqf| zIV7s?U35tNB1-A!iWCwhjEg@*qQxU2mX^zxKV}qED$6Immjfc*@x7vqhMT2pufmiA zo)#7!9E~EqKM)v5otzwhv6F^@AIDD)#qr~_gFw&e^HfCjZct@mZP*==ht(|%^)#O! z^2Q`%&eo{5jph!kY>d!;cyk0k@J5Vb&@BLQ z4;^B3B;@n*xv$y*P>+0kMGucz@&}=}ZUH_-an3*}8BavU8lyL-rv8-uUqF4pYW2|( zh-Ne+S!)}(0HGV@^7uwS=fCXIQlk*ZtE2xa`VB=Tf(o-tzo-BJ002ovPDHLkV1io% BS?>S< From d2493253d1c9c708c8f55c19ee1a09e62f08df77 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 25 Nov 2020 20:01:31 +0800 Subject: [PATCH 2/2] opt compile warn --- .idea/gradle.xml | 1 + .../roadcondition/model/CityStrategy.kt | 12 +--- .../com/zhidao/roadcondition/model/Results.kt | 4 +- .../roadcondition/net/ResponseFunction.kt | 2 +- .../service/CosCallbackMapController.kt | 6 +- .../service/CosStatusController.kt | 12 ++-- .../service/InformationUploadController.kt | 4 +- .../roadcondition/service/MainService.kt | 13 ++-- .../service/MainServiceController.kt | 62 +++++++++---------- .../roadcondition/util/AnalyticsUtil.kt | 4 +- .../com/zhidao/roadcondition/util/FileUtil.kt | 10 ++- .../zhidao/roadcondition/util/LocationUtil.kt | 38 +++++------- .../roadcondition/util/TaskCoroutines.kt | 12 ++-- .../v2x/fragment/V2XEventPanelFragment.kt | 8 +-- 14 files changed, 85 insertions(+), 103 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8e9756d758..b59a552525 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,6 +77,7 @@ diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt index 9454ac339f..1730027756 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/CityStrategy.kt @@ -1,14 +1,8 @@ package com.zhidao.roadcondition.model -class CityStrategy { - - var video: Video - var pic: Pic - - constructor(video: Video, pic: Pic) { - this.video = video - this.pic = pic - } +class CityStrategy(video: Video, pic: Pic) { + var video: Video? = video + var pic: Pic? = pic } fun Video.getMaxSpeed(): Int { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt index 85f9cdd10d..cce437439f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/Results.kt @@ -3,6 +3,4 @@ package com.zhidao.roadcondition.model /** * 城市策略实体 */ -class Results(var cityStrategy: CityStrategy) { - -} \ No newline at end of file +class Results(var cityStrategy: CityStrategy) \ No newline at end of file diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/ResponseFunction.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/ResponseFunction.kt index d74722b99b..e9b92acf8a 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/ResponseFunction.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/net/ResponseFunction.kt @@ -18,7 +18,7 @@ class ResponseFunction : Function, T> { } override fun apply(t: BaseResponse): T { - if (t == null || !t.isSuccess(baseUrl)) { + if (!t.isSuccess(baseUrl)) { throw ApiException(t.code, t.msg) } return t.result diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt index b81c988bff..819debe980 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosCallbackMapController.kt @@ -45,7 +45,7 @@ object CosCallbackMapController : CosStatusCallback { fun unregisterCallbacks(paths: Map?) { paths?.let { - it?.keys?.let { keys -> + it.keys.let { keys -> keys.forEach { path -> unregisterCallback(path) } @@ -54,9 +54,7 @@ object CosCallbackMapController : CosStatusCallback { } override fun onStartUpload(eventId: String?, localPath: String?) { - map[localPath]?.let { - it.onStartUpload(eventId, localPath) - } + map[localPath]?.onStartUpload(eventId, localPath) } override fun uploadCosFailed(cosPath: String?, eventId: String?, localPath: String?) { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index ae433565f4..6aaa000d64 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt @@ -75,7 +75,7 @@ class CosStatusController : CosStatusCallback { private fun sendGetInfoFailedReceiver(type: String) { Log.d(CarCorderController.TAG, "sendGetInfoFailedReceiver ------>") - var intent = Intent() + val intent = Intent() intent.action = "com.zhidao.roadcondition.getinfo.failed" intent.putExtra("type", type) AbsMogoApplication.getApp().applicationContext.sendBroadcast(intent) @@ -95,11 +95,11 @@ class CosStatusController : CosStatusCallback { // } // } } else { - if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) { + if (localPath!!.endsWith("mp4") || localPath.contains("Thumbnail")) { CosCallbackMapController.uploadFailed?.invoke() } CosCallbackMapController.unregisterCallback(localPath) - InformationUploadController.release(entity?.id) + InformationUploadController.release(entity.id) // deletePicFile(localPath) } } @@ -114,7 +114,7 @@ class CosStatusController : CosStatusCallback { Log.d(TAG, "uploadCosCompleted downloadUrl = $downloadUrl") Log.d(TAG, "uploadCosCompleted cosPath = $cosPath") trackUploadCos(1) - if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) { + if (localPath!!.endsWith("mp4") || localPath.contains("Thumbnail")) { //如果是视频文件或者缩略图文件 if (localPath.endsWith("mp4")) { videoAndThumbMap["video"] = downloadUrl!! @@ -127,7 +127,7 @@ class CosStatusController : CosStatusCallback { if (videoAndThumbMap.size == 2) { trackUploadCos(4) Log.d(TAG, "videoAndThumbMap.size == 2 ") - var locationInfo = LocationUtil.getInstance().getLocationInfo() + val locationInfo = LocationUtil.getInstance().getLocationInfo() val locationStr: String = Gson().toJson(locationInfo) Log.d(TAG, "locationStr = $locationStr") //上传录像以及缩略图成功 @@ -155,7 +155,7 @@ class CosStatusController : CosStatusCallback { } private fun sendInformation(type: Int, map: Map) { - Log.d(TAG, "isCustomSend = ${entity?.isCustom}") + Log.d(TAG, "isCustomSend = ${entity.isCustom}") // if (entity?.isCustom) { // InformationUploadController.cosResourceReady(type, map, entity?.isCustom, entity?.id) { // CosCallbackMapController.mainService?.sendCustomResult(it) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt index e0c14ed1c3..87a2328aa9 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt @@ -75,7 +75,7 @@ object InformationUploadController { } } - private fun tryUploadInformation(ir: InformationResource?) { +// private fun tryUploadInformation(ir: InformationResource?) { // synchronized(locker) { // ir?.let { // if (!it.isReady()) { @@ -106,7 +106,7 @@ object InformationUploadController { // } // } // } - } +// } fun release(id: Long) { val target = informationCache.remove(id) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index d7db18d27f..da2ff0c096 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -132,11 +132,10 @@ class MainService : Service() { if (p1.action == alarmBroadAction) { if (p1.getIntExtra("AlarmType", 1) == AlarmTypePic) { //拍照 - var number = p1.getLongExtra("number", 1) - takePhoto(number, true) + takePhoto(true) } else { //录像 - var duration = p1.getIntExtra("duration", 3) + val duration = p1.getIntExtra("duration", 3) takeVideo(duration, true) } } @@ -211,7 +210,7 @@ class MainService : Service() { // ) } - private fun sendMarkerInfoReceiver(lat: Double, lon: Double, imageUrl: String?, type: String?) { +// private fun sendMarkerInfoReceiver(lat: Double, lon: Double, imageUrl: String?, type: String?) { // Log.e("MainService", "sendMarkerInfoReceiver ------> type = $type ") // Log.e("MainService", "sendMarkerInfoReceiver ------> fromType = $fromType ") // Log.e("MainService", "sendMarkerInfoReceiver ------> isCustom = $isCustom ") @@ -224,7 +223,7 @@ class MainService : Service() { // intent.putExtra("custom", isCustom) // intent.putExtra("fromType", fromType) // sendBroadcast(intent) - } +// } /** * 初始化定位监听 @@ -266,7 +265,7 @@ class MainService : Service() { Log.d("MainService", "handleReportStrategy picType = $picType ---videoType = $videoType") shareType = TANLU_ROAD_CURRENT if (picType == 1) { - takePhoto(1) + takePhoto() } else if (picType == 2) { postPhotoAlarmTask(true) } @@ -291,7 +290,7 @@ class MainService : Service() { } //获取图片 - private fun takePhoto(picNum: Long, isInterval: Boolean = false, isCustom: Boolean = false) { + private fun takePhoto( isInterval: Boolean = false, isCustom: Boolean = false) { Log.d("MainService", "takePhoto -----1----->") //判断是否授权 // if (isAuthorization(BaseApplication.getAppContext())) { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt index 3495d69f9c..04238de2b7 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt @@ -18,7 +18,7 @@ import kotlinx.coroutines.runBlocking class MainServiceController { companion object { - var TAG = this.javaClass.name + var TAG = this::class.java.name } //逆地理编码是否重试 @@ -57,69 +57,69 @@ class MainServiceController { } //将数据同步到sharePreference中 - fun syncStrategiesData(strategy: CityStrategy) { - if (strategy?.pic != null && strategy.video!=null) { - setStrategyType(AbsMogoApplication.getApp().applicationContext, strategy.pic.strategyType, "pic") - setStrategyType(AbsMogoApplication.getApp().applicationContext, strategy.video.strategyType, "video") + private fun syncStrategiesData(strategy: CityStrategy) { + if (strategy.pic != null && strategy.video!=null) { + setStrategyType(AbsMogoApplication.getApp().applicationContext, strategy.pic!!.strategyType, "pic") + setStrategyType(AbsMogoApplication.getApp().applicationContext, strategy.video!!.strategyType, "video") setStrategyFrequency( AbsMogoApplication.getApp().applicationContext, - strategy.pic.strategyType, + strategy.pic!!.strategyType, "pic", - strategy.pic.reportType + strategy.pic!!.reportType ) setStrategyFrequency( AbsMogoApplication.getApp().applicationContext, - strategy.video.strategyType, + strategy.video!!.strategyType, "video", - strategy.video.reportType + strategy.video!!.reportType ) setStrategyInterval( AbsMogoApplication.getApp().applicationContext, - strategy.pic.strategyType, + strategy.pic!!.strategyType, "pic", - strategy.pic.reportTimeInterval * 60 * 1000L + strategy.pic!!.reportTimeInterval * 60 * 1000L ) setStrategyInterval( AbsMogoApplication.getApp().applicationContext, - strategy.video.strategyType, + strategy.video!!.strategyType, "video", - strategy.video.reportTimeInterval * 60 * 1000L + strategy.video!!.reportTimeInterval * 60 * 1000L ) setStrategyValidity( AbsMogoApplication.getApp().applicationContext, - strategy.pic.strategyType, + strategy.pic!!.strategyType, "pic", - strategy.pic.infoTimeout + strategy.pic!!.infoTimeout ) setStrategyValidity( AbsMogoApplication.getApp().applicationContext, - strategy.video.strategyType, + strategy.video!!.strategyType, "video", - strategy.video.infoTimeout + strategy.video!!.infoTimeout ) setStrategyMaxSpeed( AbsMogoApplication.getApp().applicationContext, - strategy.pic.strategyType, + strategy.pic!!.strategyType, "pic", - strategy.pic.getMaxSpeed() + strategy.pic!!.getMaxSpeed() ) setStrategyMaxSpeed( AbsMogoApplication.getApp().applicationContext, - strategy.video.strategyType, + strategy.video!!.strategyType, "video", - strategy.video.getMaxSpeed() + strategy.video!!.getMaxSpeed() ) setStrategyMinSpeed( AbsMogoApplication.getApp().applicationContext, - strategy.pic.strategyType, + strategy.pic!!.strategyType, "pic", - strategy.pic.minSpeed + strategy.pic!!.minSpeed ) setStrategyMinSpeed( AbsMogoApplication.getApp().applicationContext, - strategy.video.strategyType, + strategy.video!!.strategyType, "video", - strategy.video.minSpeed + strategy.video!!.minSpeed ) } else { Log.d(TAG, "strategy Data is null") @@ -145,8 +145,8 @@ class MainServiceController { mFromType = fromType mPoiType = poiType - var locationInfo = LocationUtil.getInstance().getLocationInfo() - if (locationInfo.address.isNullOrEmpty()) { + val locationInfo = LocationUtil.getInstance().getLocationInfo() + if (locationInfo.address.isEmpty()) { Log.d(TAG, " sendInformationMessage locationInfo.address = $locationInfo.address") trackUploadGeo(1) geoLocation(type, url, locationInfo, isCustom,trafficInfoType, isShare, customSend,poiType,mainInfoId,speed, longitude,latitude) @@ -210,11 +210,9 @@ class MainServiceController { strategyeModel.uploadInformation(informationBody) } onSuccess { - if (it.result != null) { - Log.i(TAG, "upload success id = " + it.result.id) - if (mFromType == "6") { - sendUgcStatusReceiver(it.result.id, mPoiType, mFromType) - } + Log.i(TAG, "upload success id = " + it.result.id) + if (mFromType == "6") { + sendUgcStatusReceiver(it.result.id, mPoiType, mFromType) } trackUploadServer(1) customSend?.invoke(true) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt index 6c8ac01e1e..762810b948 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt @@ -39,8 +39,8 @@ const val CarNet_Geo:String = "CarNet_Geo_Location" //上传服务端, type=1开 const val CarNet_live_broadcast = "CarNet_live_broadcast" // 地图页面点击直播（在线可直播车机） //自定义埋点 @DebugLog -fun trackNormalEvent(event: String, data: MutableMap?, context: Context = AbsMogoApplication.getApp().applicationContext) { - var data = data +fun trackNormalEvent(event: String, _data: MutableMap?, context: Context = AbsMogoApplication.getApp().applicationContext) { + var data = _data if (data == null) { data = HashMap() } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt index 7a4b783f14..5c1c0c90d0 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt @@ -138,10 +138,10 @@ fun getCompressVideoPath(): String { * 保存图片到本地 */ fun saveImageToSdcard(bmp: Bitmap): Boolean { - var currentFile: File - lateinit var fos: FileOutputStream + val currentFile: File + var fos: FileOutputStream? = null - var picFile = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + val picFile = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) picFile.mkdirs() val builder = StringBuilder() @@ -162,9 +162,7 @@ fun saveImageToSdcard(bmp: Bitmap): Boolean { return false } finally { try { - if (fos != null) { - fos.close() - } + fos?.close() } catch (e: IOException) { e.printStackTrace() return false diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt index 2e2de29b55..08a711e576 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt @@ -72,7 +72,7 @@ class LocationUtil private constructor() { private var locationClient: AMapLocationClient? = null private var locationOption: AMapLocationClientOption? = null private var speedListener: SpeedListener? = null - private var locationInfo: LocationInfo = LocationInfo() + private var locationInfo: LocationInfo? = null private var speed: Float = 0.0f fun initLocation() { @@ -125,24 +125,21 @@ class LocationUtil private constructor() { */ private var locationListener: AMapLocationListener = AMapLocationListener { location -> if (null != location) { - locationInfo.longitude = location.longitude - locationInfo.latitude = location.latitude - locationInfo.address = location.address - locationInfo.time = location.time - locationInfo.provinceName = location.province - locationInfo.cityName = location.city - locationInfo.cityCode = location.cityCode - locationInfo.areaName = location.district - locationInfo.areaCode = location.adCode - locationInfo.street = location.street - locationInfo.direction = location.bearing - listener?.let { - it.onChanged(locationInfo) - } + locationInfo = LocationInfo() + locationInfo!!.longitude = location.longitude + locationInfo!!.latitude = location.latitude + locationInfo!!.address = location.address + locationInfo!!.time = location.time + locationInfo!!.provinceName = location.province + locationInfo!!.cityName = location.city + locationInfo!!.cityCode = location.cityCode + locationInfo!!.areaName = location.district + locationInfo!!.areaCode = location.adCode + locationInfo!!.street = location.street + locationInfo!!.direction = location.bearing + listener?.onChanged(locationInfo!!) speed = location.speed - speedListener?.let { - it.onSpeedGet(location.speed) - } + speedListener?.onSpeedGet(location.speed) } else { Log.d(TAG, "定位失败 -> location is null") } @@ -160,13 +157,12 @@ class LocationUtil private constructor() { fun getLocationInfo(): LocationInfo { return if (null != locationInfo) { - locationInfo + locationInfo!! } else { if (null == locationClient) { locationClient = AMapLocationClient(mContext) - this.locationClient = locationClient } - var location = locationClient!!.lastKnownLocation + val location = locationClient!!.lastKnownLocation location.toLocInfo(location) } } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt index e3a9566021..990f120875 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/TaskCoroutines.kt @@ -2,6 +2,7 @@ package com.zhidao.roadcondition.util import kotlinx.coroutines.* +@ObsoleteCoroutinesApi @PublishedApi internal var ThreadPool = newFixedThreadPoolContext(Runtime.getRuntime().availableProcessors() * 2, "ThreadPool") @@ -11,16 +12,17 @@ internal var ThreadPool = * 在主线程中顺序执行，协程函数，一般用于最外层 * 该函数会阻塞代码继续执行 */ -inline fun taskBlockOnMainThread(delayTime: Long = 0, noinline job: suspend () -> Unit) = runBlocking { - delay(delayTime) - job() -} +//inline fun taskBlockOnMainThread(delayTime: Long = 0, noinline job: suspend () -> Unit) = runBlocking { +// delay(delayTime) +// job() +//} /** * 并发执行，常用于最外层 * 特点带返回值 */ -inline fun taskAsync(delayTime: Long = 0, noinline job: suspend () -> T) = GlobalScope.async(ThreadPool) { +@ObsoleteCoroutinesApi +fun taskAsync(delayTime: Long = 0, job: suspend () -> T) = GlobalScope.async(ThreadPool) { delay(delayTime) job() } \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 3eb198c1d0..1c5ebb10dd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -276,11 +276,11 @@ class V2XEventPanelFragment : MvpFragment "封路" MarkerPoiTypeEnum.FOURS_ICE -> "道路结冰" MarkerPoiTypeEnum.FOURS_FOG -> "浓雾" @@ -333,7 +332,6 @@ class V2XEventPanelFragment : MvpFragment "实时路况" else -> "实时路况" } - return typeName } /*