修复了 vip 为 5 时会崩溃的问题

Author: sicp618

app/src/main/java/net/coding/program/common/widget/MemberIcon.java

@@ -36,13 +36,6 @@ public MemberIcon(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-
-    }
-
     @Override
     public void setTag(Object tag) {
         super.setTag(tag);
@@ -52,7 +45,7 @@ public void setTag(Object tag) {
     public void setFlagIcon(Object tag) {
         if (tag instanceof UserObject) {
             VIP vip = ((UserObject) tag).vip;
-            if (vip.getIcon() == 0) {
+            if (vip == null || vip.getIcon() == 0) {
                 flagIcon = null;
             } else {
                 flagIcon = getResources().getDrawable(vip.getIcon());

app/src/main/java/net/coding/program/setting/MainSettingFragment.kt

@@ -67,32 +67,13 @@ open class MainSettingFragment : BaseFragment() {
             return
         }
 
-        vip?.text = me.vip.alias
-        if (me.vip.isPayed) {
-            val time = Global.dayFromTime(me.vipExpiredAt)
-            val color = if (me.vipNearExpired()) CodingColor.fontRed else CodingColor.font3
-            expire.text = Global.createColorHtml("到期时间：", time, "", color)
-
-        } else {
-            expire.text = ""
-        }
-
-        vipIcon?.setImageResource(me.vip.icon)
-
         topTip?.visibility = View.GONE
 
-        if (me.vip.isPayed && me.vipNearExpired()) {
-            topTip?.visibility = View.VISIBLE
-            topTipText?.text = "会员过期将自动降级"
-            topTipText.setOnClickListener { showSingleDialog(R.string.tip_vip_expired) }
-        }
-
-        if (!GlobalData.isEnterprise()) {
-            itemAccount.text2.visibility = View.VISIBLE
-            itemAccount.text2.text = "${me.points_left} 码币"
-            itemAccount.text2.setTextColor(CodingColor.fontBlue)
-            itemAccount.text2.textSize = 13f
-        }
+        globalKey.text = me.global_key
+        itemAccount.text2.visibility = View.VISIBLE
+        itemAccount.text2.text = "${me.points_left} 码币"
+        itemAccount.text2.setTextColor(CodingColor.fontBlue)
+        itemAccount.text2.textSize = 13f
     }
 
     private fun bindData(serviceInfo: ServiceInfo) {

app/src/main/res/layout/fragment_main_setting.xml

@@ -94,27 +94,12 @@
                         android:layout_marginLeft="80dp"
                         android:orientation="horizontal">
 
-                        <com.flyco.roundview.RoundTextView
-                            android:id="@+id/vip"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:paddingBottom="2dp"
-                            android:paddingLeft="6dp"
-                            android:paddingRight="6dp"
-                            android:paddingTop="2dp"
-                            android:text="普通会员"
-                            android:textColor="@color/font_3"
-                            android:textSize="12sp"
-                            app:rv_backgroundColor="#FFD8DDE4"
-                            app:rv_cornerRadius="2dp" />
-
                         <TextView
-                            android:id="@+id/expire"
+                            android:id="@+id/globalKey"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_alignBottom="@id/userIcon"
                             android:layout_marginBottom="3dp"
-                            android:layout_marginLeft="8dp"
                             android:layout_toRightOf="@id/userIcon"
                             android:textColor="@color/font_3"
                             android:textSize="13sp"

common-coding/src/main/java/net/coding/program/network/constant/VIP.kt

@@ -18,7 +18,9 @@ enum class VIP constructor(var id: Int, var alias: String, var icon: Int) : Seri
     @SerializedName("3")
     gold(3, "黄金会员", R.drawable.member_gold),
     @SerializedName("4")
-    diamond(4, "钻石会员", R.drawable.member_diamond);
+    diamond(4, "钻石会员", R.drawable.member_diamond),
+    @SerializedName("5")
+    tencent(5, "", 0);
 
     val isPayed: Boolean
         get() = id >= 3