Download as
Browse Code »

Commit 9761d377914e0303c14f2dc6b4424ae7af41d1e2

Authored by perry.werneck@gmail.com
1 parent 3dbcb212
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Implementando mais elementos da UI android

Showing 3 changed files with 44 additions and 24 deletions   Show diff stats
android/res/raw/jsmain.js
  Diff comments   View file @9761d37
@@ -26,12 +26,23 @@ function setupWindow() @@ -26,12 +26,23 @@ function setupWindow()
26 } 26 }
27 27
28 } 28 }
29 - 29 +
30 } 30 }
31 31
32 function terminalUpdate() 32 function terminalUpdate()
33 { 33 {
34 - document.getElementById("terminal").innerHTML = pw3270.getscreencontents(); 34 + if(pw3270.isConnected())
  35 + {
  36 + document.getElementById("terminal").innerHTML = pw3270.getscreencontents();
  37 + document.getElementById("pfbar").style.visible = "visible";
  38 + document.getElementById("terminal").style.visible = "visible";
  39 + }
  40 + else
  41 + {
  42 + document.getElementById("pfbar").style.visible = "hidden";
  43 + document.getElementById("terminal").style.visible = "hidden";
  44 + }
  45 +
35 setupWindow(); 46 setupWindow();
36 pw3270.ready(); 47 pw3270.ready();
37 } 48 }
android/src/br/com/bb/pw3270/PW3270Activity.java
  Diff comments   View file @9761d37
@@ -63,7 +63,7 @@ public class PW3270Activity extends Activity @@ -63,7 +63,7 @@ public class PW3270Activity extends Activity
63 63
64 protected void updateScreen() 64 protected void updateScreen()
65 { 65 {
66 - showProgressDialog("Aguarde..."); 66 + // showProgressDialog("Aguarde...");
67 view.reload(); 67 view.reload();
68 } 68 }
69 69
android/src/br/com/bb/pw3270/lib3270.java
  Diff comments   View file @9761d37
@@ -96,8 +96,7 @@ public class lib3270 @@ -96,8 +96,7 @@ public class lib3270
96 break; 96 break;
97 97
98 case 6: // recv_data 98 case 6: // recv_data
99 - procRecvdata(((byteMessage) msg.obj).getMessage(),  
100 - ((byteMessage) msg.obj).getLength()); 99 + procRecvdata(((byteMessage) msg.obj).getMessage(),((byteMessage) msg.obj).getLength());
101 break; 100 break;
102 101
103 case 7: // ready 102 case 7: // ready
@@ -188,7 +187,8 @@ public class lib3270 @@ -188,7 +187,8 @@ public class lib3270
188 { 187 {
189 Log.i(TAG, "Bytes a enviar: " + len); 188 Log.i(TAG, "Bytes a enviar: " + len);
190 189
191 - try { 190 + try
  191 + {
192 outData.write(data, 0, len); 192 outData.write(data, 0, len);
193 outData.flush(); 193 outData.flush();
194 return len; 194 return len;
@@ -224,18 +224,21 @@ public class lib3270 @@ -224,18 +224,21 @@ public class lib3270
224 224
225 postMessage(1, 14, 0); 225 postMessage(1, 14, 0);
226 226
227 - if (ssl) { 227 + if (ssl)
  228 + {
228 // Host é SSL 229 // Host é SSL
229 socketFactory = SSLSocketFactory.getDefault(); 230 socketFactory = SSLSocketFactory.getDefault();
230 - } else { 231 + }
  232 + else
  233 + {
231 socketFactory = SocketFactory.getDefault(); 234 socketFactory = SocketFactory.getDefault();
232 } 235 }
233 236
234 - try { 237 + try
  238 + {
235 sock = socketFactory.createSocket(hostname, port); 239 sock = socketFactory.createSocket(hostname, port);
236 outData = new DataOutputStream(sock.getOutputStream()); 240 outData = new DataOutputStream(sock.getOutputStream());
237 inData = new DataInputStream(sock.getInputStream()); 241 inData = new DataInputStream(sock.getInputStream());
238 -  
239 } 242 }
240 catch (Exception e) 243 catch (Exception e)
241 { 244 {
@@ -276,20 +279,24 @@ public class lib3270 @@ -276,20 +279,24 @@ public class lib3270
276 byte[] in = new byte[4096]; 279 byte[] in = new byte[4096];
277 int sz = -1; 280 int sz = -1;
278 281
279 - try { 282 + try
  283 + {
280 sz = inData.read(in, 0, 4096); 284 sz = inData.read(in, 0, 4096);
281 - } catch (Exception e) {  
282 - sz = -1;  
283 - }  
284 285
285 - if (sz < 0) { 286 + Log.i(TAG, Integer.toString(sz) + " bytes recebidos");
  287 +
  288 + if (sz > 0)
  289 + {
  290 + Message msg = mHandler.obtainMessage();
  291 + msg.what = 6;
  292 + msg.obj = new byteMessage(in, sz);
  293 + mHandler.sendMessage(msg);
  294 + }
  295 +
  296 + } catch (Exception e)
  297 + {
  298 + Log.i(TAG, "Erro ao receber dados do host: " + e.getLocalizedMessage());
286 connected = false; 299 connected = false;
287 - } else if (sz > 0) {  
288 - Message msg = mHandler.obtainMessage();  
289 - msg.what = 6;  
290 - msg.obj = new byteMessage(in, sz);  
291 -  
292 - mHandler.sendMessage(msg);  
293 } 300 }
294 } 301 }
295 } 302 }
@@ -363,18 +370,19 @@ public class lib3270 @@ -363,18 +370,19 @@ public class lib3270
363 if(screenState != 0) 370 if(screenState != 0)
364 { 371 {
365 screenState = 0; 372 screenState = 0;
  373 + Log.v(TAG, "Status changed to NONE");
366 updateScreen(); 374 updateScreen();
367 } 375 }
368 break; 376 break;
369 377
370 case 4: // LIB3270_MESSAGE_DISCONNECTED 378 case 4: // LIB3270_MESSAGE_DISCONNECTED
371 - Log.v(TAG, "Disconnected"); 379 + Log.v(TAG, "Status changed to disconnected");
372 connected = false; 380 connected = false;
373 erase(); 381 erase();
374 break; 382 break;
375 383
376 case 3: // LIB3270_MESSAGE_CONNECTED 384 case 3: // LIB3270_MESSAGE_CONNECTED
377 - Log.v(TAG, "Connected"); 385 + Log.v(TAG, "Status changed to connected");
378 break; 386 break;
379 387
380 // 01 LIB3270_MESSAGE_SYSWAIT 388 // 01 LIB3270_MESSAGE_SYSWAIT
@@ -522,7 +530,8 @@ public class lib3270 @@ -522,7 +530,8 @@ public class lib3270
522 public native boolean isTerminalReady(); 530 public native boolean isTerminalReady();
523 531
524 // Timers 532 // Timers
525 - protected void newTimer(long id, int msec) { 533 + protected void newTimer(long id, int msec)
  534 + {
526 new timer(this, id, msec); 535 new timer(this, id, msec);
527 } 536 }
528 537