fix

highras · Jun 8, 2018 · f334edf · f334edf
1 parent 1a2e2d5
commit f334edf
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 64 deletions.
diff --git a/fpnn-lib/src/main/java/com/fpnn/FPClient.java b/fpnn-lib/src/main/java/com/fpnn/FPClient.java
@@ -14,11 +14,6 @@
 
 public class FPClient {
 
-    public interface IAnswer {
-
-        void sendAnswer(Object payload, boolean exception);
-    }
-
     public interface IKeyData {
 
         FPData getKeyData(FPEncryptor encryptor);
@@ -412,7 +407,7 @@ private void pushService(FPData quest) {
 
         final FPClient self = this;
         final FPData fQuest = quest;
-        this._psr.service(quest, new IAnswer() {
+        this._psr.service(quest, new FPProcessor.IAnswer() {
 
             @Override
             public void sendAnswer(Object payload, boolean exception) {

diff --git a/fpnn-lib/src/main/java/com/fpnn/FPProcessor.java b/fpnn-lib/src/main/java/com/fpnn/FPProcessor.java
@@ -5,9 +5,14 @@
 
 public class FPProcessor {
 
+    public interface IAnswer {
+
+        void sendAnswer(Object payload, boolean exception);
+    }
+
     public interface IProcessor {
 
-        void service(FPData data, FPClient.IAnswer answer);
+        void service(FPData data, IAnswer answer);
 
         void onSecond(long timestamp);
     }
@@ -30,7 +35,7 @@ public void setProcessor(IProcessor processor) {
         this._processor = processor;
     }
 
-    public void service(FPData data, FPClient.IAnswer answer) {
+    public void service(FPData data, IAnswer answer) {
 
         if (this._processor == null) {
 
@@ -39,7 +44,7 @@ public void service(FPData data, FPClient.IAnswer answer) {
             this._processor = new IProcessor() {
 
                 @Override
-                public void service(FPData data, FPClient.IAnswer answer) {
+                public void service(FPData data, IAnswer answer) {
 
                     if (data.getFlag() == 0) {
 

diff --git a/fpnn-lib/src/main/java/com/fpnn/callback/FPCallback.java b/fpnn-lib/src/main/java/com/fpnn/callback/FPCallback.java
@@ -27,7 +27,7 @@ public void addCallback(String key, FPCallback.ICallback callback, int timeout)
         synchronized (this._exMap) {
 
             int ts = timeout <= 0 ? FPConfig.SEND_TIMEOUT : timeout;
-            long expire = ts + Calendar.getInstance().getTimeInMillis();
+            long expire = ts + System.currentTimeMillis();
             this._exMap.put(key, expire);
         }
     }

diff --git a/test-app/.idea/workspace.xml b/test-app/.idea/workspace.xml
diff --git a/test-main/.idea/workspace.xml b/test-main/.idea/workspace.xml
diff --git a/test-main/out/production/main/com/fpnn/FPClient$1.class b/test-main/out/production/main/com/fpnn/FPClient$1.class
diff --git a/test-main/out/production/main/com/fpnn/FPClient$2.class b/test-main/out/production/main/com/fpnn/FPClient$2.class
diff --git a/test-main/out/production/main/com/fpnn/FPClient$3.class b/test-main/out/production/main/com/fpnn/FPClient$3.class
diff --git a/test-main/out/production/main/com/fpnn/FPClient$4.class b/test-main/out/production/main/com/fpnn/FPClient$4.class
diff --git a/test-main/out/production/main/com/fpnn/FPClient$5.class b/test-main/out/production/main/com/fpnn/FPClient$5.class
diff --git a/test-main/out/production/main/com/fpnn/FPClient$IAnswer.class b/test-main/out/production/main/com/fpnn/FPClient$IAnswer.class
diff --git a/test-main/out/production/main/com/fpnn/FPClient.class b/test-main/out/production/main/com/fpnn/FPClient.class
diff --git a/test-main/out/production/main/com/fpnn/FPProcessor$1.class b/test-main/out/production/main/com/fpnn/FPProcessor$1.class
diff --git a/test-main/out/production/main/com/fpnn/FPProcessor$IAnswer.class b/test-main/out/production/main/com/fpnn/FPProcessor$IAnswer.class
diff --git a/test-main/out/production/main/com/fpnn/FPProcessor$IProcessor.class b/test-main/out/production/main/com/fpnn/FPProcessor$IProcessor.class
diff --git a/test-main/out/production/main/com/fpnn/FPProcessor.class b/test-main/out/production/main/com/fpnn/FPProcessor.class
diff --git a/test-main/out/production/main/com/fpnn/SyncCallbak.class b/test-main/out/production/main/com/fpnn/SyncCallbak.class
diff --git a/test-main/out/production/main/com/fpnn/callback/FPCallback.class b/test-main/out/production/main/com/fpnn/callback/FPCallback.class