Skip to content

Commit 8c762b9

Browse files
author
simon
committed
-minor refactor
-now read/write operation are allowed while browsing
1 parent bba30e7 commit 8c762b9

40 files changed

Lines changed: 853 additions & 560 deletions

app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion 28
55
defaultConfig {
66
applicationId "org.twistedappdeveloper.opcclient"
7-
minSdkVersion 15
8-
targetSdkVersion 27
9-
versionCode 10
10-
versionName "1.0.7.1"
7+
minSdkVersion 17
8+
targetSdkVersion 28
9+
versionCode 11
10+
versionName "1.0.7.2"
1111
multiDexEnabled true
1212
}
1313
buildTypes {
@@ -40,6 +40,7 @@ dependencies {
4040
implementation files('libs/httpcore-nio-4.4.4.jar')
4141
implementation files('libs/httpclient-4.5.2.jar')
4242
implementation files('libs/opc.jar')
43-
implementation 'com.android.support:appcompat-v7:27.1.1'
44-
implementation 'com.android.support.constraint:constraint-layout:1.1.1'
43+
implementation 'com.android.support:appcompat-v7:28.0.0'
44+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
45+
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.17'
4546
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
android:name=".SessionActivity"
2727
android:screenOrientation="portrait" />
2828
<activity
29-
android:name=".SelectSession_Activity"
29+
android:name=".SelectSessionActivity"
3030
android:screenOrientation="portrait" />
3131
<activity
3232
android:name=".ListSubscriptionActivity"

app/src/main/java/OpcUtils/BackListener.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
public class BackListener implements FragmentManager.OnBackStackChangedListener {
77

8-
int prec_size;
9-
FragmentManager fm;
8+
private int prec_size;
9+
private FragmentManager fm;
1010

1111
public BackListener(FragmentManager fm) {
1212
this.fm = fm;
13-
prec_size=0;
13+
prec_size = 0;
1414
}
1515

1616
@Override
1717
public void onBackStackChanged() {
18-
if(fm.getBackStackEntryCount()<prec_size)
18+
if (fm.getBackStackEntryCount() < prec_size)
1919
ManagerOPC.getIstance().pop();
20-
prec_size=fm.getBackStackEntryCount();
20+
prec_size = fm.getBackStackEntryCount();
2121
}
2222
}

app/src/main/java/OpcUtils/ConnectionThread/ThreadBrowse.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,41 @@
1010

1111
public class ThreadBrowse extends Thread {
1212

13-
Handler handler;
14-
int session_position;
15-
int position;
16-
boolean sent=false;
17-
18-
public ThreadBrowse(int session_position,int position){
19-
this.session_position=session_position;
20-
this.position=position;
13+
private Handler handler;
14+
private int session_position;
15+
private int position;
16+
private boolean sent = false;
17+
18+
public ThreadBrowse(int session_position, int position) {
19+
this.session_position = session_position;
20+
this.position = position;
2121
}
2222

23-
private synchronized void send(Message msg){
24-
if(!sent) {
23+
private synchronized void send(Message msg) {
24+
if (!sent) {
2525
msg.sendToTarget();
26-
sent =true;
26+
sent = true;
2727
}
2828
}
2929

3030
public void start(Handler handler) {
3131
super.start();
32-
this.handler=handler;
32+
this.handler = handler;
3333
}
3434

3535
@Override
3636
public void run() {
3737
super.run();
3838
try {
39-
Thread t= new Thread(new Runnable() {
39+
Thread t = new Thread(new Runnable() {
4040
@Override
4141
public void run() {
4242
try {
4343
BrowseResponse res;
44-
res=ManagerOPC.getIstance().Browse(position,session_position);
45-
send(handler.obtainMessage(0,res));
44+
res = ManagerOPC.getIstance().browseOperation(position, session_position);
45+
send(handler.obtainMessage(0, res));
4646
} catch (ServiceResultException e) {
47-
send(handler.obtainMessage(-1,e.getStatusCode()));
47+
send(handler.obtainMessage(-1, e.getStatusCode()));
4848
}
4949
}
5050
});

app/src/main/java/OpcUtils/ConnectionThread/ThreadCreateMonitoredItem.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
public class ThreadCreateMonitoredItem extends Thread {
1313

14-
Handler handler;
15-
SubscriptionElement subElement;
16-
CreateMonitoredItemsRequest request;
17-
int position =-1;
18-
boolean sent =false;
14+
private Handler handler;
15+
private SubscriptionElement subElement;
16+
private CreateMonitoredItemsRequest request;
17+
private int position =-1;
18+
private boolean sent =false;
1919

2020
public ThreadCreateMonitoredItem(SubscriptionElement subElement, CreateMonitoredItemsRequest request){
2121
this.subElement=subElement;

app/src/main/java/OpcUtils/ConnectionThread/ThreadCreateSession.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
public class ThreadCreateSession extends Thread {
1212

13-
Handler handler;
14-
ManagerOPC gestore;
15-
EndpointDescription endpointDescription;
16-
String url;
17-
int position =-1;
18-
boolean sent =false;
13+
private Handler handler;
14+
private ManagerOPC gestore;
15+
private EndpointDescription endpointDescription;
16+
private String url;
17+
private int position =-1;
18+
private boolean sent =false;
1919

2020
public ThreadCreateSession(ManagerOPC gestore, String url, EndpointDescription endpointDescription){
2121
this.gestore=gestore;

app/src/main/java/OpcUtils/ConnectionThread/ThreadCreateSubscription.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
public class ThreadCreateSubscription extends Thread {
1212

13-
Handler handler;
14-
SessionElement session;
15-
CreateSubscriptionRequest request;
16-
int position =-1;
17-
boolean sent =false;
13+
private Handler handler;
14+
private SessionElement session;
15+
private CreateSubscriptionRequest request;
16+
private int position =-1;
17+
private boolean sent =false;
1818

1919
public ThreadCreateSubscription(SessionElement session, CreateSubscriptionRequest request){
2020
this.session=session;

app/src/main/java/OpcUtils/ConnectionThread/ThreadDeleteSubscription.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
public class ThreadDeleteSubscription extends Thread {
1111

12-
Handler handler;
13-
SessionChannel session;
14-
UnsignedInteger subid;
15-
boolean sent =false;
12+
private Handler handler;
13+
private SessionChannel session;
14+
private UnsignedInteger subid;
15+
private boolean sent =false;
1616

1717
public ThreadDeleteSubscription(SessionChannel session, UnsignedInteger subid){
1818
this.session=session;

app/src/main/java/OpcUtils/ConnectionThread/ThreadDiscoveryEndpoints.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
public class ThreadDiscoveryEndpoints extends Thread {
1111

12-
Handler handler;
13-
String url;
14-
Client client;
15-
boolean sent =false;
12+
private Handler handler;
13+
private String url;
14+
private Client client;
15+
private boolean sent =false;
1616
public ThreadDiscoveryEndpoints(Client client, String url){
1717
this.url=url;
1818
this.client=client;

app/src/main/java/OpcUtils/ConnectionThread/ThreadPublish.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
public class ThreadPublish extends Thread {
1616

17-
SessionElement sessionElement;
17+
private SessionElement sessionElement;
1818
public ThreadPublish(SessionElement sessionElement) {
1919
this.sessionElement = sessionElement;
2020
}

0 commit comments

Comments
 (0)