Tags: commonprogress/PushAll
Tags
Merge branch 'master' of https://github.com/commonprogress/pushdemo * 'master' of https://github.com/commonprogress/pushdemo: Update README.md Update README.md Update README.md Update README.md Update README.md 添加配置 添加配置 添加过滤 # Conflicts: # app/app.iml # demo/build.gradle # demo/demo.iml # demo/src/main/java/com/dongxl/huawei/demo/AgentBaseActivity.java # demo/src/main/java/com/dongxl/huawei/demo/HuaweiPushActivity.java # demo/src/main/java/com/dongxl/huawei/demo/HwIDActivity.java # demo/src/main/java/com/dongxl/huawei/demo/OpendeviceActivity.java # demo/src/main/java/com/dongxl/huawei/demo/PayActivity.java # demo/src/main/java/com/dongxl/huawei/demo/SnsActivity.java # demo/src/main/java/com/dongxl/oppo/component/OppoDemoActivity.java # demo/src/main/java/com/dongxl/oppo/component/WebActivity.java # demo/src/main/java/com/dongxl/push/JumpActivity.java # demo/src/main/java/com/dongxl/xiaomipush/TimeIntervalDialog.java # demo/src/main/java/com/example/jpushdemo/JPushMainActivity.java # demo/src/main/java/com/example/jpushdemo/PushSetActivity.java # demo/src/main/java/com/example/jpushdemo/SettingActivity.java # dongxlpush/build.gradle # dongxlpush/dongxlpush.iml