CodeCow/Auto.js
1
0
Fork 0
mirror of https://github.com/TonyJiangWJ/Auto.js.git synced 2026-06-29 21:03:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

完善 市场界面按钮显示

Browse Source
This commit is contained in:
hyb1996 2019-01-28 10:57:19 +08:00
parent f2c636d599
commit 402a78c354
11 changed files with 223 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/autojs/autojs/network/TopicService.kt
View File

@ -1,6 +1,7 @@
package org.autojs.autojs.network
import org.autojs.autojs.network.api.TopicApi
import org.autojs.autojs.network.entity.topic.Post
import org.autojs.autojs.network.entity.topic.Topic
object TopicService {
@ -16,6 +17,12 @@ object TopicService {
}
}
suspend fun getMainPost(topic: Topic): Post {
val fullTopic = mTopicApi.getTopic(topic.tid.toLong()).await()
topic.mainPost = fullTopic.posts.first { post -> post.pid == topic.mainPid }
return topic.mainPost
}
suspend fun getScriptsTopics(): List<Topic> {
return getTopics(CID_SCRIPTS)
}

4
app/src/main/java/org/autojs/autojs/network/api/TopicApi.kt
View File

@ -2,6 +2,7 @@ package org.autojs.autojs.network.api
import kotlinx.coroutines.Deferred
import org.autojs.autojs.network.entity.topic.Category
import org.autojs.autojs.network.entity.topic.Post
import org.autojs.autojs.network.entity.topic.Topic
import retrofit2.http.GET
import retrofit2.http.Path
@ -12,6 +13,7 @@ interface TopicApi {
fun getCategory(@Path("cid") cid: Long): Deferred<Category>
@GET("/api/topic/{tid}")
fun getTopic(@Path("tid") cid: Long): Deferred<Topic>
fun getTopic(@Path("tid") pid: Long): Deferred<Topic>
}

2
app/src/main/java/org/autojs/autojs/network/entity/topic/AppInfo.java
View File

@ -8,6 +8,8 @@ import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
public class AppInfo {
public static final String PERMISSION_ROOT = "root";
@SerializedName("details")
private String mDetails;
@SerializedName("email")

17
app/src/main/java/org/autojs/autojs/network/entity/topic/Topic.java
View File

@ -80,6 +80,7 @@ public class Topic {
private Post mTeaser;
private AppInfo mAppInfo;
private Post mMainPost;
public Category getCategory() {
return mCategory;
@ -339,6 +340,22 @@ public class Topic {
}
}
public Post getTeaser() {
return mTeaser;
}
public void setTeaser(Post teaser) {
mTeaser = teaser;
}
public Post getMainPost() {
return mMainPost;
}
public void setMainPost(Post mainPost) {
mMainPost = mainPost;
}
@Override
public String toString() {
return "Topic{" +

58
app/src/main/java/org/autojs/autojs/ui/main/market/ImageText.kt Normal file
View File

@ -0,0 +1,58 @@
package org.autojs.autojs.ui.main.market
import android.content.Context
import android.util.AttributeSet
import android.view.Gravity
import android.view.View
import android.widget.LinearLayout
import kotlinx.android.synthetic.main.image_text.view.*
import org.autojs.autojs.R
class ImageText : LinearLayout {
var text: CharSequence?
get() = textView.text
set(value) {
textView.text = value
}
constructor(context: Context?) : super(context) {
init(null)
}
constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
init(attrs)
}
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
init(attrs)
}
private fun init(attrs: AttributeSet?) {
View.inflate(context, R.layout.image_text, this)
gravity = Gravity.CENTER
orientation = HORIZONTAL
if (attrs == null) {
return
}
val a = context.obtainStyledAttributes(attrs, R.styleable.ImageText)
a.getString(R.styleable.ImageText_text)?.let {
textView.text = it
}
val iconResId = a.getResourceId(R.styleable.ImageText_src, 0)
if (iconResId != 0) {
imageView.setImageResource(iconResId)
}
val imageWidth = a.getDimensionPixelSize(R.styleable.ImageText_image_width, 0)
if (imageWidth != 0) {
imageView.layoutParams.width = imageWidth
}
a.recycle()
}
fun setColor(color: Int) {
textView.setTextColor(color)
imageView.setColorFilter(color)
}
}

106
app/src/main/java/org/autojs/autojs/ui/main/market/MarketFragment.kt
View File

@ -6,6 +6,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.stardust.autojs.workground.WrapContentLinearLayoutManager
@ -15,6 +16,8 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.autojs.autojs.R
import org.autojs.autojs.network.TopicService
import org.autojs.autojs.network.entity.topic.AppInfo
import org.autojs.autojs.network.entity.topic.Post
import org.autojs.autojs.network.entity.topic.Topic
import org.autojs.autojs.ui.main.ViewPagerFragment
import org.autojs.autojs.ui.widget.AvatarView
@ -59,11 +62,89 @@ class MarketFragment : ViewPagerFragment(0) {
inner class TopicViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val rootView: TextView = itemView.findViewById(R.id.root)
val titleView: TextView = itemView.findViewById(R.id.title)
val avatarView: AvatarView = itemView.findViewById(R.id.avatar)
val usernameView: TextView = itemView.findViewById(R.id.username)
val dateView: TextView = itemView.findViewById(R.id.date)
private lateinit var topic: Topic
private val rootView: TextView = itemView.findViewById(R.id.root)
private val titleView: TextView = itemView.findViewById(R.id.title)
private val avatarView: AvatarView = itemView.findViewById(R.id.avatar)
private val usernameView: TextView = itemView.findViewById(R.id.username)
private val dateView: TextView = itemView.findViewById(R.id.date)
private val upvoteView: ImageText = itemView.findViewById(R.id.upvote)
private val downvoteView: ImageText = itemView.findViewById(R.id.downvote)
private val downloadView: ImageText = itemView.findViewById(R.id.download)
private val starView: ImageText = itemView.findViewById(R.id.star)
init {
upvoteView.setOnClickListener {
}
downvoteView.setOnClickListener {
}
starView.setOnClickListener {
}
downloadView.setOnClickListener {
}
}
fun bind(topic: Topic) {
this.topic = topic
rootView.setText(if (topic.appInfo.permissions.contains(AppInfo.PERMISSION_ROOT)) {
R.string.text_root
} else {
R.string.text_no_root
})
titleView.text = topic.title
avatarView.setUser(topic.user)
usernameView.text = topic.user.username
dateView.text = DateTimeFormat.mediumDateTime().print(topic.timestamp.toLong())
if (topic.mainPost != null) {
bindMainPost(topic.mainPost)
} else {
fetchMainPost(topic)
}
}
private fun fetchMainPost(topic: Topic) {
GlobalScope.launch(Dispatchers.Main) {
try {
val mainPost = TopicService.getMainPost(topic)
if (topic === this@TopicViewHolder.topic) {
bindMainPost(mainPost)
}
} catch (e: Exception) {
e.printStackTrace()
}
}
}
private fun bindMainPost(mainPost: Post) {
context?.let { context ->
upvoteView.text = if (mainPost.upvotes == 0L) {
context.getString(R.string.text_upvote)
} else {
mainPost.upvotes.toString()
}
upvoteView.setColor(if (mainPost.upvoted) {
ContextCompat.getColor(context, R.color.market_button_selected)
} else {
ContextCompat.getColor(context, R.color.market_button_unselected)
})
downvoteView.text = if (mainPost.downvotes == 0L) {
context.getString(R.string.text_downvote)
} else {
mainPost.downvotes.toString()
}
downvoteView.setColor(if (mainPost.downvoted) {
ContextCompat.getColor(context, R.color.market_button_selected)
} else {
ContextCompat.getColor(context, R.color.market_button_unselected)
})
}
}
}
@ -77,21 +158,8 @@ class MarketFragment : ViewPagerFragment(0) {
}
override fun onBindViewHolder(holder: TopicViewHolder, position: Int) {
val topic = mTopics[position]
holder.run {
val root = topic.appInfo.permissions.contains("root")
rootView.text = if (root) {
"Root"
} else {
"免Root"
}
titleView.text = topic.title
avatarView.setUser(topic.user)
usernameView.text = topic.user.username
dateView.text = DateTimeFormat.mediumDateTime().print(topic.timestamp.toLong())
}
holder.bind(topic)
}
}

