From 48a6c430aa3d5f297719cd3af05c1849994934c7 Mon Sep 17 00:00:00 2001 From: GME Date: Sat, 25 May 2019 16:12:10 +0200 Subject: [PATCH] update app demo --- .../mobile/demoConfig/DemoConfig.java | 25 +++- .../mobile/homepage/LoginActivity.java | 1 + .../java/monnethic/mobile/restApi/Config.java | 108 ++++++++++++------ .../main/res/layout/activity_demo_config.xml | 53 +++++++++ 4 files changed, 151 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/monnethic/mobile/demoConfig/DemoConfig.java b/app/src/main/java/monnethic/mobile/demoConfig/DemoConfig.java index dc7e405..d3d37f2 100644 --- a/app/src/main/java/monnethic/mobile/demoConfig/DemoConfig.java +++ b/app/src/main/java/monnethic/mobile/demoConfig/DemoConfig.java @@ -18,15 +18,18 @@ import java.util.ArrayList; import java.util.List; import monnethic.mobile.history.HistoryActivity; +import monnethic.mobile.restApi.Config; import monnethic.mobile.restApi.ConfigApiHandler; public class DemoConfig extends AppCompatActivity { private Spinner cSpinner; private Switch cSwitch; + private Switch apiSwitch; private Button btnValidateConf; private Button btnCloseConf; private Button btnCheckConf; private String ENV; + private String API; private String CHAINCODE; @Override @@ -39,11 +42,12 @@ public class DemoConfig extends AppCompatActivity { private void initView(){ buttonInit(); - switchInit(); + switchEnvInit(); + switchApiInit(); spinnerInit(); } - public void switchInit(){ + public void switchEnvInit(){ cSwitch = findViewById(R.id.switchEnv); cSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override @@ -57,6 +61,20 @@ public class DemoConfig extends AppCompatActivity { }); } + public void switchApiInit(){ + apiSwitch = findViewById(R.id.switchApi); + apiSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean b) { + if(apiSwitch.isChecked()){ + API = "1"; + }else{ + API = "0"; + } + } + }); + } + public void spinnerInit(){ cSpinner = findViewById(R.id.spinnerConfig); List listOptions = new ArrayList<>(); @@ -126,6 +144,7 @@ public class DemoConfig extends AppCompatActivity { ConfigApiHandler configApiHandler = new ConfigApiHandler(); configApiHandler.updateEnvironment(e); configApiHandler.updateChaincode(c); + Config.setAPI(API); }catch (Exception e){ e.printStackTrace(); } @@ -165,7 +184,7 @@ public class DemoConfig extends AppCompatActivity { @Override protected void onPostExecute(String result) { progDailog.dismiss(); - Toast.makeText(DemoConfig.this, result,Toast.LENGTH_SHORT).show(); + Toast.makeText(DemoConfig.this, result+" - "+Config.getAPI(),Toast.LENGTH_SHORT).show(); } } } diff --git a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java index 7dd1d03..e27a866 100644 --- a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java @@ -94,6 +94,7 @@ public class LoginActivity extends AppCompatActivity { walletHomeIntent.putExtra("USER_HASH", jsonObject.getString("user_hash")); walletHomeIntent.putExtra("USER_PWD",password.getText().toString()); walletHomeIntent.putExtra("SESSION_ID",jsonObject.getString("session_id")); + walletHomeIntent.putExtra("email",email.getText().toString()); LoginActivity.this.startActivity(walletHomeIntent); finish(); } else { diff --git a/app/src/main/java/monnethic/mobile/restApi/Config.java b/app/src/main/java/monnethic/mobile/restApi/Config.java index efba9d9..ceabc15 100644 --- a/app/src/main/java/monnethic/mobile/restApi/Config.java +++ b/app/src/main/java/monnethic/mobile/restApi/Config.java @@ -1,49 +1,91 @@ package monnethic.mobile.restApi; public class Config { - //BASE - static private String BASE_URL = "http://37.187.101.44:10053/"; - //static private String BASE_URL = "http://10.0.2.2:10053/"; - //static private String BASE_URL = "http://localhost:10053/"; - static private String BASE_URL_USER = BASE_URL+"api/rest/user/"; - static private String BASE_URL_TRANSACTION = BASE_URL+"api/rest/transaction/"; - static private String BASE_URL_WALLET = BASE_URL+"api/rest/wallet/"; - static private String BASE_URL_SESSION = BASE_URL+"api/rest/session/"; + static private int API = 0; + + /* + static private String getBaseURl(){ + if(API==0){ + return "http://5.39.76.139:10053/"; + } else { + return "http://37.187.101.44:10053/"; + } + } + */ + + static private String getBaseUrlUser(){ + if(API==0){ + return "http://5.39.76.139:10053/api/rest/user/"; + } else { + return "http://37.187.101.44:10053/api/rest/user/"; + } + } + static private String getBaseUrlTransaction(){ + if(API==0){ + return "http://5.39.76.139:10053/api/rest/transaction/"; + } else { + return "http://37.187.101.44:10053/api/rest/transaction/"; + } + } + static private String getBaseUrlWallet(){ + if(API==0){ + return "http://5.39.76.139:10053/api/rest/wallet/"; + } else { + return "http://37.187.101.44:10053/api/rest/wallet/"; + } + } + static private String getBaseUrlSession(){ + if(API==0){ + return "http://5.39.76.139:10053/api/rest/session/"; + } else { + return "http://37.187.101.44:10053/api/rest/session/"; + } + } + static private String getConfigBaseUrl(){ + if(API==0){ + return "http://5.39.76.139:10053/api/rest/demo/conf"; + } else { + return "http://37.187.101.44:10053/api/rest/demo/conf"; + } + } + //USER - static public String USER_LOGIN = BASE_URL_USER+"login"; - static public String USER_REGISTER = BASE_URL_USER+"register"; - static public String USER_GET = BASE_URL_USER+"get"; - static public String USER_APPROVAL = BASE_URL_USER+"getApproval"; - static public String USER_APPROVE = BASE_URL_USER+"approve"; + static public String USER_LOGIN = getBaseUrlUser()+"login"; + static public String USER_REGISTER = getBaseUrlUser()+"register"; + static public String USER_GET = getBaseUrlUser()+"get"; + static public String USER_APPROVAL = getBaseUrlUser()+"getApproval"; + static public String USER_APPROVE = getBaseUrlUser()+"approve"; //Search - static public String FIND_BY_EMAIL= BASE_URL_USER+"findByEmail"; - static public String FIND_BY_PHONE = BASE_URL_USER+"findByPhone"; - static public String FIND_BY_EMAIL_AND_PHONE = BASE_URL_USER+"findByEmailAndPhone"; + static public String FIND_BY_EMAIL= getBaseUrlUser()+"findByEmail"; + static public String FIND_BY_PHONE = getBaseUrlUser()+"findByPhone"; + static public String FIND_BY_EMAIL_AND_PHONE = getBaseUrlUser()+"findByEmailAndPhone"; //Session - static public String START_SESSION = BASE_URL_SESSION+"start"; - static public String END_SESSION = BASE_URL_SESSION+"end"; + static public String START_SESSION = getBaseUrlSession()+"start"; + static public String END_SESSION = getBaseUrlSession()+"end"; //Config - static private String CONFIG_BASE_URL = BASE_URL+"/api/rest/demo/conf"; - static public String CONFIG_ENVIRONMENT = CONFIG_BASE_URL+"/env"; - static public String CONFIG_CHAINCODE = CONFIG_BASE_URL+"/chaincode"; - static public String CONFIG_DB = CONFIG_BASE_URL+"/db"; + + static public String CONFIG_ENVIRONMENT = getConfigBaseUrl()+"/env"; + static public String CONFIG_CHAINCODE = getConfigBaseUrl()+"/chaincode"; + static public String CONFIG_DB = getConfigBaseUrl()+"/db"; //TRANSACTION - static public String TRANSACTION_SEND = BASE_URL_TRANSACTION+"send"; - static public String TRANSACTION_GET = BASE_URL_TRANSACTION+"get"; - static public String TRANSACTION_LATEST = BASE_URL_TRANSACTION+"get/latest"; - static public String TRANSACTION_ALL = BASE_URL_TRANSACTION+"getTransactions"; - static public String TRANSACTION_SENT = BASE_URL_TRANSACTION+"get/sent"; - static public String TRANSACTION_RECEIVED = BASE_URL_TRANSACTION+"get/received"; + static public String TRANSACTION_SEND = getBaseUrlTransaction()+"send"; + static public String TRANSACTION_GET = getBaseUrlTransaction()+"get"; + static public String TRANSACTION_LATEST = getBaseUrlTransaction()+"get/latest"; + static public String TRANSACTION_ALL = getBaseUrlTransaction()+"getTransactions"; + static public String TRANSACTION_SENT = getBaseUrlTransaction()+"get/sent"; + static public String TRANSACTION_RECEIVED = getBaseUrlTransaction()+"get/received"; //WALLET - static public String WALLET_CREATE = BASE_URL_WALLET+"create"; - static public String WALLET_GET_WALLET = BASE_URL_WALLET+"getWallet"; - static public String WALLET_GET_USER_WALLETS = BASE_URL_WALLET+"getUserWallets"; - static public String WALLET_DELETE = BASE_URL_WALLET+"delete"; - static public String WALLET_TRANSFER = BASE_URL_WALLET+"transfer"; + static public String WALLET_CREATE = getBaseUrlWallet()+"create"; + static public String WALLET_GET_WALLET = getBaseUrlWallet()+"getWallet"; + static public String WALLET_GET_USER_WALLETS = getBaseUrlWallet()+"getUserWallets"; + static public String WALLET_DELETE = getBaseUrlWallet()+"delete"; + static public String WALLET_TRANSFER = getBaseUrlWallet()+"transfer"; + static public void setAPI(String newApi){ API = Integer.parseInt(newApi); } + static public String getAPI(){ return String.valueOf(API); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_demo_config.xml b/app/src/main/res/layout/activity_demo_config.xml index 13f5a68..e73cacf 100644 --- a/app/src/main/res/layout/activity_demo_config.xml +++ b/app/src/main/res/layout/activity_demo_config.xml @@ -20,6 +20,7 @@ android:id="@+id/prodEnv" android:layout_width="130dp" android:layout_height="35dp" + android:gravity="center" android:layout_alignParentTop="true" android:layout_marginStart="25dp" android:layout_marginTop="0dp" @@ -43,6 +44,7 @@ android:id="@+id/bckpEnv" android:layout_width="match_parent" android:layout_height="35dp" + android:gravity="center" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:layout_marginTop="0dp" @@ -57,6 +59,57 @@ android:textSize="14sp" /> + + + + + + + + + +