diff --git a/README.md b/README.md index 8e9d4a6..f43eba3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # irext Java web API Indexing to the specified remote index and download its IR binary file -Please refer to the README in subfolders for [Android](https://github.com/irext/irext-web-api/tree/master/android) and [Java web](https://github.com/irext/irext-web-api/tree/master/web). +Please refer to the README in subfolders for [Android](https://github.com/irext/irext-web-api/tree/master/android-sdk) and [Java web](https://github.com/irext/irext-web-api/tree/master/web-sdk). diff --git a/android/.gitignore b/android-sdk/.gitignore similarity index 100% rename from android/.gitignore rename to android-sdk/.gitignore diff --git a/android/README.md b/android-sdk/README.md similarity index 100% rename from android/README.md rename to android-sdk/README.md diff --git a/android/build.gradle b/android-sdk/build.gradle similarity index 100% rename from android/build.gradle rename to android-sdk/build.gradle diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android-sdk/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from android/gradle/wrapper/gradle-wrapper.jar rename to android-sdk/gradle/wrapper/gradle-wrapper.jar diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android-sdk/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from android/gradle/wrapper/gradle-wrapper.properties rename to android-sdk/gradle/wrapper/gradle-wrapper.properties diff --git a/android/gradlew b/android-sdk/gradlew similarity index 100% rename from android/gradlew rename to android-sdk/gradlew diff --git a/android/gradlew.bat b/android-sdk/gradlew.bat similarity index 100% rename from android/gradlew.bat rename to android-sdk/gradlew.bat diff --git a/android/libs/gson-2.8.0.jar b/android-sdk/libs/gson-2.8.0.jar similarity index 100% rename from android/libs/gson-2.8.0.jar rename to android-sdk/libs/gson-2.8.0.jar diff --git a/android/libs/okhttp-3.7.0.jar b/android-sdk/libs/okhttp-3.7.0.jar similarity index 100% rename from android/libs/okhttp-3.7.0.jar rename to android-sdk/libs/okhttp-3.7.0.jar diff --git a/android/libs/okio-1.12.0.jar b/android-sdk/libs/okio-1.12.0.jar similarity index 100% rename from android/libs/okio-1.12.0.jar rename to android-sdk/libs/okio-1.12.0.jar diff --git a/android/proguard-rules.pro b/android-sdk/proguard-rules.pro similarity index 100% rename from android/proguard-rules.pro rename to android-sdk/proguard-rules.pro diff --git a/android/settings.gradle b/android-sdk/settings.gradle similarity index 100% rename from android/settings.gradle rename to android-sdk/settings.gradle diff --git a/android/src/main/AndroidManifest.xml b/android-sdk/src/main/AndroidManifest.xml similarity index 100% rename from android/src/main/AndroidManifest.xml rename to android-sdk/src/main/AndroidManifest.xml diff --git a/android/src/main/java/net/irext/webapi/WebAPICallbacks.java b/android-sdk/src/main/java/net/irext/webapi/WebAPICallbacks.java similarity index 100% rename from android/src/main/java/net/irext/webapi/WebAPICallbacks.java rename to android-sdk/src/main/java/net/irext/webapi/WebAPICallbacks.java diff --git a/android/src/main/java/net/irext/webapi/WebAPIs.java b/android-sdk/src/main/java/net/irext/webapi/WebAPIs.java similarity index 100% rename from android/src/main/java/net/irext/webapi/WebAPIs.java rename to android-sdk/src/main/java/net/irext/webapi/WebAPIs.java diff --git a/android/src/main/java/net/irext/webapi/bean/ACStatus.java b/android-sdk/src/main/java/net/irext/webapi/bean/ACStatus.java similarity index 100% rename from android/src/main/java/net/irext/webapi/bean/ACStatus.java rename to android-sdk/src/main/java/net/irext/webapi/bean/ACStatus.java diff --git a/android/src/main/java/net/irext/webapi/bean/TemperatureRange.java b/android-sdk/src/main/java/net/irext/webapi/bean/TemperatureRange.java similarity index 100% rename from android/src/main/java/net/irext/webapi/bean/TemperatureRange.java rename to android-sdk/src/main/java/net/irext/webapi/bean/TemperatureRange.java diff --git a/android/src/main/java/net/irext/webapi/model/Brand.java b/android-sdk/src/main/java/net/irext/webapi/model/Brand.java similarity index 100% rename from android/src/main/java/net/irext/webapi/model/Brand.java rename to android-sdk/src/main/java/net/irext/webapi/model/Brand.java diff --git a/android/src/main/java/net/irext/webapi/model/Category.java b/android-sdk/src/main/java/net/irext/webapi/model/Category.java similarity index 100% rename from android/src/main/java/net/irext/webapi/model/Category.java rename to android-sdk/src/main/java/net/irext/webapi/model/Category.java diff --git a/android/src/main/java/net/irext/webapi/model/City.java b/android-sdk/src/main/java/net/irext/webapi/model/City.java similarity index 100% rename from android/src/main/java/net/irext/webapi/model/City.java rename to android-sdk/src/main/java/net/irext/webapi/model/City.java diff --git a/android/src/main/java/net/irext/webapi/model/RemoteIndex.java b/android-sdk/src/main/java/net/irext/webapi/model/RemoteIndex.java similarity index 100% rename from android/src/main/java/net/irext/webapi/model/RemoteIndex.java rename to android-sdk/src/main/java/net/irext/webapi/model/RemoteIndex.java diff --git a/android/src/main/java/net/irext/webapi/model/StbOperator.java b/android-sdk/src/main/java/net/irext/webapi/model/StbOperator.java similarity index 100% rename from android/src/main/java/net/irext/webapi/model/StbOperator.java rename to android-sdk/src/main/java/net/irext/webapi/model/StbOperator.java diff --git a/android/src/main/java/net/irext/webapi/model/UserApp.java b/android-sdk/src/main/java/net/irext/webapi/model/UserApp.java similarity index 100% rename from android/src/main/java/net/irext/webapi/model/UserApp.java rename to android-sdk/src/main/java/net/irext/webapi/model/UserApp.java diff --git a/android/src/main/java/net/irext/webapi/request/AppSignInRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/AppSignInRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/AppSignInRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/AppSignInRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/BaseRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/BaseRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/BaseRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/BaseRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/DecodeRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/DecodeRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/DecodeRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/DecodeRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/ListBrandsRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/ListBrandsRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/ListBrandsRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/ListBrandsRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/ListCitiesRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/ListCitiesRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/ListCitiesRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/ListCitiesRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/ListIndexesRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/ListIndexesRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/ListIndexesRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/ListIndexesRequest.java diff --git a/android/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java b/android-sdk/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java rename to android-sdk/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java diff --git a/android/src/main/java/net/irext/webapi/response/BrandsResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/BrandsResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/BrandsResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/BrandsResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/CategoriesResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/CategoriesResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/CategoriesResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/CategoriesResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/CitiesResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/CitiesResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/CitiesResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/CitiesResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/DecodeResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/DecodeResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/DecodeResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/DecodeResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/IndexesResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/IndexesResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/IndexesResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/IndexesResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/LoginResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/LoginResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/LoginResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/LoginResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/OperatorsResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/OperatorsResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/OperatorsResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/OperatorsResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/ServiceResponse.java b/android-sdk/src/main/java/net/irext/webapi/response/ServiceResponse.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/ServiceResponse.java rename to android-sdk/src/main/java/net/irext/webapi/response/ServiceResponse.java diff --git a/android/src/main/java/net/irext/webapi/response/Status.java b/android-sdk/src/main/java/net/irext/webapi/response/Status.java similarity index 100% rename from android/src/main/java/net/irext/webapi/response/Status.java rename to android-sdk/src/main/java/net/irext/webapi/response/Status.java diff --git a/android/src/main/java/net/irext/webapi/utils/Constants.java b/android-sdk/src/main/java/net/irext/webapi/utils/Constants.java similarity index 100% rename from android/src/main/java/net/irext/webapi/utils/Constants.java rename to android-sdk/src/main/java/net/irext/webapi/utils/Constants.java diff --git a/android/src/main/java/net/irext/webapi/utils/MD5Digest.java b/android-sdk/src/main/java/net/irext/webapi/utils/MD5Digest.java similarity index 100% rename from android/src/main/java/net/irext/webapi/utils/MD5Digest.java rename to android-sdk/src/main/java/net/irext/webapi/utils/MD5Digest.java diff --git a/android/src/main/java/net/irext/webapi/utils/PackageUtils.java b/android-sdk/src/main/java/net/irext/webapi/utils/PackageUtils.java similarity index 100% rename from android/src/main/java/net/irext/webapi/utils/PackageUtils.java rename to android-sdk/src/main/java/net/irext/webapi/utils/PackageUtils.java diff --git a/web/.gitignore b/web-sdk/.gitignore similarity index 100% rename from web/.gitignore rename to web-sdk/.gitignore diff --git a/web/README.md b/web-sdk/README.md similarity index 100% rename from web/README.md rename to web-sdk/README.md diff --git a/web/lib/gson-2.8.0.jar b/web-sdk/lib/gson-2.8.0.jar similarity index 100% rename from web/lib/gson-2.8.0.jar rename to web-sdk/lib/gson-2.8.0.jar diff --git a/web/lib/okhttp-3.7.0.jar b/web-sdk/lib/okhttp-3.7.0.jar similarity index 100% rename from web/lib/okhttp-3.7.0.jar rename to web-sdk/lib/okhttp-3.7.0.jar diff --git a/web/lib/okio-1.12.0.jar b/web-sdk/lib/okio-1.12.0.jar similarity index 100% rename from web/lib/okio-1.12.0.jar rename to web-sdk/lib/okio-1.12.0.jar diff --git a/web/release/web-api-java-0.1.2.jar b/web-sdk/release/web-api-java-0.1.2.jar similarity index 100% rename from web/release/web-api-java-0.1.2.jar rename to web-sdk/release/web-api-java-0.1.2.jar diff --git a/web/src/META-INF/MANIFEST.MF b/web-sdk/src/META-INF/MANIFEST.MF similarity index 100% rename from web/src/META-INF/MANIFEST.MF rename to web-sdk/src/META-INF/MANIFEST.MF diff --git a/web/src/net/irext/webapi/WebAPICallbacks.java b/web-sdk/src/net/irext/webapi/WebAPICallbacks.java similarity index 100% rename from web/src/net/irext/webapi/WebAPICallbacks.java rename to web-sdk/src/net/irext/webapi/WebAPICallbacks.java diff --git a/web/src/net/irext/webapi/WebAPIs.java b/web-sdk/src/net/irext/webapi/WebAPIs.java similarity index 100% rename from web/src/net/irext/webapi/WebAPIs.java rename to web-sdk/src/net/irext/webapi/WebAPIs.java diff --git a/web/src/net/irext/webapi/bean/ACStatus.java b/web-sdk/src/net/irext/webapi/bean/ACStatus.java similarity index 100% rename from web/src/net/irext/webapi/bean/ACStatus.java rename to web-sdk/src/net/irext/webapi/bean/ACStatus.java diff --git a/web/src/net/irext/webapi/bean/TemperatureRange.java b/web-sdk/src/net/irext/webapi/bean/TemperatureRange.java similarity index 100% rename from web/src/net/irext/webapi/bean/TemperatureRange.java rename to web-sdk/src/net/irext/webapi/bean/TemperatureRange.java diff --git a/web/src/net/irext/webapi/model/Brand.java b/web-sdk/src/net/irext/webapi/model/Brand.java similarity index 100% rename from web/src/net/irext/webapi/model/Brand.java rename to web-sdk/src/net/irext/webapi/model/Brand.java diff --git a/web/src/net/irext/webapi/model/Category.java b/web-sdk/src/net/irext/webapi/model/Category.java similarity index 100% rename from web/src/net/irext/webapi/model/Category.java rename to web-sdk/src/net/irext/webapi/model/Category.java diff --git a/web/src/net/irext/webapi/model/City.java b/web-sdk/src/net/irext/webapi/model/City.java similarity index 100% rename from web/src/net/irext/webapi/model/City.java rename to web-sdk/src/net/irext/webapi/model/City.java diff --git a/web/src/net/irext/webapi/model/RemoteIndex.java b/web-sdk/src/net/irext/webapi/model/RemoteIndex.java similarity index 100% rename from web/src/net/irext/webapi/model/RemoteIndex.java rename to web-sdk/src/net/irext/webapi/model/RemoteIndex.java diff --git a/web/src/net/irext/webapi/model/StbOperator.java b/web-sdk/src/net/irext/webapi/model/StbOperator.java similarity index 100% rename from web/src/net/irext/webapi/model/StbOperator.java rename to web-sdk/src/net/irext/webapi/model/StbOperator.java diff --git a/web/src/net/irext/webapi/model/UserApp.java b/web-sdk/src/net/irext/webapi/model/UserApp.java similarity index 100% rename from web/src/net/irext/webapi/model/UserApp.java rename to web-sdk/src/net/irext/webapi/model/UserApp.java diff --git a/web/src/net/irext/webapi/request/AppSignInRequest.java b/web-sdk/src/net/irext/webapi/request/AppSignInRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/AppSignInRequest.java rename to web-sdk/src/net/irext/webapi/request/AppSignInRequest.java diff --git a/web/src/net/irext/webapi/request/BaseRequest.java b/web-sdk/src/net/irext/webapi/request/BaseRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/BaseRequest.java rename to web-sdk/src/net/irext/webapi/request/BaseRequest.java diff --git a/web/src/net/irext/webapi/request/DecodeRequest.java b/web-sdk/src/net/irext/webapi/request/DecodeRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/DecodeRequest.java rename to web-sdk/src/net/irext/webapi/request/DecodeRequest.java diff --git a/web/src/net/irext/webapi/request/DownloadBinaryRequest.java b/web-sdk/src/net/irext/webapi/request/DownloadBinaryRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/DownloadBinaryRequest.java rename to web-sdk/src/net/irext/webapi/request/DownloadBinaryRequest.java diff --git a/web/src/net/irext/webapi/request/ListBrandsRequest.java b/web-sdk/src/net/irext/webapi/request/ListBrandsRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/ListBrandsRequest.java rename to web-sdk/src/net/irext/webapi/request/ListBrandsRequest.java diff --git a/web/src/net/irext/webapi/request/ListCategoriesRequest.java b/web-sdk/src/net/irext/webapi/request/ListCategoriesRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/ListCategoriesRequest.java rename to web-sdk/src/net/irext/webapi/request/ListCategoriesRequest.java diff --git a/web/src/net/irext/webapi/request/ListCitiesRequest.java b/web-sdk/src/net/irext/webapi/request/ListCitiesRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/ListCitiesRequest.java rename to web-sdk/src/net/irext/webapi/request/ListCitiesRequest.java diff --git a/web/src/net/irext/webapi/request/ListIndexesRequest.java b/web-sdk/src/net/irext/webapi/request/ListIndexesRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/ListIndexesRequest.java rename to web-sdk/src/net/irext/webapi/request/ListIndexesRequest.java diff --git a/web/src/net/irext/webapi/request/ListOperatorsRequest.java b/web-sdk/src/net/irext/webapi/request/ListOperatorsRequest.java similarity index 100% rename from web/src/net/irext/webapi/request/ListOperatorsRequest.java rename to web-sdk/src/net/irext/webapi/request/ListOperatorsRequest.java diff --git a/web/src/net/irext/webapi/response/BrandsResponse.java b/web-sdk/src/net/irext/webapi/response/BrandsResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/BrandsResponse.java rename to web-sdk/src/net/irext/webapi/response/BrandsResponse.java diff --git a/web/src/net/irext/webapi/response/CategoriesResponse.java b/web-sdk/src/net/irext/webapi/response/CategoriesResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/CategoriesResponse.java rename to web-sdk/src/net/irext/webapi/response/CategoriesResponse.java diff --git a/web/src/net/irext/webapi/response/CitiesResponse.java b/web-sdk/src/net/irext/webapi/response/CitiesResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/CitiesResponse.java rename to web-sdk/src/net/irext/webapi/response/CitiesResponse.java diff --git a/web/src/net/irext/webapi/response/DecodeResponse.java b/web-sdk/src/net/irext/webapi/response/DecodeResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/DecodeResponse.java rename to web-sdk/src/net/irext/webapi/response/DecodeResponse.java diff --git a/web/src/net/irext/webapi/response/IndexesResponse.java b/web-sdk/src/net/irext/webapi/response/IndexesResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/IndexesResponse.java rename to web-sdk/src/net/irext/webapi/response/IndexesResponse.java diff --git a/web/src/net/irext/webapi/response/LoginResponse.java b/web-sdk/src/net/irext/webapi/response/LoginResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/LoginResponse.java rename to web-sdk/src/net/irext/webapi/response/LoginResponse.java diff --git a/web/src/net/irext/webapi/response/OperatorsResponse.java b/web-sdk/src/net/irext/webapi/response/OperatorsResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/OperatorsResponse.java rename to web-sdk/src/net/irext/webapi/response/OperatorsResponse.java diff --git a/web/src/net/irext/webapi/response/ServiceResponse.java b/web-sdk/src/net/irext/webapi/response/ServiceResponse.java similarity index 100% rename from web/src/net/irext/webapi/response/ServiceResponse.java rename to web-sdk/src/net/irext/webapi/response/ServiceResponse.java diff --git a/web/src/net/irext/webapi/response/Status.java b/web-sdk/src/net/irext/webapi/response/Status.java similarity index 100% rename from web/src/net/irext/webapi/response/Status.java rename to web-sdk/src/net/irext/webapi/response/Status.java diff --git a/web/src/net/irext/webapi/utils/Constants.java b/web-sdk/src/net/irext/webapi/utils/Constants.java similarity index 100% rename from web/src/net/irext/webapi/utils/Constants.java rename to web-sdk/src/net/irext/webapi/utils/Constants.java diff --git a/web/src/net/irext/webapi/utils/MD5Digest.java b/web-sdk/src/net/irext/webapi/utils/MD5Digest.java similarity index 100% rename from web/src/net/irext/webapi/utils/MD5Digest.java rename to web-sdk/src/net/irext/webapi/utils/MD5Digest.java