diff --git a/.idea/misc.xml b/.idea/misc.xml index 8a8f75bfe2..703e5d4b89 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..df457700f7 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -0,0 +1,1056 @@ + + + + + @dimen/dp_15 + + + + -60px + -30px + -20px + -12px + -10px + -8px + -5px + -2px + -1px + 0px + 0.1px + 0.5px + 1px + 1.5px + 2px + 2.5px + 3px + 3.5px + 4px + 4.5px + 5px + 6px + 7px + 7.5px + 8px + 9px + 10px + 11px + 12px + 13px + 14px + 15px + 16px + 17px + 18px + 19px + 20px + 21px + 22px + 23px + 24px + 25px + 26px + 27px + 28px + 29px + 30px + 31px + 32px + 33px + 34px + 35px + 36px + 37px + 38px + 39px + 40px + 41px + 42px + 43px + 44px + 45px + 46px + 47px + 48px + 49px + 50px + 51px + 52px + 53px + 54px + 55px + 56px + 57px + 58px + 59px + 60px + 61px + 62px + 63px + 64px + 65px + 66px + 67px + 68px + 69px + 70px + 71px + 72px + 73px + 74px + 75px + 76px + 77px + 78px + 79px + 80px + 81px + 82px + 83px + 84px + 85px + 86px + 87px + 88px + 89px + 90px + 91px + 92px + 93px + 94px + 95px + 96px + 97px + 98px + 99px + 100px + 101px + 102px + 103px + 104px + 104.5px + 105px + 106px + 107px + 108px + 109px + 110px + 111px + 112px + 113px + 114px + 115px + 116px + 117px + 118px + 119px + 120px + 121px + 122px + 123px + 124px + 125px + 126px + 127px + 128px + 129px + 130px + 131px + 132px + 133px + 134px + 134.5px + 135px + 136px + 137px + 138px + 139px + 140px + 141px + 142px + 143px + 144px + 145px + 146px + 147px + 148px + 149px + 150px + 151px + 152px + 153px + 154px + 155px + 156px + 157px + 158px + 159px + 160px + 161px + 162px + 163px + 164px + 165px + 166px + 167px + 168px + 169px + 170px + 171px + 172px + 173px + 174px + 175px + 176px + 177px + 178px + 179px + 180px + 181px + 182px + 183px + 184px + 185px + 186px + 187px + 188px + 189px + 190px + 191px + 191.25px + 192px + 193px + 194px + 195px + 196px + 197px + 198px + 199px + 200px + 201px + 202px + 203px + 204px + 205px + 206px + 207px + 208px + 209px + 210px + 211px + 212px + 213px + 214px + 215px + 216px + 217px + 218px + 219px + 220px + 221px + 222px + 223px + 224px + 225px + 226px + 227px + 228px + 229px + 230px + 231px + 232px + 233px + 234px + 235px + 236px + 237px + 238px + 239px + 240px + 241px + 242px + 243px + 244px + 245px + 246px + 247px + 248px + 249px + 250px + 251px + 252px + 253px + 254px + 255px + 256px + 257px + 258px + 259px + 260px + 261px + 262px + 263px + 264px + 265px + 266px + 267px + 268px + 269px + 270px + 271px + 272px + 273px + 274px + 275px + 276px + 277px + 278px + 279px + 280px + 281px + 282px + 283px + 284px + 285px + 286px + 287px + 288px + 289px + 290px + 291px + 292px + 293px + 294px + 295px + 296px + 297px + 298px + 299px + 300px + 301px + 302px + 303px + 304px + 305px + 306px + 307px + 308px + 309px + 310px + 311px + 312px + 313px + 314px + 315px + 316px + 317px + 318px + 319px + 320px + 321px + 322px + 323px + 324px + 325px + 326px + 327px + 328px + 329px + 330px + 331px + 332px + 333px + 334px + 335px + 336px + 337px + 338px + 339px + 340px + 341px + 342px + 343px + 344px + 345px + 346px + 347px + 348px + 349px + 350px + 351px + 352px + 353px + 354px + 355px + 356px + 357px + 358px + 359px + 366px + 367px + 368px + 369px + 370px + 371px + 372px + 373px + 374px + 375px + 376px + 377px + 378px + 379px + 380px + 381px + 382px + 383px + 384px + 385px + 386px + 387px + 388px + 389px + 390px + 391px + 392px + 393px + 394px + 395px + 396px + 397px + 398px + 399px + 400px + 401px + 402px + 403px + 404px + 405px + 406px + 407px + 408px + 409px + 410px + 411px + 412px + 413px + 414px + 415px + 416px + 417px + 418px + 419px + 420px + 421px + 422px + 423px + 424px + 425px + 426px + 427px + 428px + 429px + 430px + 431px + 432px + 433px + 434px + 435px + 436px + 437px + 438px + 439px + 440px + 441px + 442px + 443px + 444px + 445px + 446px + 447px + 448px + 449px + 450px + 451px + 452px + 453px + 454px + 455px + 456px + 457px + 458px + 459px + 460px + 461px + 462px + 463px + 464px + 465px + 466px + 467px + 468px + 469px + 470px + 471px + 472px + 473px + 474px + 475px + 476px + 477px + 478px + 479px + 480px + 481px + 482px + 483px + 484px + 485px + 486px + 487px + 488px + 489px + 490px + 491px + 492px + 493px + 494px + 495px + 496px + 497px + 498px + 499px + 500px + 501px + 502px + 503px + 504px + 505px + 506px + 507px + 508px + 509px + 510px + 511px + 512px + 513px + 514px + 515px + 516px + 517px + 518px + 519px + 520px + 521px + 522px + 523px + 524px + 525px + 526px + 527px + 528px + 529px + 530px + 531px + 532px + 533px + 534px + 535px + 536px + 537px + 538px + 539px + 540px + 541px + 542px + 543px + 544px + 545px + 546px + 547px + 548px + 549px + 550px + 551px + 552px + 553px + 554px + 555px + 556px + 557px + 558px + 559px + 560px + 561px + 562px + 563px + 564px + 565px + 566px + 567px + 568px + 569px + 570px + 571px + 572px + 573px + 574px + 575px + 576px + 577px + 578px + 579px + 580px + 581px + 582px + 583px + 584px + 585px + 586px + 587px + 588px + 589px + 590px + 591px + 592px + 593px + 594px + 595px + 596px + 597px + 598px + 599px + 600px + 601px + 602px + 603px + 604px + 605px + 606px + 607px + 608px + 609px + 610px + 611px + 612px + 613px + 614px + 615px + 616px + 617px + 618px + 619px + 620px + 621px + 622px + 623px + 624px + 625px + 626px + 627px + 628px + 629px + 630px + 631px + 632px + 633px + 634px + 635px + 636px + 637px + 638px + 639px + 640px + 641px + 642px + 643px + 644px + 645px + 646px + 647px + 648px + 649px + 650px + 651px + 652px + 653px + 654px + 655px + 656px + 657px + 658px + 659px + 660px + 661px + 662px + 663px + 664px + 665px + 666px + 667px + 668px + 669px + 670px + 671px + 672px + 673px + 674px + 675px + 676px + 677px + 678px + 679px + 680px + 681px + 682px + 683px + 684px + 685px + 686px + 687px + 688px + 689px + 690px + 691px + 692px + 693px + 694px + 695px + 696px + 697px + 698px + 699px + 700px + 701px + 702px + 703px + 704px + 705px + 706px + 707px + 708px + 709px + 710px + 711px + 712px + 713px + 714px + 715px + 716px + 717px + 718px + 719px + 720px + 721px + 722px + 723px + 724px + 725px + 726px + 727px + 728px + 729px + 730px + 731px + 732px + 733px + 734px + 735px + 736px + 737px + 738px + 739px + 740px + 741px + 742px + 743px + 744px + 745px + 746px + 747px + 748px + 749px + 750px + 751px + 752px + 753px + 754px + 755px + 756px + 757px + 758px + 759px + 760px + 761px + 762px + 763px + 764px + 765px + 766px + 767px + 768px + 769px + 770px + 771px + 772px + 773px + 774px + 775px + 776px + 777px + 778px + 779px + 780px + 781px + 782px + 783px + 784px + 785px + 786px + 787px + 788px + 789px + 790px + 791px + 792px + 793px + 794px + 795px + 796px + 797px + 798px + 799px + 800px + 801px + 802px + 803px + 804px + 805px + 806px + 807px + 808px + 809px + 810px + 811px + 812px + 813px + 814px + 815px + 816px + 817px + 818px + 819px + 820px + 821px + 822px + 823px + 824px + 825px + 826px + 827px + 828px + 829px + 830px + 831px + 832px + 833px + 834px + 835px + 836px + 837px + 838px + 839px + 840px + 841px + 842px + 843px + 844px + 845px + 846px + 847px + 848px + 849px + 850px + 851px + 852px + 853px + 854px + 855px + 856px + 857px + 858px + 859px + 860px + 861px + 862px + 863px + 864px + 865px + 866px + 867px + 868px + 869px + 870px + 871px + 872px + 873px + 874px + 875px + 876px + 877px + 878px + 879px + 880px + 881px + 882px + 883px + 884px + 885px + 886px + 887px + 888px + 889px + 890px + 891px + 892px + 893px + 894px + 895px + 896px + 897px + 898px + 899px + 900px + 901px + 902px + 903px + 904px + 905px + 906px + 907px + 908px + 909px + 910px + 911px + 912px + 913px + 914px + 915px + 916px + 917px + 918px + 919px + 920px + 921px + 922px + 923px + 924px + 925px + 926px + 927px + 928px + 929px + 930px + 931px + 932px + 933px + 934px + 935px + 936px + 937px + 938px + 939px + 940px + 941px + 942px + 943px + 944px + 945px + 946px + 947px + 948px + 949px + 950px + 951px + 952px + 953px + 954px + 955px + 956px + 957px + 958px + 959px + 960px + 961px + 962px + 963px + 964px + 965px + 966px + 967px + 968px + 969px + 970px + 971px + 972px + 973px + 974px + 975px + 976px + 977px + 978px + 979px + 980px + 981px + 982px + 983px + 984px + 985px + 986px + 987px + 988px + 989px + 990px + 991px + 992px + 993px + 994px + 995px + 996px + 997px + 998px + 999px + + + + + 6px + 7px + 8px + 9px + 10px + 11px + 12px + 13px + 14px + 15px + 16px + 17px + 18px + 19px + 20px + 21px + 22px + 23px + 24px + 25px + 28px + 30px + 32px + 34px + 36px + 38px + 40px + 42px + 48px + + diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index 0d41f56a8c..0dc0092179 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -423,7 +423,6 @@ public class MogoServiceProvider implements IMogoModuleProvider, } } - @Override public IMogoMarkerClickListener getMarkerClickListener() { return null; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java index 293a299196..0acb8cb1c4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java @@ -1,30 +1,30 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerActivitiesScope { - @SerializedName("content") - private String mContent; - @SerializedName("isCheck") - private int mIsCheck; + @Expose + private String content; + @Expose + private int isCheck; public String getContent() { - return mContent; + return content; } public void setContent(String content) { - mContent = content; + this.content = content; } public int getIsCheck() { - return mIsCheck; + return isCheck; } public void setIsCheck(int isCheck) { - mIsCheck = isCheck; + this.isCheck = isCheck; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java index 4a4260d8ae..afde08bf66 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java @@ -1,40 +1,40 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerCarChat { - @SerializedName("location") - private MarkerLocation mLocation; - @SerializedName("type") - private String mType; - @SerializedName("userInfo") - private MarkerUserInfo mUserInfo; + @Expose + private MarkerLocation location; + @Expose + private String type; + @Expose + private MarkerUserInfo userInfo; public MarkerLocation getLocation() { - return mLocation; + return location; } public void setLocation(MarkerLocation location) { - mLocation = location; + this.location = location; } public String getType() { - return mType; + return type; } public void setType(String type) { - mType = type; + this.type = type; } public MarkerUserInfo getUserInfo() { - return mUserInfo; + return userInfo; } public void setUserInfo(MarkerUserInfo userInfo) { - mUserInfo = userInfo; + this.userInfo = userInfo; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java index 35303e381e..dc11f82b8b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java @@ -1,30 +1,30 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerCarInfo { - @SerializedName("carBrandLogoUrl") - private String mCarBrandLogoUrl; - @SerializedName("carTypeName") - private String mCarTypeName; + @Expose + private String carBrandLogoUrl; + @Expose + private String carTypeName; public String getCarBrandLogoUrl() { - return mCarBrandLogoUrl; + return carBrandLogoUrl; } public void setCarBrandLogoUrl(String carBrandLogoUrl) { - mCarBrandLogoUrl = carBrandLogoUrl; + this.carBrandLogoUrl = carBrandLogoUrl; } public String getCarTypeName() { - return mCarTypeName; + return carTypeName; } public void setCarTypeName(String carTypeName) { - mCarTypeName = carTypeName; + this.carTypeName = carTypeName; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java index 12c485d889..b251af30d6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java @@ -2,50 +2,50 @@ package com.mogo.module.service.entity; import java.util.List; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerCardResult { - @SerializedName("carChat") - private List mCarChat; - @SerializedName("exploreWay") - private List mExploreWay; - @SerializedName("onlineCar") - private List mOnlineCar; - @SerializedName("shareMusic") - private List mShareMusic; + @Expose + private List carChat; + @Expose + private List exploreWay; + @Expose + private List onlineCar; + @Expose + private List shareMusic; public List getCarChat() { - return mCarChat; + return carChat; } public void setCarChat(List carChat) { - mCarChat = carChat; + this.carChat = carChat; } public List getExploreWay() { - return mExploreWay; + return exploreWay; } public void setExploreWay(List exploreWay) { - mExploreWay = exploreWay; + this.exploreWay = exploreWay; } public List getOnlineCar() { - return mOnlineCar; + return onlineCar; } public void setOnlineCar(List onlineCar) { - mOnlineCar = onlineCar; + this.onlineCar = onlineCar; } public List getShareMusic() { - return mShareMusic; + return shareMusic; } public void setShareMusic(List shareMusic) { - mShareMusic = shareMusic; + this.shareMusic = shareMusic; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java index 7fb1ad72dc..afa21e1263 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java @@ -1,40 +1,40 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerDynamicData { - @SerializedName("id") - private String mId; - @SerializedName("name") - private String mName; - @SerializedName("type") - private int mType; + @Expose + private Long id; + @Expose + private String name; + @Expose + private Long type; - public String getId() { - return mId; + public Long getId() { + return id; } - public void setId(String id) { - mId = id; + public void setId(Long id) { + this.id = id; } public String getName() { - return mName; + return name; } public void setName(String name) { - mName = name; + this.name = name; } - public int getType() { - return mType; + public Long getType() { + return type; } - public void setType(int type) { - mType = type; + public void setType(Long type) { + this.type = type; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java index 319e3275a5..f6c0f9d5ca 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java @@ -2,130 +2,130 @@ package com.mogo.module.service.entity; import java.util.List; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerExploreWay { - @SerializedName("addr") - private String mAddr; - @SerializedName("canLive") - private Long mCanLive; - @SerializedName("cityName") - private String mCityName; - @SerializedName("direction") - private Long mDirection; - @SerializedName("distance") - private Long mDistance; - @SerializedName("fileType") - private Long mFileType; - @SerializedName("generateTime") - private Long mGenerateTime; - @SerializedName("items") - private List mItems; - @SerializedName("location") - private MarkerLocation mLocation; - @SerializedName("sn") - private String mSn; - @SerializedName("type") - private String mType; - @SerializedName("userInfo") - private MarkerUserInfo mUserInfo; + @Expose + private String addr; + @Expose + private Long canLive; + @Expose + private String cityName; + @Expose + private Long direction; + @Expose + private Long distance; + @Expose + private Long fileType; + @Expose + private Long generateTime; + @Expose + private List items; + @Expose + private MarkerLocation location; + @Expose + private String sn; + @Expose + private String type; + @Expose + private MarkerUserInfo userInfo; public String getAddr() { - return mAddr; + return addr; } public void setAddr(String addr) { - mAddr = addr; + this.addr = addr; } public Long getCanLive() { - return mCanLive; + return canLive; } public void setCanLive(Long canLive) { - mCanLive = canLive; + this.canLive = canLive; } public String getCityName() { - return mCityName; + return cityName; } public void setCityName(String cityName) { - mCityName = cityName; + this.cityName = cityName; } public Long getDirection() { - return mDirection; + return direction; } public void setDirection(Long direction) { - mDirection = direction; + this.direction = direction; } public Long getDistance() { - return mDistance; + return distance; } public void setDistance(Long distance) { - mDistance = distance; + this.distance = distance; } public Long getFileType() { - return mFileType; + return fileType; } public void setFileType(Long fileType) { - mFileType = fileType; + this.fileType = fileType; } public Long getGenerateTime() { - return mGenerateTime; + return generateTime; } public void setGenerateTime(Long generateTime) { - mGenerateTime = generateTime; + this.generateTime = generateTime; } public List getItems() { - return mItems; + return items; } public void setItems(List items) { - mItems = items; + this.items = items; } public MarkerLocation getLocation() { - return mLocation; + return location; } public void setLocation(MarkerLocation location) { - mLocation = location; + this.location = location; } public String getSn() { - return mSn; + return sn; } public void setSn(String sn) { - mSn = sn; + this.sn = sn; } public String getType() { - return mType; + return type; } public void setType(String type) { - mType = type; + this.type = type; } public MarkerUserInfo getUserInfo() { - return mUserInfo; + return userInfo; } public void setUserInfo(MarkerUserInfo userInfo) { - mUserInfo = userInfo; + this.userInfo = userInfo; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java index e54aeee7a2..c9dbf03bd2 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java @@ -1,30 +1,30 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerExploreWayItem { - @SerializedName("thumbnail") - private String mThumbnail; - @SerializedName("url") - private String mUrl; + @Expose + private String thumbnail; + @Expose + private String url; public String getThumbnail() { - return mThumbnail; + return thumbnail; } public void setThumbnail(String thumbnail) { - mThumbnail = thumbnail; + this.thumbnail = thumbnail; } public String getUrl() { - return mUrl; + return url; } public void setUrl(String url) { - mUrl = url; + this.url = url; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java index fbb50bde19..53bf57312d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java @@ -1,30 +1,30 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerHobbyDatum { - @SerializedName("content") - private String mContent; - @SerializedName("isCheck") - private int mIsCheck; + @Expose + private String content; + @Expose + private int isCheck; public String getContent() { - return mContent; + return content; } public void setContent(String content) { - mContent = content; + this.content = content; } public int getIsCheck() { - return mIsCheck; + return isCheck; } public void setIsCheck(int isCheck) { - mIsCheck = isCheck; + this.isCheck = isCheck; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java index d9f1b04e22..8c0768f54a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java @@ -1,50 +1,50 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerLocation { - @SerializedName("address") - private String mAddress; - @SerializedName("angle") - private String mAngle; - @SerializedName("lat") - private double mLat; - @SerializedName("lon") - private double mLon; + @Expose + private String address; + @Expose + private Double angle; + @Expose + private Double lat; + @Expose + private Double lon; public String getAddress() { - return mAddress; + return address; } public void setAddress(String address) { - mAddress = address; + this.address = address; } - public String getAngle() { - return mAngle; + public Double getAngle() { + return angle; } - public void setAngle(String angle) { - mAngle = angle; + public void setAngle(Double angle) { + this.angle = angle; } - public double getLat() { - return mLat; + public Double getLat() { + return lat; } - public void setLat(double lat) { - mLat = lat; + public void setLat(Double lat) { + this.lat = lat; } - public double getLon() { - return mLon; + public Double getLon() { + return lon; } - public void setLon(double lon) { - mLon = lon; + public void setLon(Double lon) { + this.lon = lon; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java index caf5579119..7ce06e01f0 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java @@ -2,100 +2,100 @@ package com.mogo.module.service.entity; import java.util.List; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerOnlineCar { - @SerializedName("activitiesScope") - private List mActivitiesScope; - @SerializedName("carInfo") - private MarkerCarInfo mCarInfo; - @SerializedName("compatibility") - private int mCompatibility; - @SerializedName("dynamicData") - private MarkerDynamicData mDynamicData; - @SerializedName("hobbyData") - private List mHobbyData; - @SerializedName("isFocus") - private int mIsFocus; - @SerializedName("location") - private MarkerLocation mLocation; - @SerializedName("type") - private String mType; - @SerializedName("userInfo") - private MarkerUserInfo mUserInfo; + @Expose + private List activitiesScope; + @Expose + private MarkerCarInfo carInfo; + @Expose + private String compatibility; + @Expose + private MarkerDynamicData dynamicData; + @Expose + private List hobbyData; + @Expose + private Long isFocus; + @Expose + private MarkerLocation location; + @Expose + private String type; + @Expose + private MarkerUserInfo userInfo; public List getActivitiesScope() { - return mActivitiesScope; + return activitiesScope; } public void setActivitiesScope(List activitiesScope) { - mActivitiesScope = activitiesScope; + this.activitiesScope = activitiesScope; } public MarkerCarInfo getCarInfo() { - return mCarInfo; + return carInfo; } public void setCarInfo(MarkerCarInfo carInfo) { - mCarInfo = carInfo; + this.carInfo = carInfo; } - public int getCompatibility() { - return mCompatibility; + public String getCompatibility() { + return compatibility; } - public void setCompatibility(int compatibility) { - mCompatibility = compatibility; + public void setCompatibility(String compatibility) { + this.compatibility = compatibility; } public MarkerDynamicData getDynamicData() { - return mDynamicData; + return dynamicData; } public void setDynamicData(MarkerDynamicData dynamicData) { - mDynamicData = dynamicData; + this.dynamicData = dynamicData; } public List getHobbyData() { - return mHobbyData; + return hobbyData; } public void setHobbyData(List hobbyData) { - mHobbyData = hobbyData; + this.hobbyData = hobbyData; } - public int getIsFocus() { - return mIsFocus; + public Long getIsFocus() { + return isFocus; } - public void setIsFocus(int isFocus) { - mIsFocus = isFocus; + public void setIsFocus(Long isFocus) { + this.isFocus = isFocus; } public MarkerLocation getLocation() { - return mLocation; + return location; } public void setLocation(MarkerLocation location) { - mLocation = location; + this.location = location; } public String getType() { - return mType; + return type; } public void setType(String type) { - mType = type; + this.type = type; } public MarkerUserInfo getUserInfo() { - return mUserInfo; + return userInfo; } public void setUserInfo(MarkerUserInfo userInfo) { - mUserInfo = userInfo; + this.userInfo = userInfo; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java index b86a116671..37a623bf6a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java @@ -1,59 +1,50 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerResponse { - @SerializedName("code") - private int mCode; - @SerializedName("msg") - private String mMsg; - @SerializedName("result") - private MarkerCardResult mResult; - @SerializedName("sign") - private String mSign; + @Expose + private Long code; + @Expose + private String msg; + @Expose + private MarkerCardResult result; + @Expose + private String sign; - public int getCode() { - return mCode; + public Long getCode() { + return code; } - public void setCode(int code) { - mCode = code; + public void setCode(Long code) { + this.code = code; } public String getMsg() { - return mMsg; + return msg; } public void setMsg(String msg) { - mMsg = msg; + this.msg = msg; } public MarkerCardResult getResult() { - return mResult; + return result; } public void setResult(MarkerCardResult result) { - mResult = result; + this.result = result; } public String getSign() { - return mSign; + return sign; } public void setSign(String sign) { - mSign = sign; + this.sign = sign; } - @Override - public String toString() { - return "MarkerResponse{" + - "mCode=" + mCode + - ", mMsg='" + mMsg + '\'' + - ", mResult=" + mResult + - ", mSign='" + mSign + '\'' + - '}'; - } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java index 06295dcbfa..a97a35f79c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java @@ -1,80 +1,80 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerShareMusic { - @SerializedName("id") - private String mId; - @SerializedName("likeNumber") - private int mLikeNumber; - @SerializedName("location") - private MarkerLocation mLocation; - @SerializedName("musicName") - private String mMusicName; - @SerializedName("shareContentText") - private String mShareContentText; - @SerializedName("type") - private String mType; - @SerializedName("userInfo") - private MarkerUserInfo mUserInfo; + @Expose + private Long id; + @Expose + private Long likeNumber; + @Expose + private MarkerLocation location; + @Expose + private String musicName; + @Expose + private String shareContentText; + @Expose + private String type; + @Expose + private MarkerUserInfo userInfo; - public String getId() { - return mId; + public Long getId() { + return id; } - public void setId(String id) { - mId = id; + public void setId(Long id) { + this.id = id; } - public int getLikeNumber() { - return mLikeNumber; + public Long getLikeNumber() { + return likeNumber; } - public void setLikeNumber(int likeNumber) { - mLikeNumber = likeNumber; + public void setLikeNumber(Long likeNumber) { + this.likeNumber = likeNumber; } public MarkerLocation getLocation() { - return mLocation; + return location; } public void setLocation(MarkerLocation location) { - mLocation = location; + this.location = location; } public String getMusicName() { - return mMusicName; + return musicName; } public void setMusicName(String musicName) { - mMusicName = musicName; + this.musicName = musicName; } public String getShareContentText() { - return mShareContentText; + return shareContentText; } public void setShareContentText(String shareContentText) { - mShareContentText = shareContentText; + this.shareContentText = shareContentText; } public String getType() { - return mType; + return type; } public void setType(String type) { - mType = type; + this.type = type; } public MarkerUserInfo getUserInfo() { - return mUserInfo; + return userInfo; } public void setUserInfo(MarkerUserInfo userInfo) { - mUserInfo = userInfo; + this.userInfo = userInfo; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java index 89274f1187..8907c28a2f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java @@ -1,33 +1,33 @@ package com.mogo.module.service.entity; -import com.google.gson.annotations.SerializedName; +import com.google.gson.annotations.Expose; import java.util.Calendar; @SuppressWarnings("unused") public class MarkerUserInfo { - @SerializedName("age") - private int mAge; - @SerializedName("gender") - private int mGender; - @SerializedName("sn") - private String mSn; - @SerializedName("userHead") - private String mUserHead; - @SerializedName("userId") - private int mUserId; - @SerializedName("userName") - private String mUserName; + @Expose + private int age; + @Expose + private String gender; + @Expose + private String sn; + @Expose + private String userHead; + @Expose + private Long userId; + @Expose + private String userName; public String getAge() { Calendar cal = Calendar.getInstance(); int year = cal.get(Calendar.YEAR); //2020-30=1990 - int age = year - mAge; - String ageStr = "" + age; + int ageDiffer = year - age; + String ageStr = "" + ageDiffer; char[] ageChars = ageStr.toCharArray(); //1990 @@ -72,47 +72,47 @@ public class MarkerUserInfo { } public void setAge(int age) { - mAge = age; + this.age = age; } - public int getGender() { - return mGender; + public String getGender() { + return gender; } - public void setGender(int gender) { - mGender = gender; + public void setGender(String gender) { + this.gender = gender; } public String getSn() { - return mSn; + return sn; } public void setSn(String sn) { - mSn = sn; + this.sn = sn; } public String getUserHead() { - return mUserHead; + return userHead; } public void setUserHead(String userHead) { - mUserHead = userHead; + this.userHead = userHead; } - public int getUserId() { - return mUserId; + public Long getUserId() { + return userId; } - public void setUserId(int userId) { - mUserId = userId; + public void setUserId(Long userId) { + this.userId = userId; } public String getUserName() { - return mUserName; + return userName; } public void setUserName(String userName) { - mUserName = userName; + this.userName = userName; } }