22
33import android .app .Activity ;
44import android .content .Context ;
5+ import android .content .Intent ;
56import android .os .Bundle ;
67import android .os .Handler ;
78import android .util .Log ;
@@ -70,22 +71,25 @@ public void activityFinish() {
7071
7172 @ Override
7273 public void onEasyCancel (String data ) {
73- Log .d ("bootpay" , data );
74- setResult (-1 );
74+ // Log.d("bootpay", data);
75+ // setResult(-1);
76+ setFinishData ("onCancel" , data );
7577 finish ();
7678 }
7779
7880 @ Override
7981 public void onEasyError (String data ) {
80- Log .d ("bootpay" , data );
81- setResult (-2 );
82+ // Log.d("bootpay", data);
83+ // setResult(-2);
84+ setFinishData ("onError" , data );
8285 finish ();
8386 }
8487
8588 @ Override
8689 public void onEasySuccess (String data ) {
87- Log .d ("bootpay" , data );
88- setResult (1 );
90+ // Log.d("bootpay", data);
91+ setFinishData ("onDone" , data );
92+ // setResult(1);
8993 if (CurrentBioRequest .getInstance ().type == CurrentBioRequest .REQUEST_TYPE_ENABLE_DEVICE || CurrentBioRequest .getInstance ().type == CurrentBioRequest .REQUEST_TYPE_VERIFY_PASSWORD ) {
9094 EventSuccessDevice res = new Gson ().fromJson (data , EventSuccessDevice .class );
9195 CurrentBioRequest .getInstance ().token = res .data .token ;
@@ -106,15 +110,15 @@ public void onEasySuccess(String data) {
106110 public void onError (String data ) {
107111// Log.d("bootpay", data);
108112 if (CurrentBioRequest .getInstance ().error != null ) CurrentBioRequest .getInstance ().error .onError (data );
109- setResult (- 2 );
113+ setFinishData ( "onError" , data );
110114 finish ();
111115 }
112116
113117 @ Override
114118 public void onCancel (String data ) {
115119 if (CurrentBioRequest .getInstance ().cancel != null ) CurrentBioRequest .getInstance ().cancel .onCancel (data );
116120// Log.d("bootpay", data);
117- setResult (- 1 );
121+ setFinishData ( "onCancel" , data );
118122 finish ();
119123 }
120124
@@ -128,7 +132,7 @@ public void onClose(String data) {
128132 public void onReady (String data ) {
129133 if (CurrentBioRequest .getInstance ().ready != null ) CurrentBioRequest .getInstance ().ready .onReady (data );
130134// Log.d("bootpay", data);
131- setResult ( 1 );
135+ setFinishData ( "onReady" , data );
132136 finish ();
133137 }
134138
@@ -151,7 +155,15 @@ public void run() {
151155 public void onDone (String data ) {
152156 if (CurrentBioRequest .getInstance ().done != null ) CurrentBioRequest .getInstance ().done .onDone (data );
153157// Log.d("bootpay", data);
154- setResult (1 );
158+ // setResult(9876, data);
159+ setFinishData ("onDone" , data );
155160 finish ();
156161 }
162+
163+ void setFinishData (String method , String message ) {
164+ Intent resultIntent = new Intent ();
165+ resultIntent .putExtra ("method" , method );
166+ resultIntent .putExtra ("message" , message );
167+ setResult (9876 , resultIntent );
168+ }
157169}
0 commit comments