merged conflicts
This commit is contained in:
2
web-sdk/.gitignore
vendored
2
web-sdk/.gitignore
vendored
@@ -45,4 +45,4 @@ log/
|
||||
*.swp
|
||||
|
||||
# Asc files (e.g., GPG signatures)
|
||||
*.asc
|
||||
*.asc
|
||||
|
||||
@@ -1,12 +1,21 @@
|
||||
## Usage
|
||||
|
||||
### 1. Register your APP
|
||||
Register your APP on irext SDK console [irext SDK console](http://site.irext.net), (You need to register an irext account first
|
||||
Register your APP on irext SDK console [irext SDK console](http://site.irext.net), (You need to register an irext account first.
|
||||
|
||||
While your APP is registered, you can see the APP key and APP secret in your APP list
|
||||
While your APP is registered, you can see the APP key and APP secret in your APP list.
|
||||
|
||||
### 2. Import the SDK
|
||||
You can either import this project or download the web-api .jar file from [Java SDK](http://irext-lib-releaese.oss-cn-hangzhou.aliyuncs.com/decode/0.1.2/web-api-java-0.1.2.jar) and import to your project
|
||||
Import the SDK package in your maven project by adding following lines to pom.xml and sync the maven project.
|
||||
```xml
|
||||
<dependency>
|
||||
<groupId>net.irext.webapi</groupId>
|
||||
<artifactId>irext-webapi</artifactId>
|
||||
<version>1.5.1</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
|
||||
|
||||
### 3. Use the SDK
|
||||
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>net.irext.webapi</groupId>
|
||||
<artifactId>irext-webapi</artifactId>
|
||||
<name>irext-remote-index</name>
|
||||
<version>1.5.0</version>
|
||||
<description>Indexing API for IRext remote controller</description>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<source>${maven.compiler.source}</source>
|
||||
<target>${maven.compiler.target}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.5.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputFile>${project.build.directory}/${project.artifactId}-shaded.jar</outputFile>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<properties>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<okhttp.version>4.12.0</okhttp.version>
|
||||
<gson.version>2.10.1</gson.version>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
</project>
|
||||
@@ -89,43 +89,6 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.6.3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.central</groupId>
|
||||
<artifactId>central-publishing-maven-plugin</artifactId>
|
||||
<version>0.9.0</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<publishingServerId>central</publishingServerId>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -1,52 +0,0 @@
|
||||
net/irext/webapi/bean/ACStatus.class
|
||||
net/irext/webapi/WebAPICallbacks$ListProvincesCallback.class
|
||||
net/irext/webapi/WebAPICallbacks$ListAreasCallback.class
|
||||
net/irext/webapi/request/ListOperatorsRequest.class
|
||||
net/irext/webapi/utils/Constants$ACSwing.class
|
||||
net/irext/webapi/utils/Constants$BinaryType.class
|
||||
net/irext/webapi/model/RemoteIndex.class
|
||||
net/irext/webapi/WebAPIs.class
|
||||
net/irext/webapi/model/ACParameters.class
|
||||
net/irext/webapi/request/ListIndexesRequest.class
|
||||
net/irext/webapi/request/ListBrandsRequest.class
|
||||
net/irext/webapi/response/BrandsResponse.class
|
||||
net/irext/webapi/response/OperatorsResponse.class
|
||||
net/irext/webapi/utils/Constants$ACPower.class
|
||||
net/irext/webapi/request/AppSignInRequest.class
|
||||
net/irext/webapi/model/City.class
|
||||
net/irext/webapi/response/IndexesResponse.class
|
||||
net/irext/webapi/WebAPICallbacks$ListPopularBrandsCallback.class
|
||||
net/irext/webapi/request/ListCategoriesRequest.class
|
||||
net/irext/webapi/WebAPICallbacks.class
|
||||
net/irext/webapi/WebAPICallbacks$ListPopularCitiesCallback.class
|
||||
net/irext/webapi/response/DecodeResponse.class
|
||||
net/irext/webapi/request/BaseRequest.class
|
||||
net/irext/webapi/WebAPICallbacks$ListOperatersCallback.class
|
||||
net/irext/webapi/utils/Constants$ACMode.class
|
||||
net/irext/webapi/model/Category.class
|
||||
net/irext/webapi/WebAPICallbacks$ListCitiesCallback.class
|
||||
net/irext/webapi/WebAPICallbacks$ListCategoriesCallback.class
|
||||
net/irext/webapi/bean/TemperatureRange.class
|
||||
net/irext/webapi/WebAPICallbacks$ListBrandsCallback.class
|
||||
net/irext/webapi/response/CategoriesResponse.class
|
||||
net/irext/webapi/utils/Constants$ACWindSpeed.class
|
||||
net/irext/webapi/utils/Constants$CategoryID.class
|
||||
net/irext/webapi/utils/Constants$ACFunction.class
|
||||
net/irext/webapi/response/ACParametersResponse.class
|
||||
net/irext/webapi/request/GetACParametersRequest.class
|
||||
net/irext/webapi/model/Brand.class
|
||||
net/irext/webapi/WebAPICallbacks$SignInCallback.class
|
||||
net/irext/webapi/response/CitiesResponse.class
|
||||
net/irext/webapi/request/DownloadBinaryRequest.class
|
||||
net/irext/webapi/WebAPICallbacks$ListIndexesCallback.class
|
||||
net/irext/webapi/request/ListCitiesRequest.class
|
||||
net/irext/webapi/response/LoginResponse.class
|
||||
net/irext/webapi/request/DecodeRequest.class
|
||||
net/irext/webapi/utils/Constants.class
|
||||
net/irext/webapi/model/StbOperator.class
|
||||
net/irext/webapi/model/UserApp.class
|
||||
net/irext/webapi/utils/Constants$ACTemperature.class
|
||||
net/irext/webapi/response/Status.class
|
||||
net/irext/webapi/utils/MD5Digest.class
|
||||
net/irext/webapi/response/ServiceResponse.class
|
||||
net/irext/webapi/WebAPICallbacks$DownloadBinCallback.class
|
||||
@@ -1,33 +0,0 @@
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListOperatorsRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/GetACParametersRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/WebAPICallbacks.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/ServiceResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/bean/ACStatus.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/DecodeRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/CategoriesResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/DownloadBinaryRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/Category.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/StbOperator.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/WebAPIs.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/OperatorsResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/utils/Constants.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/ACParameters.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/BrandsResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/LoginResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/CitiesResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/Status.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/UserApp.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/RemoteIndex.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListIndexesRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/AppSignInRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListCategoriesRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/BaseRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/bean/TemperatureRange.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/City.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/DecodeResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/IndexesResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/model/Brand.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListBrandsRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/response/ACParametersResponse.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/request/ListCitiesRequest.java
|
||||
/home/strawmanbobi/Develop/project/irext/index-api/web-sdk/src/main/java/net/irext/webapi/utils/MD5Digest.java
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="lib" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
Reference in New Issue
Block a user