发布v1.1.0

jenly1314 · Nov 18, 2023 · adcc87d · adcc87d
1 parent f55e9cc
commit adcc87d
Show file tree

Hide file tree

Showing 40 changed files with 1,058 additions and 788 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,27 +1,13 @@
-version: 2
+version: 2.1
+
+orbs:
+  android: circleci/[email protected]
+
 jobs:
   build:
-    working_directory: ~/code
     docker:
-      - image: circleci/android:api-28
-    environment:
-      JVM_OPTS: -Xmx3200m
+      - image: cimg/android:2023.08
     steps:
       - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:
-          name: Download Dependencies
-          command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
-          name: Run Tests
-          command: ./gradlew lint test
-      - store_artifacts:
-          path: app/build/reports
-          destination: reports
-      - store_test_results:
-          path: app/build/test-results
+          command: ./gradlew build
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -0,0 +1,20 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Build with Gradle
+        run: ./gradlew build
diff --git a/README.md b/README.md
@@ -3,10 +3,11 @@
 ![Image](app/src/main/ic_launcher-web.png)
 
 [![Download](https://img.shields.io/badge/download-App-blue.svg)](https://raw.githubusercontent.com/jenly1314/ANetty/master/app/release/app-release.apk)
+[![MavenCentral](https://img.shields.io/maven-central/v/com.github.jenly1314/awebsocket)](https://repo1.maven.org/maven2/com/github/jenly1314/awebsocket)
 [![JitPack](https://jitpack.io/v/jenly1314/ANetty.svg)](https://jitpack.io/#jenly1314/ANetty)
 [![CI](https://travis-ci.org/jenly1314/ANetty.svg?branch=master)](https://travis-ci.org/jenly1314/ANetty)
 [![CircleCI](https://circleci.com/gh/jenly1314/ANetty.svg?style=svg)](https://circleci.com/gh/jenly1314/ANetty)
-[![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=16)
+[![API](https://img.shields.io/badge/API-21%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=21)
 [![License](https://img.shields.io/badge/license-Apche%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Blog](https://img.shields.io/badge/blog-Jenly-9933CC.svg)](https://jenly1314.github.io/)
 [![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1411582c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad)
@@ -20,144 +21,156 @@ ANetty for Android 是基于Netty二次封装的Android链路通讯库，用以
 
 ## 引入
 
-### Maven：
-```maven
-    <dependency>
-      <groupId>com.king.anetty</groupId>
-      <artifactId>anetty</artifactId>
-      <version>1.0.3</version>
-      <type>pom</type>
-    </dependency>
-```
 ### Gradle:
-```gradle
-    implementation 'com.king.anetty:anetty:1.0.3'
-```
-### Lvy:
-```lvy
-    <dependency org='com.king.anetty' name='anetty' rev='1.0.3'>
-      <artifact name='$AID' ext='pom'></artifact>
-    </dependency>
-```
 
-###### 如果Gradle出现compile失败的情况，可以在Project的build.gradle里面添加如下：（也可以使用上面的GitPack来complie）
-```gradle
-    allprojects {
-        repositories {
-            maven { url 'https://dl.bintray.com/jenly/maven' }
-        }
+1. 在Project的 **build.gradle** 或 **setting.gradle** 中添加远程仓库
+
+    ```gradle
+    repositories {
+        //...
+        mavenCentral()
     }
-```
+    ```
+
+2. 在Module的 **build.gradle** 里面添加引入依赖项
+   ```gradle
+       // AndroidX
+       implementation 'com.github.jenly1314:anetty:1.1.0'
+
+   ```
 
 ## 示例
 
 代码示例
 
-> ANetty暂并不提供Netty服务端封装库，因为在真实的场景中，服务端一般都依赖项目对应的业务。为了方便演示客户端效果，有个简易的[服务端demo](server)，直接以Java的形式直接运行ANettyServer即可启动Netty服务
+> ANetty暂并不提供Netty服务端封装库，因为在真实的场景中，服务端一般都依赖项目对应的业务。为了方便演示客户端效果，有个简易的[服务端demo](server)，直接以Java的形式直接运行ANettyServer即可启动Netty服务即可。
 
 Netty服务端：
 ```Java
-    //初始化并启动服务
-    new ANettyServer().start(String host,int port);
+   // 初始化并启动服务
+   new ANettyServer().start(port);
 ```
 
 Netty客户端：
 ```Java
-    //初始化Netty
-    mNetty = new ANetty(new Netty.OnChannelHandler() {
-        @Override
-        public void onMessageReceived(ChannelHandlerContext ctx,String msg) {
-            //TODO 接收到消息
-        }
-
-        @Override
-        public void onExceptionCaught(ChannelHandlerContext ctx,Throwable e) {
-
-        }
-    }, true);
-    //设置连接监听
-    mNetty.setOnConnectListener(new Netty.OnConnectListener() {
-        @Override
-        public void onSuccess() {
-            //TODO 连接成功
-        }
-
-        @Override
-        public void onFailed() {
-            //TODO 连接失败
-        }
-
-        @Override
-        public void onError(Exception e) {
-            //TODO 连接异常
-            Log.e(ANetty.TAG,e.getMessage());
-        }
-    });
-    //设置发送消息监听
-    mNetty.setOnSendMessageListener(new Netty.OnSendMessageListener() {
-        @Override
-        public void onSendMessage(Object msg, boolean success) {
-            //TODO 发送消息，根据success判断是否发送成功
-        }
-
-        @Override
-        public void onException(Throwable e) {
-            //TODO 异常
-        }
-    });
-
-    //初始化后，连接Netty
-    mNetty.connect(String host,int port);
+    // 初始化Netty
+   Netty mNetty = new ANetty(new Netty.OnChannelHandler() {
+      @Override
+      public void onMessageReceived(ChannelHandlerContext ctx,String msg) {
+         // TODO 接收到的消息
+      }
+
+     @Override
+     public void onExceptionCaught(ChannelHandlerContext ctx,Throwable e) {
+         // TODO 异常
+     }
+   }, true);
+   // 设置连接监听
+   mNetty.setOnConnectListener(new Netty.OnConnectListener() {
+      @Override
+      public void onSuccess() {
+         // TODO 连接成功
+      }
+
+      @Override
+      public void onFailure(Throwable e) {
+         // TODO 连接失败
+      }
+
+   });
+   // 设置发送消息监听
+   mNetty.setOnSendMessageListener(new Netty.OnSendMessageListener() {
+      @Override
+      public void onSendMessage(Object msg) {
+         // TODO 发送的消息
+      }
+
+      @Override
+      public void onException(Throwable e) {
+         //TODO 异常
+      }
+   });
+
+   // 初始化后，建立连接
+   mNetty.connect(host, port);
+
+   //---------------------
+   // ...
+   // 发送消息
+   mNetty.sendMessage(msg);
+
+   //---------------------
+   // ...
+   // 断开连接
+   mNetty.disconnect();
+
+   //---------------------
+   // ...
+   // 重连
+   mNetty.reconnect(delayMillis);
+
+   //---------------------
+   // ...
+   // 关闭连接
+   mNetty.close();    
 
 ```
 
 更多使用详情，请查看[app](app)中的源码使用示例
 
-### 相关开源项目
-##### [EasyChat](https://github.com/yetel/EasyChatAndroidClient) 一款即时通讯APP
+### 相关推荐
 
+##### [EasyChat](https://github.com/yetel/EasyChatAndroidClient) 一款即时通讯APP。
+#### [ASocket](https://github.com/jenly1314/ASocket) 一个TCP/UDP协议的封装库，方便快速实现TCP的长连接与UDP的单播、组播、广播等相关通信。
+#### [AWebSocket](https://github.com/jenly1314/AWebSocket) 基于okhttp封装的 WebSocket，简洁易用。
 
 ## 版本记录
 
-#### v1.0.3：2019-11-13
-*  OnChannelHandler接口内方法新增ChannelHandlerContext参数
+#### v1.1.0：2023-11-18
+* 迁移发布至 MavenCentral
+* minSdk要求从 16+ 提升至 21+
+* compileSdk更新至33
+* 更新Gradle至8.0
+* 更新netty依赖至v4.1.101.Final
+* 修改Netty相关定义，对外提供更多可用的方法
+
+#### v1.0.3：2019-11-13 （之前发布的版本是在JCenter）
+* OnChannelHandler接口内方法新增ChannelHandlerContext参数
 
 #### v1.0.2：2019-10-30
-*  新增setOnSendMessageListener方法
-*  更新Netty依赖至4.1.43.Final
+* 新增setOnSendMessageListener方法
+* 更新Netty依赖至4.1.43.Final
 
 #### v1.0.1：2019-9-26
-*  移除support依赖
-*  更新Netty依赖至4.1.42.Final
+* 移除support依赖
+* 更新Netty依赖至4.1.42.Final
 
 #### v1.0.0：2019-3-30
-*  ANetty初始版本
+* ANetty初始版本
 
 ## 赞赏
 如果您喜欢ANetty，或感觉ANetty帮助到了您，可以点右上角“Star”支持一下，您的支持就是我的动力，谢谢 :smiley:<p>
 您也可以扫描下面的二维码，请作者喝杯咖啡 :coffee:
-    <div>
-        <img src="https://jenly1314.github.io/image/pay/wxpay.png" width="280" heght="350">
-        <img src="https://jenly1314.github.io/image/pay/alipay.png" width="280" heght="350">
-        <img src="https://jenly1314.github.io/image/pay/qqpay.png" width="280" heght="350">
-        <img src="https://jenly1314.github.io/image/alipay_red_envelopes.jpg" width="233" heght="350">
-    </div>
+<div>
+<img src="https://jenly1314.github.io/image/pay/sponsor.png" width="98%">
+</div>
 
 ## 关于我
-   Name: <a title="关于作者" href="https://about.me/jenly1314" target="_blank">Jenly</a>
+Name: <a title="关于作者" href="https://jenly1314.github.io" target="_blank">Jenly</a>
 
-   Email: <a title="欢迎邮件与我交流" href="mailto:[email protected]" target="_blank">jenly1314#gmail.com</a> / <a title="给我发邮件" href="mailto:[email protected]" target="_blank">jenly1314#vip.qq.com</a>
+Email: <a title="欢迎邮件与我交流" href="mailto:[email protected]" target="_blank">jenly1314#gmail.com</a> / <a title="给我发邮件" href="mailto:[email protected]" target="_blank">jenly1314#vip.qq.com</a>
 
-   CSDN: <a title="CSDN博客" href="http://blog.csdn.net/jenly121" target="_blank">jenly121</a>
+CSDN: <a title="CSDN博客" href="http://blog.csdn.net/jenly121" target="_blank">jenly121</a>
 
-   博客园: <a title="博客园" href="https://www.cnblogs.com/jenly" target="_blank">jenly</a>
+CNBlogs: <a title="博客园" href="https://www.cnblogs.com/jenly" target="_blank">jenly</a>
 
-   Github: <a title="Github开源项目" href="https://github.com/jenly1314" target="_blank">jenly1314</a>
+GitHub: <a title="GitHub开源项目" href="https://github.com/jenly1314" target="_blank">jenly1314</a>
 
-   加入QQ群: <a title="点击加入QQ群" href="http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1411582c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad" target="_blank">20867961</a>
+Gitee: <a title="Gitee开源项目" href="https://gitee.com/jenly1314" target="_blank">jenly1314</a>
+
+加入QQ群: <a title="点击加入QQ群" href="http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1411582c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad" target="_blank">20867961</a>
    <div>
        <img src="https://jenly1314.github.io/image/jenly666.png">
        <img src="https://jenly1314.github.io/image/qqgourp.png">
    </div>
 
-
diff --git a/lib/.gitignore → anetty/.gitignore b/lib/.gitignore → anetty/.gitignore
diff --git a/lib/bintray.gradle → anetty/bintray.gradle b/lib/bintray.gradle → anetty/bintray.gradle
diff --git a/anetty/build.gradle b/anetty/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'com.vanniktech.maven.publish'
+}
+
+android {
+    namespace 'com.king.anetty'
+    compileSdk build_versions.compileSdk
+
+    defaultConfig {
+        minSdk build_versions.minSdk
+        targetSdk build_versions.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lint {
+        abortOnError false
+    }
+}
+
+dependencies {
+    testImplementation "junit:junit:$versions.junit"
+    androidTestImplementation "androidx.test.ext:junit:$versions.androidExtJunit"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$versions.espressoCore"
+
+    api "io.netty:netty-all:$versions.netty"
+}
diff --git a/anetty/consumer-rules.pro b/anetty/consumer-rules.pro
diff --git a/anetty/gradle.properties b/anetty/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ANetty
+POM_ARTIFACT_ID=anetty
+POM_PACKAGING=aar
diff --git a/lib/proguard-rules.pro → anetty/proguard-rules.pro b/lib/proguard-rules.pro → anetty/proguard-rules.pro
diff --git a/.../king/anetty/ExampleInstrumentedTest.java → .../king/anetty/ExampleInstrumentedTest.java b/.../king/anetty/ExampleInstrumentedTest.java → .../king/anetty/ExampleInstrumentedTest.java
diff --git a/lib/src/main/AndroidManifest.xml → anetty/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml → anetty/src/main/AndroidManifest.xml