1
0

2 Commits b8e9daf88a ... 2d0fe98185

Autor SHA1 Nachricht Datum
  Huping 2d0fe98185 Google play 23 vor 1 Jahr
  Huping 6c1491b989 去除AES,添加赛程,新闻详情,排行榜举报按钮 vor 1 Jahr

+ 5 - 3
TMessagesProj/src/main/java/org/telegram/cricdit/config/Constants.java

@@ -8,11 +8,13 @@ public class Constants {
     //是否调试模式
     public static final boolean IS_DEBUG_MODEL = false;
     //默认IP
-    public static final String DEFAULT_IP = "13.233.101.67";
+//    public static final String DEFAULT_IP = "13.233.101.67";
     //Base Url地址
-    public static final String BASE_URL = "http://13.233.101.67";
+//    public static final String BASE_URL = "http://13.233.101.67";
+    public static final String BASE_URL = "https://api.cricdit.com";
     //登录注册手机验 证服务器地址
-    public static final String APP_AUTH_URL = BASE_URL + ":10004";
+//    public static final String APP_AUTH_URL = BASE_URL + ":10004";
+    public static final String APP_AUTH_URL = "https://api.cricdit.com";
 
     //About Us地址
     public static final String WEB_URL_ABOUT_US = "https://m.cricdit.com/About?flag=app";

+ 24 - 4
TMessagesProj/src/main/java/org/telegram/cricdit/ui/NewsDetailCommentFragment.java

@@ -47,6 +47,7 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.classic.common.MultipleStatusView;
+import com.lxj.xpopup.XPopup;
 import com.lzy.ninegrid.preview.ImagePreviewActivity;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
@@ -112,6 +113,7 @@ import org.telegram.cricdit.view.floatwindow.FloatingVideo;
 import org.telegram.cricdit.view.floatwindow.MoveType;
 import org.telegram.cricdit.view.floatwindow.Screen;
 import org.telegram.cricdit.view.floatwindow.Util;
+import org.telegram.cricdit.view.popup.ReportBottomPopup;
 import org.telegram.messenger.AndroidUtilities;
 import org.telegram.messenger.ApplicationLoader;
 import org.telegram.messenger.ChatObject;
@@ -123,6 +125,8 @@ import org.telegram.messenger.UserConfig;
 import org.telegram.tgnet.ConnectionsManager;
 import org.telegram.tgnet.TLObject;
 import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.ActionBar.ActionBarMenu;
+import org.telegram.ui.ActionBar.ActionBarMenuItem;
 import org.telegram.ui.ActionBar.AlertDialog;
 import org.telegram.ui.ChatActivity;
 import org.telegram.ui.Components.AvatarDrawable;
@@ -225,6 +229,7 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
     private ThreadPoolExecutor threadPool;
     private ImageView thumbImageView;
     private FloatPlayerView floatPlayerView;
+    private ActionBarMenu menu;
 
 
 //    @Override
@@ -291,6 +296,21 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
 
     @Override
     protected void initView(View rootView) {
+
+        menu = actionBar.createMenu();
+        ActionBarMenuItem actionBarMenuItem = menu.addItem(0, R.drawable.msg_report);
+        actionBarMenuItem.setIconColor(ColorUtil.COLOR_WHITE);
+
+        actionBarMenuItem.setOnClickListener(v -> {
+            new XPopup.Builder(getContext())
+                    .moveUpToKeyboard(false) //如果不加这个,评论弹窗会移动到软键盘上面
+                    .enableDrag(true)
+                    .isDestroyOnDismiss(true) //对于只使用一次的弹窗,推荐设置这个
+                    .asCustom(new ReportBottomPopup(getContext()))
+                    .show();
+        });
+
+
         alertDialog = new AlertDialog(getParentActivity(), 3);
         initViewNewsDetail();
         if (getArguments() != null) {
@@ -488,10 +508,10 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
         if (o.toString().contains("num")) {
             try {
                 CrcmaBean crcmaBean = GsonHel.fromJson(o.toString(), CrcmaBean.class);
-                if (crcmaBean!=null && !TextUtils.isEmpty(crcmaBean.num)) {
+                if (crcmaBean != null && !TextUtils.isEmpty(crcmaBean.num)) {
                     ToastUtil.show(ApplicationLoader.applicationContext, LocaleController.getString(R.string.CdCrcma) + crcmaBean.num);
                 }
-            } catch (Exception e){
+            } catch (Exception e) {
                 System.out.println(e.getMessage());
             }
         } else {
@@ -583,10 +603,10 @@ public class NewsDetailCommentFragment extends BaseActivity<CommentPresenter> im
         if (o.toString().contains("num")) {
             try {
                 CrcmaBean crcmaBean = GsonHel.fromJson(o.toString(), CrcmaBean.class);
-                if (crcmaBean!=null && !TextUtils.isEmpty(crcmaBean.num)) {
+                if (crcmaBean != null && !TextUtils.isEmpty(crcmaBean.num)) {
                     ToastUtil.show(ApplicationLoader.applicationContext, LocaleController.getString(R.string.CdCrcma) + crcmaBean.num);
                 }
-            } catch (Exception e){
+            } catch (Exception e) {
                 System.out.println(e.getMessage());
             }
         }

+ 0 - 4
TMessagesProj/src/main/java/org/telegram/cricdit/ui/RankDetailCommentFragment.java

@@ -212,16 +212,12 @@ public class RankDetailCommentFragment extends BaseActivity<CommentPresenter> im
         actionBarMenuItem.setIconColor(ColorUtil.COLOR_WHITE);
 
         actionBarMenuItem.setOnClickListener(v -> {
-            if (UserConfig.getInstance(currentAccount).isClientActivated()) {
                 new XPopup.Builder(getContext())
                         .moveUpToKeyboard(false) //如果不加这个,评论弹窗会移动到软键盘上面
                         .enableDrag(true)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗,推荐设置这个
                         .asCustom(new ReportBottomPopup(getContext()))
                         .show();
-            } else {
-                presentFragment(new LoginActivity());
-            }
         });