yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fell_me

Browse Source
This commit is contained in:
Martin 2024-10-07 09:55:48 +08:00
parent 380381c3fe
commit 0445ab4132
29 changed files with 92 additions and 3340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 169 KiB

2
app/src/main/res/values/strings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">PandoraLive</string>
<string name="app_name">FeelWe</string>
</resources>

3285
app/tmp/full-r8-config.txt
View File

File diff suppressed because it is too large Load Diff

4
common/src/main/java/com/yunbao/common/HtmlConfig.java
View File

@ -7,8 +7,8 @@ package com.yunbao.common;
public class HtmlConfig {
//登录即代表同意服务和隐私条款
public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=68";
public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=67";
public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=717";//隱私條款
public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=716";//用戶協議
//注册用户协议
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";

BIN
common/src/main/res/mipmap-mdpi/screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 KiB

After

Width:  |  Height:  |  Size: 169 KiB

4
common/src/main/res/values-en-rUS/strings.xml
View File

@ -1059,11 +1059,11 @@ Limited ride And limited avatar frame</string>
<string name="privacy_terms">Privacy Policy</string>
<string name="terms_and_policies">Terms and policies</string>
<string name="install_the_application">For details, please read the following message to install the application:</string>
<string name="treat_and_protect">Welcome to PandoraLive. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
<string name="treat_and_protect">Welcome to FeelWe. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
<string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
<string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
<string name="agreement">agreement</string>
<string name="come_to">Welcome to PandoraLive.</string>
<string name="come_to">Welcome to FeelWe.</string>
<string name="live_gift">gift</string>
<string name="register_tip_2">User service agreement</string>
<string name="live_fans_medal_pri_des">一 Fan privilege 一</string>

6
common/src/main/res/values-zh/strings.xml
View File

@ -1082,14 +1082,14 @@
<string name="and">和</string>
<string name="privacy_terms">隱私條款</string>
<string name="terms_and_policies">條款和政策</string>
<string name="treat_and_protect">歡迎來到PandoraLive，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
<string name="treat_and_protect">歡迎來到FeelWe，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
<string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
<string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
<string name="agreement">同意</string>
<string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
<string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
<string name="come_to">歡迎來到PandoraLive。</string>
<string name="sign_up_for">註冊PandoraLive</string>
<string name="come_to">歡迎來到FeelWe。</string>
<string name="sign_up_for">註冊FeelWe</string>
<string name="register_and_log_in">註冊並登錄</string>
<string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
<string name="layout_live_anchor_say_ready_title">女神說</string>

4
common/src/main/res/values/strings.xml
View File

@ -888,11 +888,11 @@ Limited ride And limited avatar frame</string>
<string name="privacy_terms">Privacy Policy</string>
<string name="terms_and_policies">Terms and policies</string>
<string name="install_the_application">For details, please read the following message to install the application:</string>
<string name="treat_and_protect">Welcome to PandoraLive. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
<string name="treat_and_protect">Welcome to FeelWe. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
<string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
<string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
<string name="agreement">agreement</string>
<string name="come_to">Welcome to PandoraLive.</string>
<string name="come_to">Welcome to FeelWe.</string>
<string name="live_gift">gift</string>
<string name="register_tip_2">User service agreement</string>
<string name="live_fans_medal_pri_des">一 Fan privilege 一</string>

2
live/src/main/res/drawable/background_fff_d20.xml
View File

@ -3,7 +3,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="30dp" />
<solid android:color="#ffffff" />
<solid android:color="#FFF4F4F4" />
</shape>
</item>
</selector>

28
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -118,10 +118,10 @@ import java.util.TimerTask;
public class EntryActivity extends AppCompatActivity {
private VideoView video_view;
private ImageView btn_phone, btn_line, btn_twitter;
private ImageView btn_line, btn_twitter;
private TextView btn_tip, btn_tip1, tv_customer;
private TwitterLoginButton tt_login_button;
private LinearLayout btn_google, googleLayout;
private LinearLayout btn_google, googleLayout,btn_phone;
public static Activity activity;
private static String mLoginType = Constants.MOB_PHONE;//登录方式
public String mPromoCode = "", UserID = "";//推广码
@ -221,19 +221,19 @@ public class EntryActivity extends AppCompatActivity {
}
lt_btn_facebook = findViewById(R.id.lt_btn_facebook);
lt_btn_twitter = findViewById(R.id.lt_btn_twitter);
//lt_btn_twitter = findViewById(R.id.lt_btn_twitter);
btn_tip = findViewById(R.id.btn_tip);
btn_tip1 = findViewById(R.id.btn_tip1);
img_view = findViewById(R.id.img_view);
btn_google = findViewById(R.id.btn_google);
btn_twitter = findViewById(R.id.btn_twitter);
tt_login_button = findViewById(R.id.tt_login_button);
//btn_twitter = findViewById(R.id.btn_twitter);
//tt_login_button = findViewById(R.id.tt_login_button);
tv_customer = findViewById(R.id.tv_customer);
btn_phone = findViewById(R.id.btn_phone);
btn_line = findViewById(R.id.btn_line);
//btn_line = findViewById(R.id.btn_line);
lt_customer = findViewById(R.id.lt_customer);
btn_tip.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
@ -334,7 +334,7 @@ public class EntryActivity extends AppCompatActivity {
}
});
lt_btn_twitter.setOnClickListener(new View.OnClickListener() {
/*lt_btn_twitter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (isBtnClick()) {
@ -342,9 +342,9 @@ public class EntryActivity extends AppCompatActivity {
}
verfiy(3);
}
});
});*/
tt_login_button.setCallback(new Callback<TwitterSession>() {
/*tt_login_button.setCallback(new Callback<TwitterSession>() {
@Override
public void success(Result<TwitterSession> result) {
// Do something with result, which provides a TwitterSession for making API calls
@ -373,8 +373,8 @@ public class EntryActivity extends AppCompatActivity {
Log.i("Log", "TwitterException = " + exception);
ToastUtil.show(getResources().getString(R.string.user_login_outtime));
}
});
findViewById(R.id.btn_line).setOnClickListener(new View.OnClickListener() {
});*/
/*findViewById(R.id.btn_line).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (isBtnClick()) {
@ -382,7 +382,7 @@ public class EntryActivity extends AppCompatActivity {
}
verfiy(4);
}
});
});*/
getUrl();
@ -441,10 +441,10 @@ public class EntryActivity extends AppCompatActivity {
} else if (loginType == 4) {
try {
// App-to-app login
Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "2006124380", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
/* Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), "2006124380", new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE))
// .nonce("<a randomly-generated string>") // nonce can be used to improve security
.build());
startActivityForResult(loginIntent, 1001);
startActivityForResult(loginIntent, 1001);*/
} catch (Exception e) {
Log.e("ERROR", e.toString());
ToastUtil.show(getResources().getString(R.string.user_login_outtime));

2
main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
View File

@ -338,7 +338,7 @@ public class MainHttpUtil {
public static void getSettingList(HttpCallback callback) {
HttpClient.getInstance().get("User.getPerSetting", MainHttpConsts.GET_SETTING_LIST)
.params("version", VersionUtil.getVersion())
.params("package_name","panduo")
.params("package_name","feelWe")
.execute(callback);
}

91
main/src/main/res/layout/activity_entry.xml
View File

@ -4,12 +4,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context=".activity.EntryActivity">
<com.yunbao.main.views.CustomVideoView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="match_parent"
android:layout_gravity="center" />
@ -34,25 +36,26 @@
android:layout_marginBottom="21dp">
<LinearLayout
android:visibility="gone"
android:id="@+id/lt_btn_facebook"
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginLeft="42dp"
android:layout_marginRight="42dp"
android:layout_height="56dp"
android:layout_marginLeft="48dp"
android:layout_marginRight="48dp"
android:background="@drawable/background_227bef"
android:gravity="center|left">
android:gravity="center_vertical">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:layout_marginLeft="54dp"
android:layout_marginLeft="20dp"
android:src="@mipmap/icon_facebook" />
<TextView
android:layout_width="wrap_content"
android:layout_marginStart="30dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="21dp"
android:text="@string/user_login_facebook"
android:textColor="@color/white"
android:textSize="14sp" />
@ -69,29 +72,62 @@
<LinearLayout
android:id="@+id/btn_google"
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginLeft="42dp"
android:layout_marginRight="42dp"
android:layout_height="56dp"
android:layout_marginLeft="48dp"
android:layout_marginRight="48dp"
android:background="@drawable/background_fff_d20"
android:gravity="center|left">
android:gravity="center_vertical">
<ImageView
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:layout_marginLeft="54dp"
android:layout_marginLeft="20dp"
android:src="@mipmap/login_google" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginLeft="35dp"
android:text="@string/user_login_google"
android:textColor="@color/black1"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/phonelayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="21dp">
<LinearLayout
android:id="@+id/btn_phone"
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginLeft="48dp"
android:layout_marginRight="48dp"
android:background="@drawable/background_fff_d20"
android:gravity="center_vertical">
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:src="@mipmap/entry_phone" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login_use_phone"
android:layout_marginLeft="35dp"
android:textColor="@color/black1"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
@ -141,7 +177,7 @@
android:layout_marginRight="25dp"
android:orientation="vertical">
<LinearLayout
<!--<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
@ -221,7 +257,7 @@
</RelativeLayout>
</LinearLayout>
</LinearLayout>-->
<LinearLayout
@ -246,14 +282,14 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="22dp"
android:layout_marginBottom="22dp"
android:layout_marginBottom="40dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/next_step_is_consent"
android:textColor="#ffb1b1b1"
android:textColor="#FF999999"
android:textSize="10sp" />
@ -263,7 +299,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="@string/user_protocol2"
android:textColor="#ffb1b1b1"
android:textColor="#FF000000"
android:textSize="10sp" />
<TextView
@ -271,7 +307,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="@string/and"
android:textColor="#ffb1b1b1"
android:textColor="#FF999999"
android:textSize="10sp" />
<TextView
@ -280,7 +316,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="@string/privacy_terms"
android:textColor="#ffb1b1b1"
android:textColor="#FF000000"
android:textSize="10sp" />
</LinearLayout>
@ -292,8 +328,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="80dp"
android:visibility="gone"
android:layout_marginTop="125dp"
android:src="@mipmap/white_logo" />
<androidx.constraintlayout.widget.ConstraintLayout
@ -301,7 +336,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<View
android:id="@+id/view2"

BIN
main/src/main/res/mipmap-xxxhdpi/entry_phone.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 530 B

BIN
main/src/main/res/mipmap-xxxhdpi/login_google.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
main/src/main/res/mipmap-xxxhdpi/login_google.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
main/src/main/res/mipmap-xxxhdpi/white_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 74 KiB

1
main/src/main/res/values-en/strings.xml
View File

@ -156,4 +156,5 @@
<string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
<string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
<string name="login_use_phone">Sign in with Phone Number</string>
</resources>

2
main/src/main/res/values-zh/strings.xml
View File

@ -106,5 +106,5 @@
<string name="activity_feedback_edit_img_select">從相冊選取</string>
<string name="activity_feedback_edit_img_camera">拍照</string>
<string name="activity_battle_pass_all_get">一鍵領取</string>
<string name="login_use_phone">使用手機號登錄</string>
</resources>

1
main/src/main/res/values/strings.xml
View File

@ -107,4 +107,5 @@
<string name="activity_battle_pass_all_get">Receive all</string>
<string name="live_room_sud_hint_join">Join</string>
<string name="live_dialog_top_guardian_tasks">Guard tasks</string>
<string name="login_use_phone">Sign in with Phone Number</string>
</resources>