From 2dc7b758e9f89e0a1362f99b1505bca035c352c1 Mon Sep 17 00:00:00 2001 From: snickersun Date: Fri, 2 Jul 2021 23:34:15 +0800 Subject: [PATCH] =?utf8?q?Gator=20=E4=B8=AD=E9=97=B4=E7=89=88=E6=9C=AC=20?= =?utf8?q?=E6=8A=8Avideocall=E7=9B=B8=E5=85=B3=E5=91=BD=E4=BB=A4=EF=BC=8C?= =?utf8?q?=E6=8A=BD=E5=8F=96=E6=94=BE=E5=88=B0protocolAPIHelper=E9=87=8C?= =?utf8?q?=E3=80=82=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C=E5=8D=8F=E8=AE=AE?= =?utf8?q?=E9=97=B4=E7=9A=84=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=E3=80=82?= =?utf8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=E5=8D=8F=E8=AE=AE=E5=8F=AA?= =?utf8?q?=E9=9C=80=E8=A6=81=E8=BF=94=E5=9B=9Enull=EF=BC=8C=E5=B0=B1?= =?utf8?q?=E5=AE=8C=E5=85=A8=E4=B8=8D=E5=BD=B1=E5=93=8D=E8=A7=86=E9=A2=91?= =?utf8?q?=E9=80=9A=E8=AF=9D=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../com/enqualcomm/support/CoreService.java | 44 ++- .../com/ic/protocols/protocolAPIHelper.java | 271 ++++++++++++++++++ 2 files changed, 290 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index ad35906c..9a8a5444 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -69,7 +69,6 @@ import com.ic.fzd.weather.IFZDWeatherCallback; import com.ic.fzd.weather.IFZDWeatherService; import com.ic.jni.ICJniUtils; import com.ic.protocols.protocolAPIHelper; -import com.ic.protocols.protocol_fzd; import com.ic.s123.IS123WeatherCallback; import com.ic.s123.IS123WeatherService; @@ -1527,10 +1526,9 @@ public class CoreService extends Service { stopConnectionRetryTimer(); //连接成功，去获取一次天气 //如果防走丢的协议的话 - if (Config.protocol_no == Config.PROTOCOL_FZD) { - ICLogger.d("getFZDWeatherInfo ... "); - getFZDWeatherInfo(); - } + ICLogger.d("getFZDWeatherInfo ... "); + getFZDWeatherInfo(); + } else { if (retry_connect_count >= retry_connect_max_times) { no_network_Heartbeats_Count++; @@ -1612,13 +1610,8 @@ public class CoreService extends Service { String action = intent.getAction(); if ("com.ic.action.VIDEO_CALL".equals(action)) { try { - if (Config.protocol_no == Config.PROTOCOL_FZD) { - mFZDService.getBRId(); - mFZDService.getContacts(); - } else { - //need user implement for other protocol - - } + mFZDService.getBRId(); + mFZDService.getContacts(); } catch (Exception e) { e.printStackTrace(); } @@ -1700,15 +1693,15 @@ public class CoreService extends Service { @Override public void getContacts() { //获取联系人 - StringMessage cmdmMembers = protocol_fzd.MEMBERS(); - //获取佰锐ID + StringMessage cmdmMembers = protocolAPIHelper.requestVideoCallContact(runtime); + //获取佰锐ID connection.send(cmdmMembers); ICLogger.d("get contacts..."); } @Override public void getBRId() { - StringMessage cmdBREG = protocol_fzd.AGREG(); + StringMessage cmdBREG = protocolAPIHelper.requestVideoCallID(runtime); //获取佰锐ID connection.send(cmdBREG); ICLogger.d("get AGORA id.."); @@ -1718,7 +1711,7 @@ public class CoreService extends Service { @Override public void rejectCallInCome(String remoteId, int type) { //拒绝来电 - StringMessage rejectMsg = protocol_fzd.RCALLING(remoteId, type); + StringMessage rejectMsg = protocolAPIHelper.rejectVideoCall(runtime,remoteId, type); connection.send(rejectMsg); ICLogger.d("reject remote call request..." + remoteId + "..." + type); } @@ -1726,7 +1719,7 @@ public class CoreService extends Service { @Override public void requireCall(int type, int remoteUserId) { //请求与对方通话 - StringMessage talk = protocol_fzd.AGTALK(type, remoteUserId); + StringMessage talk = protocolAPIHelper.dialVideoCall(runtime,type, remoteUserId); connection.send(talk); ICLogger.d("require call == > type is " + type + " remote user id is == > " + remoteUserId); } @@ -1734,16 +1727,16 @@ public class CoreService extends Service { @Override public void test() { //触发测试 - // StringMessage MEMBERS = protocol_fzd.MEMBERS(); + // StringMessage MEMBERS = protocolAPIHelper.requestVideoCallContact(runtime); //Deliver.sendLocationMSG(MEMBERS); } @Override public void setUpEnvState(int state) { - if (protocolAPIHelper.getProtocolfzd_handler() != null) { - ICLogger.d("update bairui env state..." + state); - protocolAPIHelper.getProtocolfzd_handler().updateEnvState(state); - } + + ICLogger.d("update bairui env state..." + state); + protocolAPIHelper.updateEnvState(runtime,state); + } @Override @@ -1752,13 +1745,14 @@ public class CoreService extends Service { //交朋友的话是根据配置去走蓝牙交友 //还是位置交友 //目前先实现位置交友的功能 - protocol_fzd.makeFriendsByPosition(connection, runtime); + StringMessage makeFriends = protocolAPIHelper.makeFriendsByPosition(runtime); + connection.send(makeFriends); } @Override public void unbindFriends(String remoteFriendId) { ICLogger.d("unbindFriends == > " + remoteFriendId); - StringMessage ppr = protocol_fzd.PPR(remoteFriendId); + StringMessage ppr = protocolAPIHelper.unbindFriends(runtime,remoteFriendId); //解除朋友 connection.send(ppr); } @@ -1766,7 +1760,7 @@ public class CoreService extends Service { @Override public void getFriendsList() { ICLogger.d("get friends list..."); - StringMessage ppq = protocol_fzd.PPQ(); + StringMessage ppq = protocolAPIHelper.getFriendsList(runtime); connection.send(ppq); } }; diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 90c6a2c0..52031b81 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -1089,4 +1089,275 @@ public class protocolAPIHelper { return ret; } + /** + * 获取VideoCall 联系人列表 + * @param runtime + * @return + */ + public static StringMessage requestVideoCallContact(Runtime runtime) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.MEMBERS(); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + + /** + * 获取VideoCall ID + * @param runtime + * @return + */ + public static StringMessage requestVideoCallID(Runtime runtime) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.AGREG(); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + + /** + * 拒接VideoCall + * @param runtime + * @param remoteId + * @param type + * @return + */ + public static StringMessage rejectVideoCall(Runtime runtime,String remoteId, int type) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.RCALLING(remoteId, type); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + public static StringMessage dialVideoCall(Runtime runtime,int type, int remoteUserId) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.AGTALK(type, remoteUserId); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + + public static StringMessage makeFriendsByPosition(Runtime runtime) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.PP(runtime); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + + public static StringMessage unbindFriends(Runtime runtime, String remoteFriendId) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.PPR(remoteFriendId); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + + public static StringMessage getFriendsList(Runtime runtime) { + if (is_protocol_not_Initialled()) return null; + StringMessage ret = null; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + ret = null; + break; + case Config.PROTOCOL_BEEHOME: + ret = null; + break; + case Config.PROTOCOL_IC: + ret = null; + break; + case Config.PROTOCOL_FZD: + ret = protocolfzd_handler.PPQ(); + break; + case Config.PROTOCOL_MQTT: + ret = null; + break; + case PROTOCOL_ANAN: + ret = null; + break; + case Config.PROTOCOL_S123: + ret = null; + break; + case Config.PROTOCOL_GATOR: + ret = null; + break; + } + return ret; + } + + public static void updateEnvState(Runtime runtime, int state) { + if (is_protocol_not_Initialled()) return ; + + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + + break; + case Config.PROTOCOL_BEEHOME: + + break; + case Config.PROTOCOL_IC: + + break; + case Config.PROTOCOL_FZD: + protocolfzd_handler.updateEnvState(state); + break; + case Config.PROTOCOL_MQTT: + + break; + case PROTOCOL_ANAN: + + break; + case Config.PROTOCOL_S123: + + break; + case Config.PROTOCOL_GATOR: + + break; + } + + } } -- 2.17.1