17
app/src/main/res/layout/image_text.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:tint="#939393"/>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</merge>

31
app/src/main/res/layout/item_topic.xml
View File

@ -93,37 +93,44 @@
android:paddingTop="3dp"
android:paddingBottom="3dp">
<ImageView
<org.autojs.autojs.ui.main.market.ImageText
android:id="@+id/download"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:src="@drawable/download"
android:tint="#939393"/>
android:background="?selectableItemBackgroundBorderless"
android:tint="#939393"
app:image_width="30dp"
app:src="@drawable/download"
app:text="@string/text_download"/>
<ImageView
<org.autojs.autojs.ui.main.market.ImageText
android:id="@+id/upvote"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:src="@drawable/upvote"
android:tint="#939393"/>
android:background="?selectableItemBackgroundBorderless"
app:image_width="30dp"
app:src="@drawable/upvote"/>
<ImageView
<org.autojs.autojs.ui.main.market.ImageText
android:id="@+id/downvote"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:src="@drawable/downvote"
android:tint="#939393"/>
android:background="?selectableItemBackgroundBorderless"
app:image_width="30dp"
app:src="@drawable/downvote"/>
<ImageView
<org.autojs.autojs.ui.main.market.ImageText
android:id="@+id/star"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:src="@drawable/star"
android:tint="#939393"/>
android:background="?selectableItemBackgroundBorderless"
app:image_width="30dp"
app:src="@drawable/star"
app:text="@string/text_star"/>
</LinearLayout>

6
app/src/main/res/values/attrs.xml
View File

@ -35,4 +35,10 @@
<attr name="cam_angle" format="integer"/>
</declare-styleable>
<declare-styleable name="ImageText">
<attr name="text"/>
<attr name="src"/>
<attr name="image_width" format="dimension|reference"/>
</declare-styleable>
</resources>

3
app/src/main/res/values/colors.xml
View File

@ -26,7 +26,8 @@
<color name="toolbar_disabled">#77e0e0e0</color>
<color name="console_debug">#cc000000</color>
<color name="console_verbose">#dfc0c0c0</color>
<color name="market_button_selected">#e14123</color>
<color name="market_button_unselected">#939393</color>
</resources>

5
app/src/main/res/values/strings.xml
View File

@ -400,6 +400,11 @@
<string name="text_usage_stats_permission">查看使用统计权限</string>
<string name="description_usage_stats_permission">通过\"查看使用统计\"权限可以获取本设备过去使用应用的情况，从而使获取当前应用(currentPackage)时更准确。</string>
<string name="text_open_with">打开方式</string>
<string name="text_root">Root</string>
<string name="text_no_root">免Root</string>
<string name="text_star">收藏</string>
<string name="text_upvote">赞</string>
<string name="text_downvote">踩</string>
<plurals name="air_error_short_description" key="air_error_short_description">
<item quantity="one">描述至少要 %d 个字.</item>
<item quantity="other">描述至少要 %d 个字.</item>