hanjing 6 anos atrás
pai
commit
34e332f2b6

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -514,7 +514,8 @@ public class TestUtil {
                 break;
             case "测试内部h5": {
 //                Jump2View.getInstance().goWeb(activity, StringUtils.getCopyText().toString(), "小绵羊官网");
-                String url = "http://10.8.240.193:8082/#/payment?authorization=64239%40e90a3bf5f9cfd223%40024e900d3cc2db1c2c064d5bb0d52a95&order=6557891279164801024&ssnocache=1";
+//                String url = "http://10.8.240.193:8082/#/payment?authorization=64239%40e90a3bf5f9cfd223%40024e900d3cc2db1c2c064d5bb0d52a95&order=6557891279164801024&ssnocache=1";
+                String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_PAY + "?authorization=64239@e90a3bf5f9cfd223@d01420837e0fefd74c4ab9374a201bd8&order=6557891279164801024&ssnocache=1");
                 Jump2View.getInstance().goWeb(activity, url, "支付");
             }
                 break;

+ 23 - 19
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFindChild.java

@@ -353,31 +353,35 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             View find_item_placement = rootConvertView.findViewById(R.id.find_item_placement);
             ViewUtil.setVisibility(find_item_placement, item.getIs_placement() == 1);
 
-            if (item.isGame()) {
-                ViewUtil.setVisibility(find_item_download, View.VISIBLE);
-                Applications findApp = item.getApplication();
-                updateView(findApp, find_item_download);
-            } else {
-                ViewUtil.setVisibility(find_item_download, View.GONE);
+            if( find_item_download!=null) {
+                if (item.isGame()) {
+                    ViewUtil.setVisibility(find_item_download, View.VISIBLE);
+                    Applications findApp = item.getApplication();
+                    updateView(findApp, find_item_download);
+                } else {
+                    ViewUtil.setVisibility(find_item_download, View.GONE);
+                }
             }
             ViewUtil.setText(find_item_name, item.getTitle());
             ViewUtil.setTextTime(find_item_time, item.getCreated_at(), "yyyy-MM-dd");
             ViewUtil.setImage(find_item_iv, item.getPictures());
             ViewUtil.setText(find_item_des, item.getDes());
             item.removeNullTag();
-            if (ListUtil.isEmpty(item.getTages()) || find_item_tags == null) {
-                ViewUtil.setVisibility(find_item_tags, View.GONE);
-            } else {
-                ViewUtil.setVisibility(find_item_tags, View.VISIBLE);
-                TagAdapter adapter = new TagAdapter<ArticleTag>(item.getTages()) {
-                    @Override
-                    public View getView(FlowLayout parent, int position, ArticleTag item) {
-                        TextView tv = (TextView) LayoutInflater.from(activity).inflate(R.layout.find_item_tag, parent, false);
-                        ViewUtil.setText(tv, item.getName());
-                        return tv;
-                    }
-                };
-                find_item_tags.setAdapter(adapter);
+            if(find_item_tags == null) {
+                if (ListUtil.isEmpty(item.getTages())) {
+                    ViewUtil.setVisibility(find_item_tags, View.GONE);
+                } else {
+                    ViewUtil.setVisibility(find_item_tags, View.VISIBLE);
+                    TagAdapter adapter = new TagAdapter<ArticleTag>(item.getTages()) {
+                        @Override
+                        public View getView(FlowLayout parent, int position, ArticleTag item) {
+                            TextView tv = (TextView) LayoutInflater.from(activity).inflate(R.layout.find_item_tag, parent, false);
+                            ViewUtil.setText(tv, item.getName());
+                            return tv;
+                        }
+                    };
+                    find_item_tags.setAdapter(adapter);
+                }
             }
             rootConvertView.setOnClickListener(view -> onClickItem(item));
         }

+ 2 - 2
app/src/main/res/layout/fragment_sign_in.xml

@@ -48,7 +48,7 @@
             android:id="@+id/verify_box"
             style="@style/login_edit_style_name"
             android:layout_below="@+id/password_box"
-            android:layout_width="60dp"
+            android:layout_width="80dp"
             android:hint="验证码"
             android:visibility="gone"
             android:maxLength="16" />
@@ -67,7 +67,7 @@
         <View
             android:id="@+id/captcha_seperator"
             style="@style/login_separetor_line_style"
-            android:layout_width="60dp"
+            android:layout_width="80dp"
             android:visibility="gone"
             android:layout_below="@+id/verify_box" />
     </RelativeLayout>