Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal class RealFeedController(private val service: FeedService) {
}
val cards = readFeed(root)
if (cards == current && pkg == source) return true
removeMasks()
masks.clear()
source = pkg
current = cards
pending = cards
Expand Down Expand Up @@ -117,7 +117,6 @@ internal class RealFeedController(private val service: FeedService) {
}
}

private fun removeMasks() = masks.clear()
fun clear() { refresh?.let(main::removeCallbacks); refresh = null; generation++; current = emptyList(); pending = emptyList(); removeMasks() }
fun clear() { refresh?.let(main::removeCallbacks); refresh = null; generation++; current = emptyList(); pending = emptyList(); masks.clear() }
fun close() { closed = true; clear(); answers.clear(); revealed.clear(); worker.shutdownNow(); masks.close() }
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import android.graphics.BitmapFactory
import android.os.Bundle
import android.provider.Settings
import android.text.InputFilter
import android.view.View
import android.widget.*
import java.io.File

Expand All @@ -20,7 +19,7 @@ class DiagnosticsActivity : Activity() {
private lateinit var feedSwitch: Switch
private var updatingSwitches = false
private val preferences by lazy { Preferences(this) }
private fun dp(value: Int) = (value * resources.displayMetrics.density).toInt()
private fun dp(value: Int) = ProductUi.dp(this, value)

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand All @@ -35,7 +34,7 @@ class DiagnosticsActivity : Activity() {
return "观察到 ${counts.values.sum()} 次内容展示\n" + counts.entries.joinToString("\n") { "${it.key.label}:${it.value}次" }
}
AlertDialog.Builder(this).setTitle("本次信息流统计")
.setMessage("真实应用\n${counts(false)}\n\n验证场(不计入父母统计)\n${counts(true)}\n\n模型仅返回保留、过滤或不确定,不输出话题,内容记为未分类。小红书实验筛选暂不计入话题统计。次数表示观察到的展示,不代表观看时长。仅保存在本次进程,清空记录或进程结束后清除。")
.setMessage("真实应用\n${counts(false)}\n\n验证场(不计入父母统计)\n${counts(true)}\n\n模型仅返回保留、过滤或不确定,不输出话题,内容记为未分类。真实应用实验筛选暂不计入话题统计。次数表示观察到的展示,不代表观看时长。仅保存在本次进程,清空记录或进程结束后清除。")
.setPositiveButton("关闭", null).show()
}
status = label("", Type.SUPPORT)
Expand Down
2 changes: 1 addition & 1 deletion design/icon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

![后生](../../app/src/main/res/drawable-nodpi/ic_housheng.png)

原稿即 Android 使用的 PNG,只有一份。自适应图标通过原生 Drawable 留出裁切边距,不重绘原图,不预切圆角。前景与背景配置见 `app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml`。
原稿即 Android 使用的 PNG,只有一份。自适应图标通过原生 Drawable 留出裁切边距,不重绘原图,不预切圆角。前景与背景配置见 `app/src/main/res/mipmap-anydpi/ic_launcher.xml`。

`housheng-rounded.png`(512×512,圆角半径 22.37%,透明角)只用于 README 和商店展示。启动器图标仍走自适应图标,圆角由系统裁切。

Expand Down
Loading