فهرست منبع

上传排行榜

林婷婷 1 سال پیش
والد
کامیت
1377641ec8

+ 2 - 8
TMessagesProj/src/main/java/org/telegram/cricdit/adapter/PublishRankingAdapter.java

@@ -1,15 +1,11 @@
 package org.telegram.cricdit.adapter;
 
-import android.app.Activity;
 import android.content.Context;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 
-import com.airbnb.lottie.animation.content.Content;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
@@ -20,8 +16,6 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import org.telegram.cricdit.bean.PublishRankBean;
 import org.telegram.cricdit.utils.UIUtil;
 import org.telegram.messenger.R;
-import org.telegram.onecric.base.BaseActivity;
-import org.telegram.tgnet.TLRPC;
 
 import java.util.List;
 
@@ -35,9 +29,9 @@ public class PublishRankingAdapter extends BaseQuickAdapter<PublishRankBean, Bas
     @Override
     protected void convert(@NonNull BaseViewHolder helper, PublishRankBean item) {
         helper.setText(R.id.tv_name,item.name);
-        helper.setText(R.id.tv_info,item.info);
+        helper.setText(R.id.tv_info,item.introduce);
         Glide.with(helper.itemView)
-                .load(item.phoneUrl)
+                .load(item.img)
                 .placeholder(R.drawable.img_placeholder_short)
                 .apply(options)
                 .into((ImageView) helper.getView(R.id.iv_img));

+ 8 - 0
TMessagesProj/src/main/java/org/telegram/cricdit/bean/BaseCodeBean.java

@@ -0,0 +1,8 @@
+package org.telegram.cricdit.bean;
+
+public class BaseCodeBean {
+    public int code;
+    public String msg;
+    public String time;
+    public String data;
+}

+ 4 - 4
TMessagesProj/src/main/java/org/telegram/cricdit/bean/PublishRankBean.java

@@ -3,12 +3,12 @@ package org.telegram.cricdit.bean;
 public class PublishRankBean {
     public int position = -1;
     public String name;
-    public String info;
-    public String phoneUrl;
+    public String introduce;
+    public String img;
     public PublishRankBean(int position,String name,String info,String phoneUrl){
         this.position = position;
         this.name = name;
-        this.info = info;
-        this.phoneUrl = phoneUrl;
+        this.introduce = info;
+        this.img = phoneUrl;
     }
 }

+ 42 - 11
TMessagesProj/src/main/java/org/telegram/cricdit/mvp/PublishRankingPresenter.java

@@ -1,21 +1,35 @@
 package org.telegram.cricdit.mvp;
 
+import android.text.TextUtils;
+
 import org.telegram.cricdit.base.BaseObserver;
 import org.telegram.cricdit.base.BasePresenter;
+import org.telegram.cricdit.bean.BaseBean;
+import org.telegram.cricdit.bean.BaseCodeBean;
 import org.telegram.cricdit.bean.PersonFollowingBean;
 import org.telegram.cricdit.bean.PublishRankBean;
+import org.telegram.cricdit.config.Constants;
 import org.telegram.cricdit.net.ApiService;
 import org.telegram.cricdit.net.Parameter;
+import org.telegram.cricdit.net.RetrofitClient;
+import org.telegram.cricdit.utils.AESUtil;
+import org.telegram.cricdit.utils.GsonHel;
 import org.telegram.cricdit.utils.ParamsUtil;
+import org.telegram.cricdit.utils.SPUtils;
 import org.telegram.cricdit.utils.ToastUtil;
+import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.R;
 import org.telegram.messenger.UserConfig;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
 
 public class PublishRankingPresenter extends BasePresenter<PublishRankingView> {
 
@@ -43,22 +57,39 @@ public class PublishRankingPresenter extends BasePresenter<PublishRankingView> {
     public void publishRanking(String title, List<PublishRankBean> list){
         Parameter parameter = new Parameter();
         parameter.add("operationID", ParamsUtil.buildOperationID());
-        parameter.add("list", list);
+        parameter.add("data", list);
         parameter.add("title", title);
-        if (UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) {
-            parameter.add("master_uid", UserConfig.getInstance(UserConfig.selectedAccount).getCurrentUser().id + "");
-            parameter.add("user_id", UserConfig.getInstance(UserConfig.selectedAccount).getCurrentUser().id + "");
-        }
-        addSubscribe(create(ApiService.class).publicRanking(parameter.buildJsonBody()), new BaseObserver<String>() {
+        parameter.add("user_id", UserConfig.getInstance(UserConfig.selectedAccount).getCurrentUser().id + "");
+        ApiService apiService = RetrofitClient.getInstance().getRetrofit().create(ApiService.class);
+        Call<ResponseBody> responseCall = apiService.publicRanking(parameter.buildJsonBody());
+        responseCall.enqueue(new retrofit2.Callback<ResponseBody>() {
             @Override
-            protected void onSuccess(String data) {
-                if(getView()!=null){getView().showSuccess("");}
+            public void onResponse(Call<ResponseBody> call, retrofit2.Response<ResponseBody> response) {
+                try {
+                    if (response.body() == null) {
+                        return;
+                    }
+                    String string = response.body().string();
+                    if (TextUtils.isEmpty(string)) {
+                        return;
+                    }
+                    BaseCodeBean baseBean = GsonHel.fromJson(string, BaseCodeBean.class);
+                    if(getView()==null){
+                        return;
+                    }
+                    if (baseBean.code == 1) {
+                        getView().showSuccess(LocaleController.getString(R.string.publish_success));
+                    }else{
+                        getView().showSuccess(LocaleController.getString(R.string.publish_fail));
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
 
             @Override
-            public void onError(Throwable e) {
-                if(getView()!=null){getView().showError(e);}
-                super.onError(e);
+            public void onFailure(Call<ResponseBody> call, Throwable t) {
+                if(getView()!=null){getView().showError(t);}
             }
         });
     }

+ 2 - 2
TMessagesProj/src/main/java/org/telegram/cricdit/net/ApiService.java

@@ -173,7 +173,7 @@ public interface ApiService {
     @POST(Constants.APP_AUTH_URL + "/demo/video_limit")
     Observable<BaseResponse<VideoLimitBean>> getVideoLimit(@Body RequestBody requestBody);
 
-    @POST(Constants.APP_AUTH_URL + "/demo/xxx")
-    Observable<BaseResponse<String>> publicRanking(@Body RequestBody requestBody);
+    @POST("https://pf.cricdit.com/index.php/api/Rank/GetCategories")
+    Call<ResponseBody> publicRanking(@Body RequestBody requestBody);
 
 }

+ 8 - 4
TMessagesProj/src/main/java/org/telegram/cricdit/ui/PublishRankingActivity.java

@@ -11,6 +11,7 @@ import android.text.TextWatcher;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.EditorInfo;
@@ -43,6 +44,7 @@ import org.telegram.cricdit.utils.UIUtil;
 import org.telegram.messenger.AndroidUtilities;
 import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.R;
+import org.telegram.messenger.UserConfig;
 import org.telegram.ui.ActionBar.ActionBarMenu;
 import org.telegram.ui.ActionBar.ActionBarMenuItem;
 import org.telegram.ui.ActionBar.Theme;
@@ -135,8 +137,9 @@ public class PublishRankingActivity extends BaseActivity<PublishRankingPresenter
             }
             if(mPublishRankBeanList.size() > 1){
                 AndroidUtilities.hideKeyboard(et_title);
-                //fixme ltt 请求接口
-                presenter.publishRanking(title,mPublishRankBeanList);
+                if (UserConfig.getInstance(UserConfig.selectedAccount).isClientActivated()) {
+                    presenter.publishRanking(title,mPublishRankBeanList);
+                }
             }
         });
 
@@ -219,8 +222,8 @@ public class PublishRankingActivity extends BaseActivity<PublishRankingPresenter
     }
 
     @Override
-    public void showSuccess(String url) {
-        ToastUtil.show(getContext(),LocaleController.getString(R.string.publish_success));
+    public void showSuccess(String info) {
+        ToastUtil.show(getContext(),info);
         finishFragment();
     }
 
@@ -233,4 +236,5 @@ public class PublishRankingActivity extends BaseActivity<PublishRankingPresenter
         }
     }
 
+
 }

+ 2 - 2
TMessagesProj/src/main/java/org/telegram/cricdit/ui/PublishRankingEditActivity.java

@@ -245,10 +245,10 @@ public class PublishRankingEditActivity extends BaseActivity<PublishRankingPrese
 
     private void initData(){
         if(optionBean!=null){
-            photoUrl = optionBean.phoneUrl;
+            photoUrl = optionBean.img;
             Glide.with(getContext()).load(photoUrl).placeholder(R.mipmap.img_select_add).apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(UIUtil.dip2px(getContext(), 7)))).into(iv_select);
             et_name.setText(optionBean.name);
-            et_info.setText(optionBean.info);
+            et_info.setText(optionBean.introduce);
         }
     }
 

+ 2 - 1
TMessagesProj/src/main/res/values/string-cricdit.xml

@@ -139,7 +139,8 @@
     <string name="please_enter_name">Please enter a name</string>
     <string name="please_enter_introduction">Please enter a brief introduction</string>
     <string name="please_upload_image">Please upload a image.</string>
-    <string name="publish_success">Successful release</string>
+    <string name="publish_success">Submitted for review</string>
+    <string name="publish_fail">Submit failure</string>
     <string name="no_options">No more</string>
 
 </resources>