diff --git a/app/build.gradle b/app/build.gradle index 4dcd1cb..737be31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.detector" minSdkVersion 22 targetSdkVersion 33 - versionCode 5070 - versionName "5.0.7" + versionCode 5080 + versionName "5.0.8" ndk { moduleName "serial_port" diff --git a/app/build.gradle b/app/build.gradle index 4dcd1cb..737be31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.detector" minSdkVersion 22 targetSdkVersion 33 - versionCode 5070 - versionName "5.0.7" + versionCode 5080 + versionName "5.0.8" ndk { moduleName "serial_port" diff --git a/app/src/main/assets/Log.txt b/app/src/main/assets/Log.txt index 3ac0c06..c2a5c54 100644 --- a/app/src/main/assets/Log.txt +++ b/app/src/main/assets/Log.txt @@ -1,36 +1,168 @@ -[2024-05-08 10:55:03, 116.26520111153543, 39.914095876958136] -[2024-05-08 10:55:23, 116.26520041477461, 39.91408176744235] -[2024-05-08 10:55:25, 116.26521381618639, 39.914085321105404] -[2024-05-08 10:55:27, 116.26521469085102, 39.91408589424658] -[2024-05-08 10:55:29, 116.26521935112915, 39.91408948155932] -[2024-05-08 10:55:31, 116.26521674438393, 39.91409277640618] -[2024-05-08 10:55:33, 116.26521502100081, 39.91409680623537] -[2024-05-08 10:55:35, 116.26521436528681, 39.91409743870871] -[2024-05-08 10:55:37, 116.26521581852678, 39.914096215019896] -[2024-05-08 10:55:39, 116.2652157997227, 39.91409655274152] -[2024-05-08 10:55:41, 116.26521525332545, 39.914089595841055] -[2024-05-08 10:55:43, 116.26521547696976, 39.91408284152685] -[2024-05-08 10:55:45, 116.26521702403849, 39.91408110674177] -[2024-05-08 10:55:47, 116.26521601937341, 39.91408169851284] -[2024-05-08 10:55:49, 116.26521878070947, 39.91408256547792] -[2024-05-08 10:55:51, 116.26521493263463, 39.91408460388276] -[2024-05-08 10:55:53, 116.2652065596182, 39.914083330147676] -[2024-05-08 10:55:55, 116.26520718302675, 39.914091775582044] -[2024-05-08 10:55:57, 116.2652105172751, 39.91409413348714] -[2024-05-08 10:56:00, 116.26521310207109, 39.914091631929594] -[2024-05-08 10:56:02, 116.26521468002292, 39.91409136586091] -[2024-05-08 10:56:04, 116.26521630161699, 39.914091848890436] -[2024-05-08 10:56:06, 116.26521525210667, 39.91409125637526] -[2024-05-08 10:56:08, 116.2652154868529, 39.914091114790416] -[2024-05-08 10:56:10, 116.26521685507166, 39.91409297065138] -[2024-05-08 10:56:12, 116.26521859251761, 39.91410895855137] -[2024-05-08 10:56:14, 116.26521574096462, 39.91411681129428] -[2024-05-08 10:56:16, 116.26521586107947, 39.91411806262725] -[2024-05-08 10:56:18, 116.26521655541322, 39.91411783085555] -[2024-05-08 10:56:20, 116.26521718046945, 39.91411551340897] -[2024-05-08 10:56:22, 116.26521771440684, 39.914113376894825] -[2024-05-08 10:56:24, 116.26521390349613, 39.91410998932012] -[2024-05-08 10:56:26, 116.26520710330637, 39.91411181374916] -[2024-05-08 10:56:28, 116.26520472814147, 39.91410742271341] -[2024-05-08 10:56:30, 116.26520492008224, 39.914108851730944] -[2024-05-08 10:56:32, 116.26520370261551, 39.91410741613028] \ No newline at end of file +[116.26522673534483, 39.914073438939226,3.44, 2.71] +[116.26522673534483, 39.914073438939226,3.76, 1.84] +[116.26522739073067, 39.91407279751809,3.53, 2.7] +[116.26522739073067, 39.91407279751809,3.84, 1.86] +[116.26522768544372, 39.91407266878266,3.56, 2.7] +[116.26522768544372, 39.91407266878266,3.86, 1.86] +[116.26522682986025, 39.914073442061124,3.45, 2.71] +[116.26522682986025, 39.914073442061124,3.76, 1.85] +[116.265226542067, 39.91407381058012,3.41, 2.72] +[116.265226542067, 39.91407381058012,3.72, 1.84] +[116.26522590130126, 39.914074424434205,3.33, 2.73] +[116.26522590130126, 39.914074424434205,3.64, 1.83] +[116.26522619193993, 39.91407464058658,3.34, 2.73] +[116.26522619193993, 39.91407464058658,3.62, 1.84] +[116.26522532797509, 39.914075720995704,3.21, 2.75] +[116.26522532797509, 39.914075720995704,3.49, 1.82] +[116.26522537620738, 39.91407591746258,3.21, 2.76] +[116.26522537620738, 39.91407591746258,3.47, 1.82] +[116.26522538479156, 39.91407572486403,3.22, 2.75] +[116.26522538479156, 39.91407572486403,3.49, 1.82] +[116.26522606869662, 39.9140757770439,3.27, 2.76] +[116.26522606869662, 39.9140757770439,3.49, 1.84] +[116.26522544568988, 39.91407567742804,3.23, 2.75] +[116.26522544568988, 39.91407567742804,3.49, 1.82] +[116.2652257962649, 39.914076279888356,3.22, 2.77] +[116.2652257962649, 39.914076279888356,3.43, 1.84] +[116.26522445330072, 39.914076360162966,3.12, 2.76] +[116.26522445330072, 39.914076360162966,3.4, 1.8] +[116.26522664489963, 39.91407815739835,3.2, 2.83] +[116.26522664489963, 39.91407815739835,3.25, 1.88] +[116.265224260013, 39.914077892430285,3.02, 2.8] +[116.265224260013, 39.914077892430285,3.23, 1.8] +[116.2652255666347, 39.914075364085086,3.25, 2.75] +[116.2652255666347, 39.914075364085086,3.53, 1.82] +[116.26523089552752, 39.91407330168115,3.76, 2.75] +[116.26523089552752, 39.91407330168115,3.86, 1.95] +[116.2652358935911, 39.91407169619145,4.22, 2.76] +[116.2652358935911, 39.91407169619145,4.18, 2.06] +[116.2652344204988, 39.91407137692701,4.13, 2.74] +[116.2652344204988, 39.91407137692701,4.16, 2.02] +[116.26523053436848, 39.91406933949784,3.96, 2.66] +[116.26523053436848, 39.91406933949784,4.28, 1.91] +[116.26522591040762, 39.914071727642344,3.49, 2.66] +[116.26522591040762, 39.914071727642344,3.93, 1.81] +[116.26521823965147, 39.91407533000587,2.72, 2.65] +[116.26521823965147, 39.91407533000587,3.47, 1.59] +[116.26521683884835, 39.91407325049691,2.77, 2.57] +[116.26521683884835, 39.91407325049691,3.7, 1.55] +[116.26522422758242, 39.91407311265688,3.28, 2.67] +[116.26522422758242, 39.91407311265688,3.76, 1.77] +[116.2652234734805, 39.91407422700223,3.16, 2.69] +[116.2652234734805, 39.91407422700223,3.62, 1.75] +[116.26522172092305, 39.91407609174415,2.93, 2.72] +[116.26522172092305, 39.91407609174415,3.4, 1.71] +[116.26522098518798, 39.91407653983732,2.85, 2.72] +[116.26522098518798, 39.91407653983732,3.34, 1.69] +[116.26522033066807, 39.914076687499126,2.79, 2.72] +[116.26522033066807, 39.914076687499126,3.32, 1.67] +[116.26521991464517, 39.91407721070778,2.73, 2.73] +[116.26521991464517, 39.91407721070778,3.26, 1.65] +[116.26521986386254, 39.914076156061356,2.79, 2.7] +[116.26521986386254, 39.914076156061356,3.38, 1.65] +[116.26522046832702, 39.91407541020598,2.87, 2.69] +[116.26522046832702, 39.91407541020598,3.47, 1.67] +[116.2652208575345, 39.91407496983857,2.93, 2.68] +[116.2652208575345, 39.91407496983857,3.52, 1.68] +[116.26522162320249, 39.91407470918113,3.0, 2.68] +[116.26522162320249, 39.91407470918113,3.55, 1.7] +[116.26522218697728, 39.91407444170218,3.06, 2.68] +[116.26522218697728, 39.91407444170218,3.59, 1.72] +[116.26522251525435, 39.914074576129636,3.07, 2.69] +[116.26522251525435, 39.914074576129636,3.57, 1.73] +[116.26522239822415, 39.91407556123485,3.01, 2.71] +[116.26522239822415, 39.91407556123485,3.46, 1.73] +[116.26522210839452, 39.914075847232155,2.97, 2.72] +[116.26522210839452, 39.914075847232155,3.43, 1.72] +[116.26522219403677, 39.914076398808035,2.94, 2.74] +[116.26522219403677, 39.914076398808035,3.37, 1.73] +[116.26522203878476, 39.91407614947869,2.95, 2.73] +[116.26522203878476, 39.91407614947869,3.4, 1.72] +[116.26522155329951, 39.91407759020546,2.83, 2.76] +[116.26522155329951, 39.91407759020546,3.23, 1.71] +[116.2652211130711, 39.914079403921015,2.71, 2.81] +[116.2652211130711, 39.914079403921015,3.03, 1.7] +[116.26522165044123, 39.914077233712746,2.86, 2.75] +[116.26522165044123, 39.914077233712746,3.27, 1.71] +[116.26522214577396, 39.91407831073606,2.84, 2.79] +[116.26522214577396, 39.91407831073606,3.16, 1.73] +[116.26522146439015, 39.914078792867635,2.77, 2.8] +[116.26522146439015, 39.914078792867635,3.1, 1.71] +[116.2652209878992, 39.9140795248226,2.7, 2.81] +[116.2652209878992, 39.9140795248226,3.01, 1.7] +[116.26522069301656, 39.91408004914379,2.65, 2.83] +[116.26522069301656, 39.91408004914379,2.95, 1.69] +[116.26521995097558, 39.91408087834975,2.56, 2.85] +[116.26521995097558, 39.91408087834975,2.86, 1.67] +[116.26521943542274, 39.914080624731646,2.53, 2.83] +[116.26521943542274, 39.914080624731646,2.88, 1.65] +[116.26521926319147, 39.91408072916332,2.51, 2.83] +[116.26521926319147, 39.91408072916332,2.87, 1.64] +[116.26521722916615, 39.914080651381795,2.35, 2.81] +[116.26521722916615, 39.914080651381795,2.87, 1.56] +[116.26521612561815, 39.914080630193205,2.27, 2.79] +[116.26521612561815, 39.914080630193205,2.88, 1.52] +[116.26521610057473, 39.91408105132395,2.25, 2.81] +[116.26521610057473, 39.91408105132395,2.83, 1.52] +[116.26521629426016, 39.91408085023596,2.27, 2.8] +[116.26521629426016, 39.91408085023596,2.85, 1.52] +[116.26521484174573, 39.914081917407195,2.11, 2.83] +[116.26521484174573, 39.914081917407195,2.74, 1.46] +[116.26521325294101, 39.91408308245938,1.93, 2.85] +[116.26521325294101, 39.91408308245938,2.63, 1.39] +[116.26519840067758, 39.914083593889885,0.84, 2.4] +[116.26519840067758, 39.914083593889885,3.02, 0.88] +[116.26518475316198, 39.91408053852869,1.16, 0.88] +[116.26518475316198, 39.91408053852869,4.02, 0.67] +[116.26517393935704, 39.91408754558293,1.56, 0.1] +[116.26517393935704, 39.91408754558293,4.27, 0.41] +[116.26517631660661, 39.914091535340035,1.37, -0.14] +[116.26517631660661, 39.914091535340035,3.89, 0.35] +[116.26517748428911, 39.914093477967405,1.33, -0.28] +[116.26517748428911, 39.914093477967405,3.71, 0.31] +[116.26517738716495, 39.914099911466266,1.72, -0.62] +[116.26517738716495, 39.914099911466266,3.5, 0.16] +[116.26517845637561, 39.914102375080496,1.86, -0.76] +[116.26517845637561, 39.914102375080496,3.36, 0.11] +[116.26517848083247, 39.91410119526557,1.76, -0.72] +[116.26517848083247, 39.91410119526557,3.38, 0.13] +[116.26517979258783, 39.914101485979195,1.71, -0.78] +[116.26517979258783, 39.914101485979195,3.26, 0.13] +[116.26518016015702, 39.91410335803177,1.86, -0.87] +[116.26518016015702, 39.91410335803177,3.2, 0.08] +[116.26518084251353, 39.914104081145766,1.9, -0.92] +[116.26518084251353, 39.914104081145766,3.14, 0.07] +[116.26518122527689, 39.9141041521465,1.89, -0.94] +[116.26518122527689, 39.9141041521465,3.11, 0.06] +[116.26518127439057, 39.914104233988866,1.9, -0.94] +[116.26518127439057, 39.914104233988866,3.1, 0.06] +[116.2651810598779, 39.914105336873774,2.01, -0.97] +[116.2651810598779, 39.914105336873774,3.11, 0.03] +[116.26518142080816, 39.914105822509676,2.05, -1.0] +[116.26518142080816, 39.914105822509676,3.08, 0.02] +[116.26518527729372, 39.91410380947455,1.71, -1.13] +[116.26518527729372, 39.91410380947455,2.77, 0.08] +[116.265186906413, 39.914102366952605,1.51, -1.19] +[116.265186906413, 39.914102366952605,2.65, 0.13] +[116.26518290627916, 39.91410149136628,1.56, -0.92] +[116.26518290627916, 39.91410149136628,3.0, 0.14] +[116.26518147060507, 39.91409780012538,1.31, -0.67] +[116.26518147060507, 39.91409780012538,3.22, 0.24] +[116.2651838417683, 39.914090712279,0.72, -0.16] +[116.2651838417683, 39.914090712279,3.37, 0.44] +[116.26518952138241, 39.9140867141285,0.37, 0.8] +[116.26518952138241, 39.9140867141285,3.25, 0.62] +[116.26519459122788, 39.914085185635855,0.51, 2.11] +[116.26519459122788, 39.914085185635855,3.07, 0.75] +[116.26520249046189, 39.91408235600875,1.18, 2.55] +[116.26520249046189, 39.91408235600875,2.97, 1.01] +[116.26520277867547, 39.914094774585465,1.09, -2.67] +[116.26520277867547, 39.914094774585465,1.81, 0.67] +[116.2651996695134, 39.91411076878556,2.47, -1.91] +[116.2651996695134, 39.91411076878556,1.59, -0.24] +[116.26519805951975, 39.914120621350094,3.52, -1.76] +[116.26519805951975, 39.914120621350094,2.28, -0.63] +[116.2651962598138, 39.91412297298094,3.76, -1.69] +[116.2651962598138, 39.91412297298094,2.58, -0.66] +[116.26519337965966, 39.91412543341134,4.01, -1.61] +[116.26519337965966, 39.91412543341134,2.94, -0.67] \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4dcd1cb..737be31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ applicationId "com.casic.detector" minSdkVersion 22 targetSdkVersion 33 - versionCode 5070 - versionName "5.0.7" + versionCode 5080 + versionName "5.0.8" ndk { moduleName "serial_port" diff --git a/app/src/main/assets/Log.txt b/app/src/main/assets/Log.txt index 3ac0c06..c2a5c54 100644 --- a/app/src/main/assets/Log.txt +++ b/app/src/main/assets/Log.txt @@ -1,36 +1,168 @@ -[2024-05-08 10:55:03, 116.26520111153543, 39.914095876958136] -[2024-05-08 10:55:23, 116.26520041477461, 39.91408176744235] -[2024-05-08 10:55:25, 116.26521381618639, 39.914085321105404] -[2024-05-08 10:55:27, 116.26521469085102, 39.91408589424658] -[2024-05-08 10:55:29, 116.26521935112915, 39.91408948155932] -[2024-05-08 10:55:31, 116.26521674438393, 39.91409277640618] -[2024-05-08 10:55:33, 116.26521502100081, 39.91409680623537] -[2024-05-08 10:55:35, 116.26521436528681, 39.91409743870871] -[2024-05-08 10:55:37, 116.26521581852678, 39.914096215019896] -[2024-05-08 10:55:39, 116.2652157997227, 39.91409655274152] -[2024-05-08 10:55:41, 116.26521525332545, 39.914089595841055] -[2024-05-08 10:55:43, 116.26521547696976, 39.91408284152685] -[2024-05-08 10:55:45, 116.26521702403849, 39.91408110674177] -[2024-05-08 10:55:47, 116.26521601937341, 39.91408169851284] -[2024-05-08 10:55:49, 116.26521878070947, 39.91408256547792] -[2024-05-08 10:55:51, 116.26521493263463, 39.91408460388276] -[2024-05-08 10:55:53, 116.2652065596182, 39.914083330147676] -[2024-05-08 10:55:55, 116.26520718302675, 39.914091775582044] -[2024-05-08 10:55:57, 116.2652105172751, 39.91409413348714] -[2024-05-08 10:56:00, 116.26521310207109, 39.914091631929594] -[2024-05-08 10:56:02, 116.26521468002292, 39.91409136586091] -[2024-05-08 10:56:04, 116.26521630161699, 39.914091848890436] -[2024-05-08 10:56:06, 116.26521525210667, 39.91409125637526] -[2024-05-08 10:56:08, 116.2652154868529, 39.914091114790416] -[2024-05-08 10:56:10, 116.26521685507166, 39.91409297065138] -[2024-05-08 10:56:12, 116.26521859251761, 39.91410895855137] -[2024-05-08 10:56:14, 116.26521574096462, 39.91411681129428] -[2024-05-08 10:56:16, 116.26521586107947, 39.91411806262725] -[2024-05-08 10:56:18, 116.26521655541322, 39.91411783085555] -[2024-05-08 10:56:20, 116.26521718046945, 39.91411551340897] -[2024-05-08 10:56:22, 116.26521771440684, 39.914113376894825] -[2024-05-08 10:56:24, 116.26521390349613, 39.91410998932012] -[2024-05-08 10:56:26, 116.26520710330637, 39.91411181374916] -[2024-05-08 10:56:28, 116.26520472814147, 39.91410742271341] -[2024-05-08 10:56:30, 116.26520492008224, 39.914108851730944] -[2024-05-08 10:56:32, 116.26520370261551, 39.91410741613028] \ No newline at end of file +[116.26522673534483, 39.914073438939226,3.44, 2.71] +[116.26522673534483, 39.914073438939226,3.76, 1.84] +[116.26522739073067, 39.91407279751809,3.53, 2.7] +[116.26522739073067, 39.91407279751809,3.84, 1.86] +[116.26522768544372, 39.91407266878266,3.56, 2.7] +[116.26522768544372, 39.91407266878266,3.86, 1.86] +[116.26522682986025, 39.914073442061124,3.45, 2.71] +[116.26522682986025, 39.914073442061124,3.76, 1.85] +[116.265226542067, 39.91407381058012,3.41, 2.72] +[116.265226542067, 39.91407381058012,3.72, 1.84] +[116.26522590130126, 39.914074424434205,3.33, 2.73] +[116.26522590130126, 39.914074424434205,3.64, 1.83] +[116.26522619193993, 39.91407464058658,3.34, 2.73] +[116.26522619193993, 39.91407464058658,3.62, 1.84] +[116.26522532797509, 39.914075720995704,3.21, 2.75] +[116.26522532797509, 39.914075720995704,3.49, 1.82] +[116.26522537620738, 39.91407591746258,3.21, 2.76] +[116.26522537620738, 39.91407591746258,3.47, 1.82] +[116.26522538479156, 39.91407572486403,3.22, 2.75] +[116.26522538479156, 39.91407572486403,3.49, 1.82] +[116.26522606869662, 39.9140757770439,3.27, 2.76] +[116.26522606869662, 39.9140757770439,3.49, 1.84] +[116.26522544568988, 39.91407567742804,3.23, 2.75] +[116.26522544568988, 39.91407567742804,3.49, 1.82] +[116.2652257962649, 39.914076279888356,3.22, 2.77] +[116.2652257962649, 39.914076279888356,3.43, 1.84] +[116.26522445330072, 39.914076360162966,3.12, 2.76] +[116.26522445330072, 39.914076360162966,3.4, 1.8] +[116.26522664489963, 39.91407815739835,3.2, 2.83] +[116.26522664489963, 39.91407815739835,3.25, 1.88] +[116.265224260013, 39.914077892430285,3.02, 2.8] +[116.265224260013, 39.914077892430285,3.23, 1.8] +[116.2652255666347, 39.914075364085086,3.25, 2.75] +[116.2652255666347, 39.914075364085086,3.53, 1.82] +[116.26523089552752, 39.91407330168115,3.76, 2.75] +[116.26523089552752, 39.91407330168115,3.86, 1.95] +[116.2652358935911, 39.91407169619145,4.22, 2.76] +[116.2652358935911, 39.91407169619145,4.18, 2.06] +[116.2652344204988, 39.91407137692701,4.13, 2.74] +[116.2652344204988, 39.91407137692701,4.16, 2.02] +[116.26523053436848, 39.91406933949784,3.96, 2.66] +[116.26523053436848, 39.91406933949784,4.28, 1.91] +[116.26522591040762, 39.914071727642344,3.49, 2.66] +[116.26522591040762, 39.914071727642344,3.93, 1.81] +[116.26521823965147, 39.91407533000587,2.72, 2.65] +[116.26521823965147, 39.91407533000587,3.47, 1.59] +[116.26521683884835, 39.91407325049691,2.77, 2.57] +[116.26521683884835, 39.91407325049691,3.7, 1.55] +[116.26522422758242, 39.91407311265688,3.28, 2.67] +[116.26522422758242, 39.91407311265688,3.76, 1.77] +[116.2652234734805, 39.91407422700223,3.16, 2.69] +[116.2652234734805, 39.91407422700223,3.62, 1.75] +[116.26522172092305, 39.91407609174415,2.93, 2.72] +[116.26522172092305, 39.91407609174415,3.4, 1.71] +[116.26522098518798, 39.91407653983732,2.85, 2.72] +[116.26522098518798, 39.91407653983732,3.34, 1.69] +[116.26522033066807, 39.914076687499126,2.79, 2.72] +[116.26522033066807, 39.914076687499126,3.32, 1.67] +[116.26521991464517, 39.91407721070778,2.73, 2.73] +[116.26521991464517, 39.91407721070778,3.26, 1.65] +[116.26521986386254, 39.914076156061356,2.79, 2.7] +[116.26521986386254, 39.914076156061356,3.38, 1.65] +[116.26522046832702, 39.91407541020598,2.87, 2.69] +[116.26522046832702, 39.91407541020598,3.47, 1.67] +[116.2652208575345, 39.91407496983857,2.93, 2.68] +[116.2652208575345, 39.91407496983857,3.52, 1.68] +[116.26522162320249, 39.91407470918113,3.0, 2.68] +[116.26522162320249, 39.91407470918113,3.55, 1.7] +[116.26522218697728, 39.91407444170218,3.06, 2.68] +[116.26522218697728, 39.91407444170218,3.59, 1.72] +[116.26522251525435, 39.914074576129636,3.07, 2.69] +[116.26522251525435, 39.914074576129636,3.57, 1.73] +[116.26522239822415, 39.91407556123485,3.01, 2.71] +[116.26522239822415, 39.91407556123485,3.46, 1.73] +[116.26522210839452, 39.914075847232155,2.97, 2.72] +[116.26522210839452, 39.914075847232155,3.43, 1.72] +[116.26522219403677, 39.914076398808035,2.94, 2.74] +[116.26522219403677, 39.914076398808035,3.37, 1.73] +[116.26522203878476, 39.91407614947869,2.95, 2.73] +[116.26522203878476, 39.91407614947869,3.4, 1.72] +[116.26522155329951, 39.91407759020546,2.83, 2.76] +[116.26522155329951, 39.91407759020546,3.23, 1.71] +[116.2652211130711, 39.914079403921015,2.71, 2.81] +[116.2652211130711, 39.914079403921015,3.03, 1.7] +[116.26522165044123, 39.914077233712746,2.86, 2.75] +[116.26522165044123, 39.914077233712746,3.27, 1.71] +[116.26522214577396, 39.91407831073606,2.84, 2.79] +[116.26522214577396, 39.91407831073606,3.16, 1.73] +[116.26522146439015, 39.914078792867635,2.77, 2.8] +[116.26522146439015, 39.914078792867635,3.1, 1.71] +[116.2652209878992, 39.9140795248226,2.7, 2.81] +[116.2652209878992, 39.9140795248226,3.01, 1.7] +[116.26522069301656, 39.91408004914379,2.65, 2.83] +[116.26522069301656, 39.91408004914379,2.95, 1.69] +[116.26521995097558, 39.91408087834975,2.56, 2.85] +[116.26521995097558, 39.91408087834975,2.86, 1.67] +[116.26521943542274, 39.914080624731646,2.53, 2.83] +[116.26521943542274, 39.914080624731646,2.88, 1.65] +[116.26521926319147, 39.91408072916332,2.51, 2.83] +[116.26521926319147, 39.91408072916332,2.87, 1.64] +[116.26521722916615, 39.914080651381795,2.35, 2.81] +[116.26521722916615, 39.914080651381795,2.87, 1.56] +[116.26521612561815, 39.914080630193205,2.27, 2.79] +[116.26521612561815, 39.914080630193205,2.88, 1.52] +[116.26521610057473, 39.91408105132395,2.25, 2.81] +[116.26521610057473, 39.91408105132395,2.83, 1.52] +[116.26521629426016, 39.91408085023596,2.27, 2.8] +[116.26521629426016, 39.91408085023596,2.85, 1.52] +[116.26521484174573, 39.914081917407195,2.11, 2.83] +[116.26521484174573, 39.914081917407195,2.74, 1.46] +[116.26521325294101, 39.91408308245938,1.93, 2.85] +[116.26521325294101, 39.91408308245938,2.63, 1.39] +[116.26519840067758, 39.914083593889885,0.84, 2.4] +[116.26519840067758, 39.914083593889885,3.02, 0.88] +[116.26518475316198, 39.91408053852869,1.16, 0.88] +[116.26518475316198, 39.91408053852869,4.02, 0.67] +[116.26517393935704, 39.91408754558293,1.56, 0.1] +[116.26517393935704, 39.91408754558293,4.27, 0.41] +[116.26517631660661, 39.914091535340035,1.37, -0.14] +[116.26517631660661, 39.914091535340035,3.89, 0.35] +[116.26517748428911, 39.914093477967405,1.33, -0.28] +[116.26517748428911, 39.914093477967405,3.71, 0.31] +[116.26517738716495, 39.914099911466266,1.72, -0.62] +[116.26517738716495, 39.914099911466266,3.5, 0.16] +[116.26517845637561, 39.914102375080496,1.86, -0.76] +[116.26517845637561, 39.914102375080496,3.36, 0.11] +[116.26517848083247, 39.91410119526557,1.76, -0.72] +[116.26517848083247, 39.91410119526557,3.38, 0.13] +[116.26517979258783, 39.914101485979195,1.71, -0.78] +[116.26517979258783, 39.914101485979195,3.26, 0.13] +[116.26518016015702, 39.91410335803177,1.86, -0.87] +[116.26518016015702, 39.91410335803177,3.2, 0.08] +[116.26518084251353, 39.914104081145766,1.9, -0.92] +[116.26518084251353, 39.914104081145766,3.14, 0.07] +[116.26518122527689, 39.9141041521465,1.89, -0.94] +[116.26518122527689, 39.9141041521465,3.11, 0.06] +[116.26518127439057, 39.914104233988866,1.9, -0.94] +[116.26518127439057, 39.914104233988866,3.1, 0.06] +[116.2651810598779, 39.914105336873774,2.01, -0.97] +[116.2651810598779, 39.914105336873774,3.11, 0.03] +[116.26518142080816, 39.914105822509676,2.05, -1.0] +[116.26518142080816, 39.914105822509676,3.08, 0.02] +[116.26518527729372, 39.91410380947455,1.71, -1.13] +[116.26518527729372, 39.91410380947455,2.77, 0.08] +[116.265186906413, 39.914102366952605,1.51, -1.19] +[116.265186906413, 39.914102366952605,2.65, 0.13] +[116.26518290627916, 39.91410149136628,1.56, -0.92] +[116.26518290627916, 39.91410149136628,3.0, 0.14] +[116.26518147060507, 39.91409780012538,1.31, -0.67] +[116.26518147060507, 39.91409780012538,3.22, 0.24] +[116.2651838417683, 39.914090712279,0.72, -0.16] +[116.2651838417683, 39.914090712279,3.37, 0.44] +[116.26518952138241, 39.9140867141285,0.37, 0.8] +[116.26518952138241, 39.9140867141285,3.25, 0.62] +[116.26519459122788, 39.914085185635855,0.51, 2.11] +[116.26519459122788, 39.914085185635855,3.07, 0.75] +[116.26520249046189, 39.91408235600875,1.18, 2.55] +[116.26520249046189, 39.91408235600875,2.97, 1.01] +[116.26520277867547, 39.914094774585465,1.09, -2.67] +[116.26520277867547, 39.914094774585465,1.81, 0.67] +[116.2651996695134, 39.91411076878556,2.47, -1.91] +[116.2651996695134, 39.91411076878556,1.59, -0.24] +[116.26519805951975, 39.914120621350094,3.52, -1.76] +[116.26519805951975, 39.914120621350094,2.28, -0.63] +[116.2651962598138, 39.91412297298094,3.76, -1.69] +[116.2651962598138, 39.91412297298094,2.58, -0.66] +[116.26519337965966, 39.91412543341134,4.01, -1.61] +[116.26519337965966, 39.91412543341134,2.94, -0.67] \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index ef0dcbd..33f8643 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -1512,7 +1512,7 @@ out.write('3'.code) val result = DataBaseManager.get.queryMarkerById(markerId) if (result.isNotEmpty()) { - val tag = when (result.first().markerId) { + val tag = when (result.first().markerType) { "EM30" -> '7' "EM50" -> '8' "EM14" -> '9' @@ -1520,6 +1520,7 @@ } if (tag == '1') { "此标识器无法读取埋深！".show(context) + initTimer() } else { // 发送读取标识器埋设深度指令 LoadingDialogHub.show(this@MainActivity, "正在测距，请稍后...") @@ -1566,8 +1567,8 @@ } val split = line.replace("[", "").split(",") val double = DoubleArray(2) - double[0] = split[1].replace(" ", "").toDouble() - double[1] = split[2].replace(" ", "").toDouble() + double[0] = split[0].replace(" ", "").toDouble() + double[1] = split[1].replace(" ", "").toDouble() result.add(double) } @@ -1595,19 +1596,17 @@ lifecycleScope.launch(Dispatchers.IO) { val dataPoints = ArrayList() DataBaseManager.get.loadMarkers().forEach { - //单位：米。计算出标识器与探测仪（定位点）的距离 val distance = AMapUtils.calculateLineDistance( LatLng(it.lat.toDouble(), it.lng.toDouble()), LatLng(latitude, longitude) ) val formatDistance = decimalFormat.format(distance).toFloat() if (formatDistance <= LocaleConstant.MAX_DISTANCE) { - //计算出探测仪（定位点）与标识器的方位角 val angle = atan2( (it.lat.toDouble() - latitude), (it.lng.toDouble() - longitude) - ) + ) + Math.PI val formatAngle = decimalFormat.format(angle).toDouble() - "$longitude, $latitude,$formatDistance, $formatAngle".writeToFile( + "[$longitude, $latitude,$formatDistance, $formatAngle]".writeToFile( createLogFile() ) dataPoints.add(RadarScanView.DataPoint(formatAngle, formatDistance)) @@ -1621,14 +1620,13 @@ // // val formatDistance = decimalFormat.format(distance).toFloat() // if (formatDistance <= LocaleConstant.MAX_DISTANCE) { -// //计算出探测仪（定位点）与标识器的方位角 // val angle = atan2( // (it.lat.toDouble() - testPoint[1]), // (it.lng.toDouble() - testPoint[0]) -// ) +// ) + Math.PI // val formatAngle = decimalFormat.format(angle).toDouble() // -// "${it.markerId}, ${testPoint[0]}, ${testPoint[1]}, $formatDistance, $formatAngle".writeToFile( +// "[${it.markerId}, ${testPoint[0]}, ${testPoint[1]}, $formatDistance, $formatAngle]".writeToFile( // createLogFile() // ) // dataPoints.add(RadarScanView.DataPoint(formatAngle, formatDistance))