Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

memory-card and stateswitch #64

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
620aeb9
extends Event
LuSingTea Jul 7, 2020
db80819
add some demo
LuSingTea Jul 7, 2020
83cb4b5
add StorageBackend implements
LuSingTea Jul 7, 2020
f9543fa
add MemoryCard.kt
LuSingTea Jul 7, 2020
8312cb2
add MemoryCard.kt method like load save, delete
LuSingTea Jul 7, 2020
7854172
add StateSwitch.kt method like on,off
LuSingTea Jul 7, 2020
3f09b5e
update StorageNop.kt StorageObs.kt StorageS3.kt
LuSingTea Jul 8, 2020
db363ce
简化json存储形式
LuSingTea Jul 8, 2020
50d9131
update StorageObs.kt and MemoryCard.kt
LuSingTea Jul 9, 2020
96bb05f
添加华为云
LuSingTea Jul 9, 2020
62cfbd5
add some onXXX Event
LuSingTea Jul 9, 2020
8fd067c
update contact
LuSingTea Jul 11, 2020
203fced
update format
LuSingTea Jul 11, 2020
10c8c7d
完善obs后端和memory card接口
LuSingTea Jul 11, 2020
4d202d9
add conurrent dependency
LuSingTea Jul 11, 2020
bb44289
update some format
LuSingTea Jul 14, 2020
0236b41
update Storage and StateSwitch
LuSingTea Jul 16, 2020
ab8ee96
修改包名命名错误,添加阿里云oss依赖
LuSingTea Jul 16, 2020
1dc8f51
1. 添加阿里云oss后端
LuSingTea Jul 17, 2020
e47298c
1. 完善阿里云oss后端
LuSingTea Jul 18, 2020
6c5fce5
1. 讲match修改为containsMatchIn
LuSingTea Jul 18, 2020
faa5b6f
1. 修改格式
LuSingTea Jul 18, 2020
62342f3
1. 将方法改为同步
LuSingTea Jul 19, 2020
709fb78
1. 删除多余的close语句
LuSingTea Jul 19, 2020
6cc7707
1. 删除不应该显示的信息
LuSingTea Jul 19, 2020
2925fd7
1. 添加StateSwitchListener
LuSingTea Jul 19, 2020
95add40
1. ready变为runblocking
LuSingTea Jul 19, 2020
37def84
1. 添加StateSwitchListener
LuSingTea Jul 19, 2020
d3e2065
Delete MemoryCardTest.kt
LuSingTea Jul 19, 2020
d029137
1. 添加memorycard和stateswitch测试文件
LuSingTea Jul 21, 2020
d278f8b
Merge remote-tracking branch 'origin/master'
LuSingTea Jul 21, 2020
59a9c33
1. 修改stateSwitch on和off的返回值
LuSingTea Jul 22, 2020
6ab498f
1. 暂时添加了memory和stateswitch
LuSingTea Jul 24, 2020
35efab6
1. 添加获取qrcode,name,signture方法
LuSingTea Jul 24, 2020
2eea542
1. 添加获取owner和avatar方法
LuSingTea Jul 24, 2020
9fe61a1
1. 添加hello, type方法
LuSingTea Jul 24, 2020
a9d0ad2
1. Contact.kt添加type,province等一系列方法
LuSingTea Jul 25, 2020
1170012
1. Contact.kt添加friend方法
LuSingTea Jul 26, 2020
225d494
1. 添加plugin-contrib依赖(忘了为什么添加了)
LuSingTea Aug 3, 2020
c5b240c
1. 改正日志实例的类
LuSingTea Aug 3, 2020
9b4f815
1. 添加FriendShipmanger
LuSingTea Aug 3, 2020
67b62c2
1. 修复查找房间联系人的时候联系人没有payload的bug
LuSingTea Aug 3, 2020
4629b61
1. 简化代码
LuSingTea Aug 3, 2020
66b7270
Merge branch 'master' into master
LuSingTea Aug 3, 2020
1bf44c7
Merge remote-tracking branch 'origin/master'
LuSingTea Aug 3, 2020
6c129a6
1 解决冲突
LuSingTea Aug 3, 2020
b8bf47a
1 删除暂时没用的测试文件
LuSingTea Aug 6, 2020
c594ad8
delete demo file
LuSingTea Aug 6, 2020
fac8b23
1. 获取属性的方法变为getXXX
LuSingTea Aug 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 12 additions & 24 deletions examples/src/main/java/io/github/wechaty/example/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import io.github.wechaty.Wechaty;
import io.github.wechaty.user.Contact;
import io.github.wechaty.user.Room;
import io.github.wechaty.utils.QrcodeUtils;
import okhttp3.OkHttpClient;
Expand All @@ -16,37 +17,24 @@ public class Main {
public static void main(String[] args){

Wechaty bot = Wechaty.instance("your_token")
.onScan((qrcode, statusScanStatus, data) -> System.out.println(QrcodeUtils.getQr(qrcode)))
.onLogin(user -> System.out.println(user))
.onScan((qrcode, statusScanStatus, data) -> {
System.out.println(QrcodeUtils.getQr(qrcode));
System.out.println("Online Image: https://wechaty.github.io/qrcode/" + qrcode);
})
.onLogin(user -> System.out.println(user.name() + "login"))
.onMessage(message -> {
Room room = message.room();
String text = message.text();
if (StringUtils.equals(text, "#ding")) {
Contact from = message.from();
if (StringUtils.equals(text, "ding")) {
if (room != null) {
room.say("dong");
}
else {
// say something to from contact
from.say("hello:" + from.name());
}
}
}).start(true);

// }

// Room room = bot.room();
//
// RoomQueryFilter roomQueryFilter = new RoomQueryFilter();
//
// roomQueryFilter.setTopic("ChatOps - Donut");
//
// Future<List<Room>> all = room.findAll(roomQueryFilter);
//
// List<Room> rooms = all.get();
//
// Room room1 = rooms.get(0);
//
// FileBox fileBox = FileBox.fromFile("dong.jpg", "dong.jpg");
//
// room1.say(fileBox).get();

}


}
37 changes: 26 additions & 11 deletions wechaty-puppet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
<version>1.3.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine -->
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
Expand All @@ -40,15 +44,11 @@
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- &lt;!&ndash;log4j2核心包&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.apache.logging.log4j</groupId>-->
<!-- <artifactId>log4j-api</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.logging.log4j</groupId>-->
<!-- <artifactId>log4j-core</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.11.636</version>
</dependency>

<!-- &lt;!&ndash;用于与slf4j保持桥接&ndash;&gt;-->
<!-- <dependency>-->
Expand Down Expand Up @@ -105,7 +105,22 @@
<artifactId>okhttp</artifactId>
</dependency>


<!-- https://mvnrepository.com/artifact/com.huaweicloud/esdk-obs-java -->
<dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java</artifactId>
<version>3.19.7</version>
</dependency>
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.10.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<scm>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.wechaty

enum class StateEnum {
import io.github.wechaty.eventEmitter.Event

enum class StateEnum: Event {
PENDING,ON,OFF;

}
}
Loading