Merge branch 'master' into dev_share

main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.live.dialog.LiveAnchorSayPopDialog;
 import com.yunbao.live.dialog.LiveRobotSettingDialogFragment;
 import com.yunbao.main.R;
 import com.yunbao.main.activity.MainActivity;
@@ -46,6 +47,11 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
 
         ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
 
+        img_trophy.setOnLongClickListener(v -> {
+            new LiveAnchorSayPopDialog(mContext).setLiveUid("98275").showDialog();
+            return false;
+        });
+
 
     }
 

main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java

@@ -70,6 +70,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Created by cxf on 2018/9/22.
@@ -302,8 +303,15 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text));
         }
         String singnature = u.getSignature();
-        if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") ||TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
-            singnature ="The guy was lazy and didn't write anything.";
+        if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") || TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
+            String ct = Locale.getDefault().getCountry();
+            ct = TextUtils.equals("CN", ct) ? "HK" : ct;
+            if (TextUtils.equals(ct, "CN")) {
+                singnature = "這個人很懶，什麼也沒留下";
+            } else {
+                singnature = "The guy was lazy and didn't write anything.";
+            }
+
         }
         signature.setText(singnature);
         CommonAppConfig appConfig = CommonAppConfig.getInstance();

main/src/main/res/drawable/background_33ffffff.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="25dp" />
-            <solid android:color="#33FFFFFF" />
-        </shape>
-    </item>
-</selector>