diff --git a/app/build.gradle b/app/build.gradle index aab9982..f725138 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ android { } debug { - minifyEnabled false + minifyEnabled true signingConfig signingConfigs.signs proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' @@ -130,7 +130,9 @@ dependencies { // implementation platform(libs.firebase.bom) 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") + implementation("com.google.firebase:firebase-messaging:24.1.1") + // implementation "androidx.datastore:datastore-preferences:1.0.0" + } \ No newline at end of file diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java index b61b40e..3960d88 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java @@ -633,7 +633,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity { gsGooglePayInfo = new GSGooglePayInfo(); gsGooglePayInfo.setOrder_code(current_order_code); @@ -499,8 +499,12 @@ public class UBJPrivateOllowFragment extends Fragment { } } }); - seenMarkView.getPaySetting(0, 0); - zytGooglePayUtils.startConnection(connect -> isConnect = connect); + zytGooglePayUtils.startConnection(connect -> { + isConnect = connect; + if(isConnect){ + seenMarkView.getPaySetting(0, 0); + } + }); vipPurchaseDialog = new VipPurchaseDialog(getActivity()); vipPurchaseDialog.setItemClickListener(new VipPurchaseDialog.onItemClickListener() { @Override @@ -519,7 +523,7 @@ public class UBJPrivateOllowFragment extends Fragment { }); vipPurchaseDialog.show(); - } + // } } private long dismissUniqueCookieCorePlay() { diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java index 53f11de..6d3a611 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java @@ -1,5 +1,6 @@ package com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn; +import static android.view.View.GONE; import static android.view.View.VISIBLE; import android.os.Handler; @@ -205,10 +206,13 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity> tabDataMap = new HashMap<>(); @@ -130,7 +130,7 @@ public class CClickFragment extends DialogFragment { // return; // } // } - pageEpisodesSeriesCallBack.chooseEpisodesSeries(item); + pageEpisodesSeriesCallBack.chooseEpisodesSeries(item,position); dismiss(); }); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java index b72acf2..d53fdfa 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java @@ -1,6 +1,8 @@ package com.shortdrama.jelly.zyreotv.topics.abslRwgt.poolref; import static android.text.Html.FROM_HTML_MODE_LEGACY; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; import android.app.AlertDialog; import android.app.Dialog; @@ -133,11 +135,14 @@ public class ZYTEpisodesRechargeDialogFragment extends DialogFragment { requireActivity().runOnUiThread(new Runnable() { @Override public void run() { + dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setVisibility(VISIBLE); coinAdapter.submitList(listCoins(list, "small")); coinLargeAdapter.submitList(listCoins(list, "big")); } }); + }else { + dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setVisibility(GONE); } } @@ -147,10 +152,13 @@ public class ZYTEpisodesRechargeDialogFragment extends DialogFragment { requireActivity().runOnUiThread(new Runnable() { @Override public void run() { + dialogRechargeBinding.layoutStoreRecharge.tvStoreVip.setVisibility(VISIBLE); subVipAdapter.submitList(list); } }); + }else{ + dialogRechargeBinding.layoutStoreRecharge.tvStoreVip.setVisibility(GONE); } } }); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java index efd6515..50632e5 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java @@ -6,6 +6,7 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_UserWeb_Refresh_Event; +import static com.shortdrama.jelly.zyreotv.beginning.ITItem.isCanPlay; import android.annotation.SuppressLint; import android.net.Uri; @@ -172,7 +173,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity 0) { @@ -366,12 +367,12 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity { if (it != null) { if (it.data != null && it.data.getList() != null && !it.data.getList().isEmpty()) { - ITItem.isCanPlay = false; + isCanPlay = false; viewBinding.viewVideoRecommend.getRoot().setVisibility(VISIBLE); recommondVideoBannerAdapter = new ZYTRecommondVideoAdapter(it.data.getList()); recommondVideoBannerAdapter.setDatas(it.data.getList()); viewBinding.viewVideoRecommend.bannerRecommend.setAdapter(recommondVideoBannerAdapter); - // viewBinding.viewVideoRecommend.bannerRecommend.setCurrentItem(1, false); + // viewBinding.viewVideoRecommend.bannerRecommend.setCurrentItem(1, false); viewBinding.viewVideoRecommend.bannerRecommend.addOnPageChangeListener(new OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { @@ -791,11 +792,17 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity list; @@ -74,18 +76,19 @@ public class VipPurchaseDialog extends Dialog { binding.tvDialogVippurchaseTitle.setText(Html.fromHtml(translates.getGleestream_vippurchase_dialog(), FROM_HTML_MODE_LEGACY)); binding.tvDialogVippurchaseTitle2.setText(translates.getGleestream_vippurchase_dialog_unlock()); - binding.tvDialogVippurchaseAdfree.setText(translates.getGleestream_vip_benefits_adfree()); - binding.tvDialogVippurchaseExclusive.setText(translates.getGleestream_vip_benefits_exclusive()); - binding.tvDialogVippurchaseDailyfree.setText(translates.getGleestream_vip_benefits_dailyfree()); - binding.tvDialogVippurchaseMembership.setText(translates.getGleestream_membership_recharge()); +// binding.tvDialogVippurchaseAdfree.setText(translates.getGleestream_vip_benefits_adfree()); +// binding.tvDialogVippurchaseExclusive.setText(translates.getGleestream_vip_benefits_exclusive()); +// binding.tvDialogVippurchaseDailyfree.setText(translates.getGleestream_vip_benefits_dailyfree()); +// binding.tvDialogVippurchaseMembership.setText(translates.getGleestream_membership_recharge()); } - subVipAdapter = new ZYTStoreSubVipAdapter(); - binding.recyclerviewDialogVippurchase.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false)); + subVipAdapter = new ZYTStoreSubVipMyAdapter(); + binding.recyclerviewDialogVippurchase.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false)); binding.recyclerviewDialogVippurchase.setAdapter(subVipAdapter); subVipAdapter.submitList(list); subVipAdapter.setOnItemClickListener((baseQuickAdapter, view, i) -> { if (itemClickListener != null) { + subVipAdapter.setCurrentPosition(i); itemClickListener.onSubvipItem(subVipAdapter.getItem(i)); } }); @@ -96,7 +99,8 @@ public class VipPurchaseDialog extends Dialog { Window window = getWindow(); WindowManager.LayoutParams wlp = window.getAttributes(); wlp.width = WindowManager.LayoutParams.MATCH_PARENT; - wlp.height = WindowManager.LayoutParams.MATCH_PARENT; + wlp.gravity = Gravity.CENTER; + wlp.height = WindowManager.LayoutParams.WRAP_CONTENT; window.setAttributes(wlp); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/ZYTStoreSubVipMyAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/ZYTStoreSubVipMyAdapter.java new file mode 100644 index 0000000..b6a3d01 --- /dev/null +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/ZYTStoreSubVipMyAdapter.java @@ -0,0 +1,157 @@ +package com.shortdrama.jelly.zyreotv.topics.dts; + +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + +import android.content.Context; +import android.graphics.Color; +import android.graphics.LinearGradient; +import android.graphics.Paint; +import android.graphics.Shader; +import android.text.TextPaint; +import android.view.ViewGroup; + +import androidx.appcompat.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.constraintlayout.widget.ConstraintLayout; + +import com.chad.library.adapter4.BaseQuickAdapter; +import com.chad.library.adapter4.viewholder.QuickViewHolder; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.beginning.AppUtils; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean; + + +public class ZYTStoreSubVipMyAdapter extends BaseQuickAdapter { + + + private int currentPosition = -1; + + + public void setCurrentPosition(int currentPosition) { + this.currentPosition = currentPosition; + notifyDataSetChanged(); + } + + @Override + protected void onBindViewHolder(QuickViewHolder holder, int position, ZYTPaySettingBean.Vip item) { + + + AppCompatImageView imageViewType = holder.getView(R.id.iv_vip_type); + AppCompatTextView tvTitle = holder.getView(R.id.tv_membership_title); + AppCompatTextView tvCurrency = holder.getView(R.id.tv_membership_pricetype); + AppCompatTextView tvPrice = holder.getView(R.id.tv_membership_price); + AppCompatTextView tvVipType = holder.getView(R.id.tv_membership_viptype); + AppCompatImageView ivselected = holder.getView(R.id.iv_selected); + String viptype = item.getVip_type_key(); + if (viptype.equals("year")) { + tvTitle.setTextColor(Color.parseColor("#00438D")); + tvCurrency.setTextColor(Color.parseColor("#00438D")); + tvPrice.setTextColor(Color.parseColor("#00438D")); + tvVipType.setTextColor(Color.parseColor("#00438D")); + imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_year); + } + if (viptype.equals("quarter")) { + tvTitle.setTextColor(Color.parseColor("#221C80")); + tvCurrency.setTextColor(Color.parseColor("#221C80")); + tvPrice.setTextColor(Color.parseColor("#221C80")); + tvVipType.setTextColor(Color.parseColor("#221C80")); + imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_quarter); + } + if (viptype.equals("week")) { + tvTitle.setTextColor(Color.parseColor("#71412B")); + tvCurrency.setTextColor(Color.parseColor("#71412B")); + tvPrice.setTextColor(Color.parseColor("#71412B")); + tvVipType.setTextColor(Color.parseColor("#71412B")); + imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_week); + } + if (viptype.equals("month")) { + tvTitle.setTextColor(Color.parseColor("#68003B")); + tvCurrency.setTextColor(Color.parseColor("#68003B")); + tvPrice.setTextColor(Color.parseColor("#68003B")); + tvVipType.setTextColor(Color.parseColor("#68003B")); + imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_month); + } +// if (position == 0) { +// constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_month); +// tvTitle.setTextColor(Color.parseColor("#68003B")); +// tvCurrency.setTextColor(Color.parseColor("#68003B")); +// tvPrice.setTextColor(Color.parseColor("#68003B")); +// tvVipType.setTextColor(Color.parseColor("#68003B")); +// tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_one_14dp); +// } +// if (position == 1) { +// constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_week); +// tvTitle.setTextColor(Color.parseColor("#71412B")); +// tvCurrency.setTextColor(Color.parseColor("#71412B")); +// tvPrice.setTextColor(Color.parseColor("#71412B")); +// tvVipType.setTextColor(Color.parseColor("#71412B")); +// tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_two_14dp); +// } +// if (position == 2) { +// constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_quarter); +// tvTitle.setTextColor(Color.parseColor("#221C80")); +// tvCurrency.setTextColor(Color.parseColor("#221C80")); +// tvPrice.setTextColor(Color.parseColor("#221C80")); +// tvVipType.setTextColor(Color.parseColor("#221C80")); +// tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_three_14dp); +// } +// if (position == 3) { +// constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_year); +// tvTitle.setTextColor(Color.parseColor("#00438D")); +// tvCurrency.setTextColor(Color.parseColor("#00438D")); +// tvPrice.setTextColor(Color.parseColor("#00438D")); +// tvVipType.setTextColor(Color.parseColor("#00438D")); +// tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_four_14dp); +// } + + if (currentPosition == position) { + ivselected.setVisibility(VISIBLE); + } else { + ivselected.setVisibility(GONE); + } + tvTitle.setText(item.getBrief() + ""); + tvCurrency.setText(item.getCurrency() + ""); + tvPrice.setText(item.getPrice() + ""); + tvVipType.setText("/" + item.getShort_type() + ""); + + + } + + @Override + public QuickViewHolder onCreateViewHolder(Context context, ViewGroup parent, int viewType) { + return new QuickViewHolder(R.layout.item_store_subviplist_my_zyt, parent); + } + + + private void applyGradient(AppCompatTextView textView, String startColor, String endColor) { + int width = textView.getWidth(); + int height = textView.getHeight(); + if (width == 0) width = textView.getMeasuredWidth(); // 防止为 0 + TextPaint textPaint = textView.getPaint(); + // 设置线性渐变 + Shader shader = new LinearGradient( + 0, 0, width, textView.getHeight(), // 斜向渐变 （水平渐变 高度为0） + new int[]{Color.parseColor(startColor), Color.parseColor(endColor)}, + null, + Shader.TileMode.CLAMP + ); + textPaint.setShader(shader); + textPaint.setStyle(Paint.Style.FILL); + textView.invalidate(); // 刷新视图 +// Shader shader = new RadialGradient( +// width/2f, +// height/2f, +// Math.max(width, height) / 2f, +// new int[]{Color.parseColor(startColor), Color.parseColor(endColor)}, +// new float[]{0f, 1f}, +// Shader.TileMode.CLAMP); +// textPaint.setShader(shader); +// textPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT)); +// // textPaint.setStyle(Paint.Style.FILL); +// textView.invalidate(); // 刷新视图 + + } + +} diff --git a/app/src/main/res/layout/activity_store.xml b/app/src/main/res/layout/activity_store.xml index b12e154..903fcf7 100644 --- a/app/src/main/res/layout/activity_store.xml +++ b/app/src/main/res/layout/activity_store.xml @@ -14,19 +14,15 @@ android:layout_alignParentTop="true" android:layout_marginTop="@dimen/margintoptitle" /> - + android:layout_marginBottom="@dimen/clickOdyload" /> - - + @@ -44,8 +51,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginStart="23dp" - android:layout_marginTop="14dp" + android:layout_marginStart="@dimen/headerSelectGradle" + android:layout_marginTop="@dimen/rewardsPlash" android:text="Go Premium \nElevate Your Binge!" android:textColor="#712B2B" android:textSize="18sp" @@ -58,82 +65,25 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/aboutAbout" android:text="Unlock 1000+ exclusive dramas" android:textColor="#AB7B7B" android:textSize="13sp" app:layout_constraintStart_toStartOf="@+id/tv_dialog_vippurchase_title" app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_title" /> - - - - - - - - - + app:layout_constraintBottom_toBottomOf="@+id/iv_vip_bg" + app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_title2" /> \ No newline at end of file diff --git a/app/src/main/res/layout/g_event_bottom.xml b/app/src/main/res/layout/g_event_bottom.xml index 2bb8482..cf53a06 100644 --- a/app/src/main/res/layout/g_event_bottom.xml +++ b/app/src/main/res/layout/g_event_bottom.xml @@ -9,8 +9,8 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/layout_store.xml b/app/src/main/res/layout/layout_store.xml index eca605b..ff04cf3 100644 --- a/app/src/main/res/layout/layout_store.xml +++ b/app/src/main/res/layout/layout_store.xml @@ -1,15 +1,16 @@ + android:layout_height="match_parent"> - @@ -79,6 +81,6 @@ android:layout_marginEnd="@dimen/followHistoryOllow" /> - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_bg.png index 8a45838..adc3932 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_bg.png and b/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_top.png b/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_top.png index b80f6fa..511cc51 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_top.png and b/app/src/main/res/mipmap-xxhdpi/ic_dialog_vippurchase_top.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_splash.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_splash.png new file mode 100644 index 0000000..ed60424 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_splash.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_splash.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_splash.webp deleted file mode 100644 index 3bc7a5e..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_splash.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vip_selector_my.png b/app/src/main/res/mipmap-xxhdpi/ic_vip_selector_my.png new file mode 100644 index 0000000..5c94c20 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vip_selector_my.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_month.png b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_month.png new file mode 100644 index 0000000..44f21ce Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_month.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_quarter.png b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_quarter.png new file mode 100644 index 0000000..3a8742d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_quarter.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_week.png b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_week.png new file mode 100644 index 0000000..e55e171 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_week.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_year.png b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_year.png new file mode 100644 index 0000000..f91ffee Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vippurchase_mybg_year.png differ diff --git a/gradle.properties b/gradle.properties index 27560a8..242456c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true +android.enableJetifier=true # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library @@ -23,6 +24,6 @@ android.nonTransitiveRClass=true #org.gradle.internal.http.socketTimeout=600000 # uploadCrashlyticsMappingFile systemProp.http.proxyHost=127.0.0.1 -systemProp.http.proxyPort=10809 +systemProp.http.proxyPort=26001 systemProp.https.proxyHost=127.0.0.1 -systemProp.https.proxyPort=10809 \ No newline at end of file +systemProp.https.proxyPort=26001 \ No newline at end of file