From ea89428fa096b7ed6a96209be7ca24f2a6642984 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 20 Feb 2020 18:06:27 +0800 Subject: [PATCH] replace push sdk --- config.gradle | 2 +- .../connection/socket/IMessageResponse.java | 17 +++++++++++++++++ .../mogo/connection/socket/SocketManager.java | 10 +++++++--- .../module_main_card_cover_up_bottom.png | Bin 918 -> 1439 bytes 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 foudations/mogo-connection/src/main/java/com/mogo/connection/socket/IMessageResponse.java diff --git a/config.gradle b/config.gradle index cf46b9673d..576e8d43c0 100644 --- a/config.gradle +++ b/config.gradle @@ -112,7 +112,7 @@ ext { //统一返回键 mogomoduleback : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}", // 长链 - socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0', + socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.1', socketsdkconnsvrprotoco : 'com.zhidao.ptech:connsvr-protoco:0.1.23', socketsdkprotobufjava : 'com.google.protobuf:protobuf-java:3.5.1', diff --git a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/IMessageResponse.java b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/IMessageResponse.java new file mode 100644 index 0000000000..58dad71fea --- /dev/null +++ b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/IMessageResponse.java @@ -0,0 +1,17 @@ +package com.mogo.connection.socket; + +/** + * @author congtaowang + * @since 2020-02-20 + *

+ * 长链接口数据接口 + */ +public interface IMessageResponse { + + /** + * 设置消息id + * + * @param msgId + */ + void setMsgId( long msgId ); +} diff --git a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java index 6aad984e2c..dc9cda6d68 100644 --- a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java +++ b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/SocketManager.java @@ -82,7 +82,7 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac } @Override - public void onMessageReceived( byte[] content ) { + public void onMessageReceived( byte[] content, long msgId ) { try { MogoConnsvr.Payload payload = MogoConnsvr.Payload.parseFrom( content ); int msgType = payload.getMsgType(); @@ -93,8 +93,12 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac while ( iterator.hasNext() ) { IMogoOnMessageListener listener = iterator.next(); if ( listener != null ) { - Logger.d(TAG, "received msg ==" + payload.getPayload().toStringUtf8()); - listener.onMsgReceived( GsonUtil.objectFromJson( payload.getPayload().toStringUtf8(), listener.target() ) ); + Object obj = GsonUtil.objectFromJson( payload.getPayload().toStringUtf8(), listener.target() ); + if ( obj instanceof IMessageResponse ) { + ( ( IMessageResponse ) obj ).setMsgId( msgId ); + } + Logger.d(TAG, "received msg == %s, msgId = %s", payload.getPayload().toStringUtf8(), msgId); + listener.onMsgReceived( obj ); } } } diff --git a/modules/mogo-module-main/src/main/res/drawable/module_main_card_cover_up_bottom.png b/modules/mogo-module-main/src/main/res/drawable/module_main_card_cover_up_bottom.png index e90b7ffae8addfbd83ecc2ab0a129ea030af859f..09b0022e6d2370896256a51efada8bec14104ce5 100644 GIT binary patch literal 1439 zcmYLJc~sI_6h_NEg)uB8w=|To)K)94RMatC!4;hxx3Ux+8*@Y_TvDs!77qQ)Edec# zMV8`-lw0b|X*+Ln@&-RJJHx@N-8)9t;`IK_Dt27+2?jRHcP+?{kJ{413;{^VRbh z-@)RekF94P#%X!~nvX@L;tI?ra-#@72;CY0jZ;>##<`%Ew~^)obJ6e`te#a@1)9AU z1TgdF@{3Tsjx%Tfky7Um6khK$rVNN2rDFBO_85@AvF zJ-5A1=h&D8)>SvasrEmw)K|5p&=!P(jbvC$N4Li8*P`qgPP%&r2c=0+GL;#E`buU$-6mO-wccI_@??snxpX%!nY@PkKhPXoFl}P{F(_T~ta`g6tCFipfnu0z*C<*ZzpTDK zd>N_2kj7tyLdPf5XTr#AV)AN$RY^jmK7ZRRm;_gR?o_621ex~{#I#&#OTEoC|^%Z7{m%04wyS&n}Uv zP_gTLT2j)=B_Uf#Gw)lComAWTVbBiz5ZSl%R-Z^UX5FoBn6|GISrWn*NZ3XjBB?nD zEZMuoR?zBAl%&TgYN8t`H)H+TZ-uCbH=Z8p5QX%pnTHdEi4_(&tRJox>d9}0dLaHv zv`=(n6*omh=FywbS9BDH^Y6^&W)EhzcO4?B_w!C1+&GchA{zGu`8t<(>SZ>FMnxZ) z>0rg~g3GrJv^-mbuRY6AbOm4u>tS^W!kcP<_B&6Hym_B6%BL(!^pK9TY9#%Yt?TJV zr3sSvTme@Is4#-LItY0;WjSr#Jny#fZENAg;kW=2Z+IU+WjJH{S@hY1TihyGcUITd zs+vm}lKdyLE(*KYg?4U>8}jw?nm;w&w$TarTo1>2sJ$r)^c^rM8|Tnq`pr<%9?*S< zTwNH-vy&R54GIbU)bcOBjVmyyZIMIZo-wSX$$g7E8ij=ey3BvHO#q#)P3b+Segd=kHV=<;&lR zp|P4u9~D4URaL2t$j0D=LYfXrxdtjHhS0dlDY+eaaU`W}*m=iM-U$7rw9aiK7(}3-d-H`Ti_>^Ti=9hwAb;JWfK>I Mar1F~fR4!i7pb3h5C8xG literal 918 zcmeAS@N?(olHy`uVBq!ia0y~yVDbX8WjNS?MUU zvaOGm^>1zQ|2%KsRG7`KmFso;zDSFOLqNfyfq{`}I@9H~H|%%YY;yjYYq9WJ{KuaZLO>bsgIj6DoWZsox3#j87 zdBslXOqrPxr`HsuvRu9}P5o8Q#V1ptmTm}Sn%P)3%g1E@$HMR5l9#?SFMJn#V zWS9eFMNiCJ!sB^=+WYtO7fk6DoHp;sv*at{m2040XL+~5q0Ya$yi#rD-s|@kTrqP? zsFMFJzsN54{7oT9=&-!&aM0`DBF?B;f8|VD?uG0zU^3tw;VdA!;N_=_O_uD&roS{y02u~1u_&odj zlhQu@y02w({jA>qy=+Iy?IcKO9(XG_!%T9?i;iygrD-L{UENn2 z!@?=6QS0VnuYfL>>A~@G8+QLW$P__~{7vpN?@g;(DKur)KmO#`jJv&WlyQQ? zukjJnOjD!c5Y4N=*x7yG@KLkY;%l0)M50)5A*D}C?rQjjzNx$9kDZ8jU0b(S%gIU= z661M`9L}kvdi;tkE@*C<&f)$2v09wl-F215ztkWK%$yYVv)4uxtE~)`QPJ2c-hJSU z#kcvcUmfm>9i0a8?T%FrdiEtUj4OXsdH$C^u)uMptP9JsIgzI>d{M}1TlQz&m8fGv z*Fz!cxN)}ng#S^e)3>KuoD$vcudKlPulv{jO)^FEB3HHs0y7$er>mdKI;Vst0M?3P AdjJ3c