diff --git a/app/build.gradle b/app/build.gradle index bee4ded..8140b11 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // alias(libs.plugins.firebase.perf) id("com.google.gms.google-services") id("com.google.firebase.firebase-perf") - // id("com.google.firebase.crashlytics") + // id("com.google.firebase.crashlytics") } @@ -119,9 +119,9 @@ dependencies { // implementation libs.firebase // implementation libs.firebase.messaging // implementation platform(libs.firebase.bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:33.13.0")) implementation("com.google.firebase:firebase-analytics") - // implementation("com.google.firebase:firebase-crashlytics") + //implementation("com.google.firebase:firebase-crashlytics") implementation("com.google.firebase:firebase-perf") implementation("com.google.firebase:firebase-messaging:24.0.0") } \ No newline at end of file diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java index 5a12c5f..c256548 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java @@ -13,7 +13,7 @@ public class LogUtils { } // public static boolean isDebug = ApiService.isDebug;// 是否需要打印bug，可以在application的onCreate函数里面初始化 - public static boolean isDebug = true; + public static boolean isDebug = false; // public static boolean isDebug = false;// 是否需要打印bug，可以在application的onCreate函数里面初始化 private static final String TAG = "GleeStreamLog"; diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java index 74fefba..17a2bd4 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java @@ -8,9 +8,11 @@ import java.util.HashMap; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.CFRewardsLoginBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.CWVIntentBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSDeepLinkResBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSLanguageBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ISeekbarBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.LSQExampleCloseBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ListBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.TConstantsEsultBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.TJEpisodeRoundBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.VPisodesAppnameBean; @@ -252,5 +254,8 @@ public interface KGZyreotv { @GET("translates") Observable> getTranslates(@Query("lang_key") String langkey); + @GET("languges") + Observable>> getLanguages(); + } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java index d773e32..18bd9da 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java @@ -7,6 +7,7 @@ import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppLeave; import android.graphics.Color; import androidx.appcompat.content.res.AppCompatResources; +import androidx.recyclerview.widget.LinearLayoutManager; import com.facebook.login.LoginManager; import com.shortdrama.jelly.zyreotv.R; @@ -17,6 +18,7 @@ import com.shortdrama.jelly.zyreotv.databinding.ActivityDeleteaccountBinding; import com.shortdrama.jelly.zyreotv.databinding.ActivityLanguageBinding; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.CommonSelectorDialog; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.IDDetailsRoundActivity; +import com.shortdrama.jelly.zyreotv.topics.dts.GSLanguageAdapter; import org.greenrobot.eventbus.EventBus; @@ -25,11 +27,14 @@ public class GSLanguageActivity extends IDDetailsRoundActivity finish()); - + binding.recyclerviewLanguage.setLayoutManager(new LinearLayoutManager(this)); + gsLanguageAdapter = new GSLanguageAdapter(); + binding.recyclerviewLanguage.setAdapter(gsLanguageAdapter); } @Override public void logic() { - userViewModel.getLogoffLiveData().observe(this, feedbackResp -> { - if (feedbackResp != null) { - PAYLoginHeaddefault.revealToast("Delete Account Succes", 0); - EventBus.getDefault() - .post(Constants_AppLeave); - LoginManager.getInstance().logOut(); - userViewModel.regist(); - } else { - PAYLoginHeaddefault.revealToast("The service is abnormal. Check the network.", 0); - } - - - }); - - userViewModel.getRegistLiveData().observe(this, feedbackResp -> { - if (feedbackResp != null && feedbackResp.data != null) { - TIndicator.saveString(TIndicator.auth, feedbackResp.data.getToken()); - userViewModel.getUserInfo(); - EventBus.getDefault() - .post(Constants_AppEnter); -// EventBus.getDefault() -// .post(CONSTANTS_User_Refresh_Event); - EventBus.getDefault() - .post(CONSTANTS_UserWeb_Refresh_Event); - GSLanguageActivity.this.finish(); - - } else { - PAYLoginHeaddefault.revealToast("The service is abnormal. Check the network.", 0); - } - }); + userViewModel.getLanguagesLiveData().observe(this, response -> { + if(response!=null&&response.data!=null){ + gsLanguageAdapter.submitList(response.data.getList()); + } + }); } } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java index 1a6d534..e5d1e53 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java @@ -19,7 +19,9 @@ import com.shortdrama.jelly.zyreotv.beginning.TIndicator; import com.shortdrama.jelly.zyreotv.dlsym.IMACloseStroke; import com.shortdrama.jelly.zyreotv.dlsym.RREStyles; import com.shortdrama.jelly.zyreotv.dlsym.VZBack; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSLanguageBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ListBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.TConstantsEsultBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.TJEpisodeRoundBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.VPisodesAppnameBean; @@ -55,8 +57,13 @@ public class GXCProgressLogin extends ViewModel { private final MutableLiveData> logoutLiveData = new MutableLiveData<>(); private final MutableLiveData> logoffLiveData = new MutableLiveData<>(); private final MutableLiveData> translaterLiveData = new MutableLiveData<>(); + private final MutableLiveData>> languagesLiveData = new MutableLiveData<>(); + public MutableLiveData>> getLanguagesLiveData() { + return languagesLiveData; + } + public MutableLiveData> getTranslaterLiveData() { return translaterLiveData; } @@ -985,4 +992,24 @@ public class GXCProgressLogin extends ViewModel { }); } + public void getLanguageList(){ + VZBack.getInstance().getLanguages() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new RREStyles<>() { + + + @Override + public void onSuccess(IMACloseStroke> o) { + languagesLiveData.setValue(o); + } + + + @Override + public void onError(int code, String msg) { + languagesLiveData.setValue(null); + } + }); + } + } \ No newline at end of file diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java index 08bddce..009325b 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java @@ -361,7 +361,7 @@ public class UBJPrivateOllowFragment extends Fragment { }); loadingdefaultRunning.tvOrderStore.setOnClickListener(v -> LRewards.startStore(getActivity())); loadingdefaultRunning.tvAboutUs.setOnClickListener(v -> LRewards.startAboutUsActiv(getActivity())); - loadingdefaultRunning.tvLanguage.setOnClickListener(v -> LRewards.startDeleteAccount(getActivity())); + loadingdefaultRunning.tvLanguage.setOnClickListener(v -> LRewards.startLanguage(getActivity())); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSLanguageAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSLanguageAdapter.java new file mode 100644 index 0000000..38c37e3 --- /dev/null +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSLanguageAdapter.java @@ -0,0 +1,48 @@ +package com.shortdrama.jelly.zyreotv.topics.dts; + +import android.content.Context; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.chad.library.adapter4.BaseQuickAdapter; +import com.chad.library.adapter4.viewholder.QuickViewHolder; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSLanguageBean; + +public class GSLanguageAdapter extends BaseQuickAdapter { + + + private OnItemClickListener onItemClickListener; + + public interface OnItemClickListener { + void onItemClick(BaseQuickAdapter adapter, int position); + } + + @Override + protected void onBindViewHolder(QuickViewHolder holder, int position, GSLanguageBean item) { + TextView tvShowName = holder.getView(R.id.tv_language_showname); + assert item != null; + tvShowName.setText(item.getShow_name()); + if(item.isSelector()){ + tvShowName.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(R.mipmap.iv_select_h), null); + }else{ + tvShowName.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(R.mipmap.iv_select_n), null); + + } + holder.itemView.setOnClickListener(v -> { + if (onItemClickListener != null) { + onItemClickListener.onItemClick(this, position); + } + }); + } + + @Override + public QuickViewHolder onCreateViewHolder(Context context, ViewGroup parent, int viewType) { + return new QuickViewHolder(R.layout.item_language_list_zyt, parent); + } + + public void setonItemClickListener(OnItemClickListener onItemClickListener) { + this.onItemClickListener = onItemClickListener; + } +} + diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSLanguageBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSLanguageBean.java index d051972..f82970f 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSLanguageBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSLanguageBean.java @@ -13,6 +13,16 @@ public class GSLanguageBean { private int id; private int is_default; + private boolean isSelector; + + public boolean isSelector() { + return isSelector; + } + + public void setSelector(boolean selector) { + isSelector = selector; + } + public String getCn_name() { return cn_name; } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/ListBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/ListBean.java new file mode 100644 index 0000000..5ac4b1a --- /dev/null +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/ListBean.java @@ -0,0 +1,16 @@ +package com.shortdrama.jelly.zyreotv.unconfirmedPiecewise; + +import java.util.List; + +public class ListBean { + + public List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/app/src/main/res/layout/activity_language.xml b/app/src/main/res/layout/activity_language.xml index 9fb8f47..6da90e3 100644 --- a/app/src/main/res/layout/activity_language.xml +++ b/app/src/main/res/layout/activity_language.xml @@ -10,13 +10,15 @@ layout="@layout/layout_toptitle_back_zyt" android:layout_width="match_parent" android:layout_height="?actionBarSize" - android:layout_marginTop="@dimen/margintoptitle" - android:layout_alignParentTop="true" /> + android:layout_alignParentTop="true" + android:layout_marginTop="@dimen/margintoptitle" /> + android:layout_marginStart="15dp" + android:layout_marginTop="@dimen/agreementLock" + android:layout_marginEnd="15dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_language_list_zyt.xml b/app/src/main/res/layout/item_language_list_zyt.xml index d079940..4e7ab11 100644 --- a/app/src/main/res/layout/item_language_list_zyt.xml +++ b/app/src/main/res/layout/item_language_list_zyt.xml @@ -10,7 +10,7 @@