[pull] master from gedoor:master #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* 进度同步补充： 在初始阅读界面时拉取云端进度 --> 初始阅读界面保留原有拉取逻辑，除此之外的阅读界面处于已恢复状态时执行同步云端进度，若云端进度快于本地则弹窗提醒是否同步 无 --> 监听到网络切换到有网环境时执行同步云端进度，若云端进度快于本地则弹窗提醒是否同步 页面进入已暂停状态时上传阅读进度 --> 页面进入已暂停状态时执行同步云端进度 以上新增的同步云端进度逻辑为：如果本地进度快于服务器进度或者没有进度则进行上传，如果慢与服务器进度则返回云端进度按需执行 * 点击区域增加同步阅读进度功能 * 阅读界面初始化同步逻辑修改 * merge * merge * merge * 增加覆盖云端进度 * merge * merge * 多次弹窗问题修改 * 补充的同步功能增加配置开关 * Revert "优化" This reverts commit d51d0f8. * merge --------- Co-authored-by: mozhu <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )