updated android web-api

android/.gitignore

@@ -1 +1,8 @@
+*.iml
+.gradle
+/local.properties
+.idea/
+.DS_Store
 /build
+/captures
+.externalNativeBuild

android/build.gradle

@@ -1,21 +1,32 @@
 apply plugin: 'com.android.library'
 
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.3.1'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
 android {
     signingConfigs {
         irext_key {
-            keyAlias 'irext_key'
+            keyAlias 'irext-android'
-            keyPassword 'ghostcicy'
+            keyPassword 'irext-android'
-            storeFile file('D:/Project/Github_Work/irext/keys/irext_key.jks')
+            storeFile file('D:/Project/Github_Work/irext/keys/irext-android.jks')
-            storePassword 'ghostcicy'
+            storePassword 'irext-android'
         }
     }
-    compileSdkVersion 25
+    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "23.0.1"
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 25
+        targetSdkVersion 23
-        versionCode 1
+        versionCode 3
-        versionName "0.1.2"
+        versionName '0.1.3'
         signingConfig signingConfigs.irext_key
     }
     buildTypes {
@@ -23,11 +34,10 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.irext_key
-            versionNameSuffix '0.1.2'
+            versionNameSuffix '0.1.3'
         }
     }
     productFlavors {
-
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sun Jul 02 13:44:35 CST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip

android/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/src/main/java/net/irext/webapi/WebAPICallbacks.java

@@ -0,0 +1,90 @@
+package net.irext.webapi;
+
+import net.irext.webapi.model.Brand;
+import net.irext.webapi.model.Category;
+import net.irext.webapi.model.City;
+import net.irext.webapi.model.RemoteIndex;
+import net.irext.webapi.model.StbOperator;
+import net.irext.webapi.model.UserApp;
+
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * Filename:       WebAPICallbacks.java
+ * Revised:        Date: 2017-07-01
+ * Revision:       Revision: 1.0
+ * <p>
+ * Description:    HTTP Response Callbacks
+ * <p>
+ * Revision log:
+ * 2017-07-01: created by strawmanbobi
+ */
+public class WebAPICallbacks {
+
+    public interface SignInCallback {
+        void onSignInSuccess(UserApp admin);
+        void onSignInFailed();
+        void onSignInError();
+    }
+
+    public interface ListCategoriesCallback  {
+        void onListCategoriesSuccess(List<Category> categories);
+        void onListCategoriesFailed();
+        void onListCategoriesError();
+    }
+
+    public interface ListBrandsCallback {
+        void onListBrandsSuccess(List<Brand> brands);
+        void onListBrandsFailed();
+        void onListBrandsError();
+    }
+
+    public interface ListPopularBrandsCallback {
+        void onListPopularBrandsSuccess(List<Brand> brands);
+        void onListPopularBrandsFailed();
+        void onListPopularBrandsError();
+    }
+
+    public interface ListPopularCitiesCallback {
+        void onListPopularCitiesSuccess(List<City> cities);
+        void onListPopularCitiesFailed();
+        void onListPopularCitiesError();
+    }
+
+    public interface ListProvincesCallback {
+        void onListProvincesSuccess(List<City> provinces);
+        void onListProvincesFailed();
+        void onListProvincesError();
+    }
+
+    public interface ListCitiesCallback {
+        void onListCitiesSuccess(List<City> cities);
+        void onListCitiesFailed();
+        void onListCitiesError();
+    }
+
+    public interface ListAreasCallback {
+        void onListAreasSuccess(List<City> cities);
+        void onListAreasFailed();
+        void onListAreasError();
+    }
+
+    public interface ListOperatersCallback {
+        void onListOperatorsSuccess(List<StbOperator> operators);
+        void onListOperatorsFailed();
+        void onListOperatorsError();
+    }
+
+    public interface ListIndexesCallback {
+        void onListIndexesSuccess(List<RemoteIndex> indexes);
+        void onListIndexesFailed();
+        void onListIndexesError();
+    }
+
+    public interface DownloadBinCallback {
+        void onDownloadBinSuccess(InputStream inputStream);
+        void onDownloadBinFailed();
+        void onDownloadBinError();
+    }
+}

android/src/main/java/net/irext/webapi/WebAPIs.java

@@ -10,12 +10,12 @@ import net.irext.webapi.utils.Constants;
 import net.irext.webapi.request.*;
 import net.irext.webapi.response.*;
 import net.irext.webapi.utils.PackageUtils;
+import net.irext.webapi.WebAPICallbacks.*;
 
 import okhttp3.*;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
 
 /**
  * Filename:       WebAPIs.java
@@ -100,7 +100,7 @@ public class WebAPIs {
     }
 
     @SuppressWarnings("unused")
-    public UserApp signIn(Context context) {
+    public void signIn(Context context, SignInCallback signInCallback) {
         try {
             String signInURL = URL_PREFIX + SERVICE_SIGN_IN;
             AppSignInRequest appSignInRequest = new AppSignInRequest();
@@ -130,17 +130,19 @@ public class WebAPIs {
                 if (0 != admin.getId() && null != admin.getToken()) {
                     adminId = admin.getId();
                     token = admin.getToken();
+                    signInCallback.onSignInSuccess(admin);
+                } else {
+                    signInCallback.onSignInFailed();
                 }
-                return admin;
             }
         } catch (Exception e) {
             e.printStackTrace();
+            signInCallback.onSignInError();
         }
-        return null;
     }
 
     @SuppressWarnings("unused")
-    public List<Category> listCategories(int from, int count) {
+    public void listCategories(int from, int count, ListCategoriesCallback listCategoriesCallback) {
         String listCategoriesURL = URL_PREFIX + SERVICE_LIST_CATEGORIES;
         ListCategoriesRequest listCategoriesRequest = new ListCategoriesRequest();
         listCategoriesRequest.setAdminId(adminId);
@@ -154,16 +156,19 @@ public class WebAPIs {
             CategoriesResponse categoriesResponse = new Gson().fromJson(response, CategoriesResponse.class);
 
             if(categoriesResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
-                return categoriesResponse.getEntity();
+                listCategoriesCallback.onListCategoriesSuccess(categoriesResponse.getEntity());
+            } else {
+                listCategoriesCallback.onListCategoriesFailed();
             }
         } catch (Exception e) {
             e.printStackTrace();
+            listCategoriesCallback.onListCategoriesError();
         }
-        return null;
     }
 
     @SuppressWarnings("unused")
-    public List<Brand> listBrands(int categoryId, int from, int count) {
+    public void listBrands(int categoryId, int from, int count,
+                                  ListBrandsCallback listBrandsCallback) {
         String listBrandsURL = URL_PREFIX + SERVICE_LIST_BRANDS;
         ListBrandsRequest listBrandsRequest = new ListBrandsRequest();
         listBrandsRequest.setAdminId(adminId);
@@ -177,28 +182,42 @@ public class WebAPIs {
             String response = postToServer(listBrandsURL, bodyJson);
             BrandsResponse brandsResponse = new Gson().fromJson(response, BrandsResponse.class);
 
-            if(brandsResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
+            if (brandsResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
-                return brandsResponse.getEntity();
+                listBrandsCallback.onListBrandsSuccess(brandsResponse.getEntity());
+            } else {
+                listBrandsCallback.onListBrandsFailed();
             }
         } catch (Exception e) {
             e.printStackTrace();
+            listBrandsCallback.onListBrandsError();
         }
-        return null;
     }
 
     @SuppressWarnings("unused")
-    public List<City> listProvinces() {
+    public void listProvinces(ListProvincesCallback listProvincesCallback) {
         String listProvincesURL = URL_PREFIX + SERVICE_LIST_PROVINCES;
         ListCitiesRequest listCitiesRequest = new ListCitiesRequest();
         listCitiesRequest.setAdminId(adminId);
         listCitiesRequest.setToken(token);
         String bodyJson = listCitiesRequest.toJson();
 
-        return listCitiesCommon(listProvincesURL, bodyJson);
+        try {
+            String response = postToServer(listProvincesURL, bodyJson);
+            CitiesResponse citiesResponse = new Gson().fromJson(response, CitiesResponse.class);
+
+            if (citiesResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
+                listProvincesCallback.onListProvincesSuccess(citiesResponse.getEntity());
+            } else {
+                listProvincesCallback.onListProvincesFailed();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            listProvincesCallback.onListProvincesError();
+        }
     }
 
     @SuppressWarnings("unused")
-    public List<City> listCities(String prefix) {
+    public void listCities(String prefix, ListCitiesCallback listCitiesCallback) {
         String listCitiesURL = URL_PREFIX + SERVICE_LIST_CITIES;
         ListCitiesRequest listCitiesRequest = new ListCitiesRequest();
         listCitiesRequest.setAdminId(adminId);
@@ -206,25 +225,24 @@ public class WebAPIs {
         listCitiesRequest.setProvincePrefix(prefix);
         String bodyJson = listCitiesRequest.toJson();
 
-        return listCitiesCommon(listCitiesURL, bodyJson);
-    }
-
-    private List<City> listCitiesCommon(String url, String bodyJson) {
         try {
-            String response = postToServer(url, bodyJson);
+            String response = postToServer(listCitiesURL, bodyJson);
             CitiesResponse citiesResponse = new Gson().fromJson(response, CitiesResponse.class);
 
             if (citiesResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
-                return citiesResponse.getEntity();
+                listCitiesCallback.onListCitiesSuccess(citiesResponse.getEntity());
+            } else {
+                listCitiesCallback.onListCitiesFailed();
             }
         } catch (Exception e) {
             e.printStackTrace();
+            listCitiesCallback.onListCitiesError();
         }
-        return null;
     }
 
     @SuppressWarnings("unused")
-    public List<StbOperator> listOperators(String cityCode) {
+    public void listOperators(String cityCode,
+                                           ListOperatersCallback listOperatersCallback) {
         String listOperatorsURL = URL_PREFIX + SERVICE_LIST_OPERATORS;
         ListOperatorsRequest listOperatorsRequest = new ListOperatorsRequest();
         listOperatorsRequest.setAdminId(adminId);
@@ -239,16 +257,22 @@ public class WebAPIs {
             OperatorsResponse operatorsResponse = new Gson().fromJson(response, OperatorsResponse.class);
 
             if (operatorsResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
-                return operatorsResponse.getEntity();
+                listOperatersCallback.onListOperatorsSuccess(operatorsResponse.getEntity());
+            } else {
+                listOperatersCallback.onListOperatorsFailed();
             }
         } catch (Exception e) {
             e.printStackTrace();
+            listOperatersCallback.onListOperatorsError();
         }
-        return null;
     }
 
     @SuppressWarnings("unused")
-    public List<RemoteIndex> listRemoteIndexes(int categoryId, int brandId, String cityCode, String operatorId) {
+    public void listRemoteIndexes(int categoryId,
+                                               int brandId,
+                                               String cityCode,
+                                               String operatorId,
+                                               ListIndexesCallback onListIndexCallback) {
         String listIndexesURL = URL_PREFIX + SERVICE_LIST_INDEXES;
         ListIndexesRequest listIndexesRequest = new ListIndexesRequest();
         listIndexesRequest.setAdminId(adminId);
@@ -267,16 +291,19 @@ public class WebAPIs {
             IndexesResponse indexesResponse = new Gson().fromJson(response, IndexesResponse.class);
 
             if (indexesResponse.getStatus().getCode() == Constants.ERROR_CODE_SUCCESS) {
-                return indexesResponse.getEntity();
+                onListIndexCallback.onListIndexesSuccess(indexesResponse.getEntity());
+            } else {
+                onListIndexCallback.onListIndexesFailed();
             }
         } catch (Exception e) {
             e.printStackTrace();
+            onListIndexCallback.onListIndexesError();
         }
-        return null;
     }
 
     @SuppressWarnings("unused")
-    public InputStream downloadBin(String remoteMap, int indexId) {
+    public void downloadBin(String remoteMap, int indexId,
+                            DownloadBinCallback downloadBinCallback) {
         String downloadURL = URL_PREFIX + SERVICE_DOWNLOAD_BIN;
         DownloadBinaryRequest downloadBinaryRequest = new DownloadBinaryRequest();
         downloadBinaryRequest.setAdminId(adminId);
@@ -287,12 +314,18 @@ public class WebAPIs {
 
         if (null != bodyJson) {
             try {
-                return postToServerForOctets(downloadURL, bodyJson);
+                InputStream binStream = postToServerForOctets(downloadURL, bodyJson);
+
+                if (null != binStream) {
+                    downloadBinCallback.onDownloadBinSuccess(binStream);
+                } else {
+                    downloadBinCallback.onDownloadBinFailed();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
+                downloadBinCallback.onDownloadBinError();
             }
         }
-        return null;
     }
 
     @SuppressWarnings("unused")