diff --git a/app/agconnect-services.json b/app/agconnect-services.json index e3b74a8..ef726ec 100644 --- a/app/agconnect-services.json +++ b/app/agconnect-services.json @@ -33,7 +33,7 @@ "project_id":"388421841221488221", "app_id":"108318391", "api_key":"DAEDACb//MwJd8VoONZ8qwwwfyYb5+/Oeh0YImMODrMKXBRAkqUXPO+jp44QOcybtAsiOgIaYZ2Wgor4WLQTbhJYtLxHmmFE9Dy/xw==", - "package_name":"com.fengliyan.tianlesue" + "package_name":"com.xuebiping.bolizhuzi" }, "oauth_client":{ "client_id":"108318391", @@ -41,7 +41,7 @@ }, "app_info":{ "app_id":"108318391", - "package_name":"com.fengliyan.tianlesue" + "package_name":"com.xuebiping.bolizhuzi" }, "service":{ "analytics":{ @@ -79,12 +79,12 @@ "configuration_version":"3.0", "appInfos":[ { - "package_name":"com.fengliyan.tianlesue", + "package_name":"com.xuebiping.bolizhuzi", "client":{ "app_id":"108318391" }, "app_info":{ - "package_name":"com.fengliyan.tianlesue", + "package_name":"com.xuebiping.bolizhuzi", "app_id":"108318391" }, "oauth_client":{ diff --git a/app/bolizhuzi.jks b/app/bolizhuzi.jks new file mode 100644 index 0000000..6400234 Binary files /dev/null and b/app/bolizhuzi.jks differ diff --git a/app/build.gradle b/app/build.gradle index 12062ae..7f7a889 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,11 +35,11 @@ android { } useLibrary 'org.apache.http.legacy' defaultConfig { - applicationId "com.fengliyan.tianlesue" + applicationId "com.xuebiping.bolizhuzi" minSdkVersion 24 targetSdkVersion 30 - versionCode 38 - versionName "2.5.1" + versionCode 1 + versionName "1.0.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' flavorDimensions "versionCode" buildConfigField "String", "AUTH_SECRET", '"tX1pY3+d9GOsDdek6c8EkqlBagajAzzq4Yl8xWzKxE66qzaa51BRukuNO66MPcv92lK5tTifKP6md8Jn/vIcgQCLpJWhr4vKvcGeOmBFIPmdo/++elnHTJdJ10RSRN8fDaQVUhX7Ap3KoPQ4n/oSUNSpa/HKZihCLQK31vyNCL/GZ4bGijb2e63JDN4GbUOP1d7yw4vbaNEA883Da+CQ+CyYW4aXWuLca/1ngoszOw3wRFhe/ZMVDhDRRMc7Bpp/+judD4ehwydRzLprBpVSQufZV6XAUpec3V7eJRH3FHGXE4fwtZK4BA=="' @@ -76,10 +76,10 @@ android { keyAlias properties.get("keyAlias") ?: System.getenv("FLOW_ALIAS_NAME") keyPassword properties.get("keyPassword") ?: System.getenv("FLOW_ALIAS_PASS")*/ - storeFile file("xiayue.jks") - storePassword 'Chenqihong3' - keyAlias 'chenqihong3' - keyPassword 'Chenqihong3' + storeFile file("bolizhuzi.jks") + storePassword 'bolizhuzi' + keyAlias 'bolizhuzi' + keyPassword 'bolizhuzi' v1SigningEnabled true v2SigningEnabled true } @@ -154,169 +154,169 @@ android { productFlavors { // dev { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "true" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "oss", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } oss { - applicationId "com.fengliyan.tianlesue" + applicationId "com.xuebiping.bolizhuzi" buildConfigField "boolean", "IS_DEV", "false" buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' - manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", + manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", MARKET_VALUE : "oss", - APP_NAME : "私语" + APP_NAME : "芊颜" ] } // vivo { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "vivo", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // oppo { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "oppo", -// APP_NAME : "私语", +// APP_NAME : "芊颜", // ] // } // xiaomi { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "xiaomi", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // yingyongbao { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "yingyongbao", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // huawei { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuSocialPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuSocialAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuSocialVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "huawei", -// APP_NAME : "私语交友" +// APP_NAME : "芊颜交友" // ] // } // honor { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "honor", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // meizu { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "meizu", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // baiduss { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "baiduss", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // baiduxxl { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "baiduxxl", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // threesixzero { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "\"360\"", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // ali { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "ali", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // kuaishou { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "kuaishou", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } // douyin { -// applicationId "com.fengliyan.tianlesue" +// applicationId "com.xuebiping.bolizhuzi" // buildConfigField "boolean", "IS_DEV", "false" // buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"' // buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"' // buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"' -// manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue", +// manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi", // MARKET_VALUE : "douyin", -// APP_NAME : "私语" +// APP_NAME : "芊颜" // ] // } } @@ -405,4 +405,5 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' } \ No newline at end of file diff --git a/app/mcs-services.json b/app/mcs-services.json index cd7a555..8633e54 100644 --- a/app/mcs-services.json +++ b/app/mcs-services.json @@ -1,6 +1,6 @@ { "developer_id":"109999896480", "app_id":"104457750", - "package_name":"com.fengliyan.tianlesue", + "package_name":"com.xuebiping.bolizhuzi", "version":"1.0" } \ No newline at end of file diff --git a/app/src/androidTest/java/com/fengliyan/tianlesue/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/fengliyan/tianlesue/ExampleInstrumentedTest.java index 8a6e69c..6c84525 100644 --- a/app/src/androidTest/java/com/fengliyan/tianlesue/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/fengliyan/tianlesue/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.fengliyan.tianlesue; +package com.xuebiping.bolizhuzi; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.fengliyan.tianlesue", appContext.getPackageName()); + assertEquals("com.xuebiping.bolizhuzi", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 185f246..f69bab5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.xuebiping.bolizhuzi"> @@ -58,33 +58,33 @@ - + - + - + - + @@ -115,7 +115,7 @@ android:usesCleartextTraffic="true" tools:replace="android:label,android:allowBackup" tools:targetApi="r"> - + + + @@ -590,7 +596,7 @@ - + @@ -643,7 +649,7 @@ - + @@ -688,7 +694,7 @@ android:name="app_id" android:value="105654483" /> - + android:background="@color/bottomCuttingLine" />--> + android:src="@drawable/group" + android:tint="@color/black" /> @@ -71,7 +86,10 @@ + android:layout_height="79dp" + android:layout_marginHorizontal="@dimen/dp16" + android:layout_marginTop="@dimen/dp15" + android:background="@drawable/shape_white_bg_r14"> + android:textSize="16sp" + android:textStyle="bold" /> - + android:orientation="vertical" + android:layout_marginTop="@dimen/dp10" + android:layout_marginHorizontal="@dimen/dp16" + android:background="@drawable/shape_white_bg_r14"> - - + + + + + + + android:tint="@color/black" + android:src="@drawable/group" /> - + + + android:tint="@color/black" + android:src="@drawable/group" /> - + + + android:tint="@color/black" + android:src="@drawable/group" /> - + + + android:tint="@color/black" + android:src="@drawable/group" /> - - - - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp15" + android:orientation="vertical"> - - + android:background="@drawable/shape_white_bg_r14" + android:layout_marginTop="@dimen/dp12" + android:layout_marginHorizontal="@dimen/dp16" + android:orientation="vertical"> + + + + + + + + + + + + + - - - diff --git a/app/src/main/res/layout/activity_topic_dynamic_list.xml b/app/src/main/res/layout/activity_topic_dynamic_list.xml new file mode 100644 index 0000000..cc9fec6 --- /dev/null +++ b/app/src/main/res/layout/activity_topic_dynamic_list.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_verify_code.xml b/app/src/main/res/layout/activity_verify_code.xml index 009ef78..a441fa2 100644 --- a/app/src/main/res/layout/activity_verify_code.xml +++ b/app/src/main/res/layout/activity_verify_code.xml @@ -29,7 +29,7 @@ android:textColor="@color/two_text" android:textSize="14dp" /> - - @@ -97,7 +97,7 @@ android:layout_marginBottom="30dp" android:background="@drawable/shape_home_progress" /> - - diff --git a/app/src/main/res/layout/dialog_luck_wheel.xml b/app/src/main/res/layout/dialog_luck_wheel.xml index a5cc280..06de9e0 100644 --- a/app/src/main/res/layout/dialog_luck_wheel.xml +++ b/app/src/main/res/layout/dialog_luck_wheel.xml @@ -82,7 +82,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - @@ -52,7 +52,7 @@ android:layout_below="@+id/wechat_background" android:layout_centerHorizontal="true" android:layout_marginTop="@dimen/dp14" - android:text="私语官方微信公众号：" + android:text="芊颜官方微信公众号：" android:textColor="@color/two_text" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_dynamic_topic.xml b/app/src/main/res/layout/fragment_dynamic_topic.xml new file mode 100644 index 0000000..6400b78 --- /dev/null +++ b/app/src/main/res/layout/fragment_dynamic_topic.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_image_for_display.xml b/app/src/main/res/layout/fragment_image_for_display.xml index f06fb04..41a68f5 100644 --- a/app/src/main/res/layout/fragment_image_for_display.xml +++ b/app/src/main/res/layout/fragment_image_for_display.xml @@ -5,7 +5,7 @@ tools:viewBindingIgnore="true" android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/fragment_luck_list.xml b/app/src/main/res/layout/fragment_luck_list.xml index e51660a..d1cfc6c 100644 --- a/app/src/main/res/layout/fragment_luck_list.xml +++ b/app/src/main/res/layout/fragment_luck_list.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_recommend_active.xml b/app/src/main/res/layout/fragment_main_recommend_active.xml index 22dabe5..9eb1956 100644 --- a/app/src/main/res/layout/fragment_main_recommend_active.xml +++ b/app/src/main/res/layout/fragment_main_recommend_active.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_recommend_city.xml b/app/src/main/res/layout/fragment_main_recommend_city.xml index 5d0bd96..6209b78 100644 --- a/app/src/main/res/layout/fragment_main_recommend_city.xml +++ b/app/src/main/res/layout/fragment_main_recommend_city.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_recommend_recommend.xml b/app/src/main/res/layout/fragment_main_recommend_recommend.xml index daf3e2a..1f731c6 100644 --- a/app/src/main/res/layout/fragment_main_recommend_recommend.xml +++ b/app/src/main/res/layout/fragment_main_recommend_recommend.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/fragment_personal_main_page.xml b/app/src/main/res/layout/fragment_personal_main_page.xml index 3c04a1c..7494b33 100644 --- a/app/src/main/res/layout/fragment_personal_main_page.xml +++ b/app/src/main/res/layout/fragment_personal_main_page.xml @@ -9,833 +9,869 @@ android:orientation="vertical" tools:viewBindingIgnore="true"> - + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:orientation="vertical"> + android:id="@+id/rl_bg" + android:layout_width="match_parent" + android:layout_height="320dp" + android:background="@color/mainBg"> - - - - - - - - + android:layout_height="wrap_content"> - + - + + - + + + + + + - + android:layout_marginTop="40dp"> - + + + + + + + + + + + + + + + + + + + + + + + + + + android:id="@+id/cl_guard" + android:layout_width="100dp" + android:layout_height="71dp" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:layout_marginEnd="16dp" + android:layout_marginBottom="32dp"> - + - - - - - - - - - - - - - - + fresco:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:textSize="14sp" + android:textStyle="bold" + tools:text="聊天价格：2币/分钟" /> + + + + + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_recommend1.xml b/app/src/main/res/layout/fragment_recommend1.xml index ea29fb4..a2815ce 100644 --- a/app/src/main/res/layout/fragment_recommend1.xml +++ b/app/src/main/res/layout/fragment_recommend1.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index a0bf509..363e3fd 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -8,601 +8,864 @@ android:fillViewport="true" tools:viewBindingIgnore="true"> - + android:layout_height="match_parent"> - + android:scaleType="fitXY" + android:src="@drawable/icon_setting_bg" /> - + + + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="20dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="20dp" + android:visibility="gone"> - - + - + + - - + - + + + + + + + + + + + + + + + + + + + + + + + android:textStyle="bold" /> + android:layout_below="@+id/iv_xsimg" + android:layout_marginLeft="@dimen/dp20" + android:layout_marginTop="4dp" + android:text="享受多种福利特权，提升使用体验" + android:textColor="#FDFAD9" + android:textSize="12dp" /> + android:id="@+id/tv_go_open" + android:layout_width="@dimen/dp75" + android:layout_height="@dimen/dp28" + android:layout_alignParentRight="true" + android:layout_marginTop="@dimen/dp17" + android:layout_marginEnd="@dimen/dp20" + android:background="@mipmap/ic_vip_go_btn" + android:gravity="center" + android:singleLine="true" + android:text="立即开通" + android:textColor="#FDFAD9" + android:textSize="12dp" /> + + + + android:id="@+id/ll_income" + android:layout_width="@dimen/dp0" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:layout_weight="1" + android:orientation="vertical"> + android:layout_width="@dimen/dp44" + android:layout_height="@dimen/dp44" + android:src="@mipmap/iv_recharge_img" /> - - - - - + android:layout_marginTop="6dp" + android:text="充值" + android:textColor="@color/black" + android:textSize="14dp" + android:textStyle="bold" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + - + android:layout_marginTop="12dp" + android:layout_marginBottom="12dp" + android:src="@mipmap/ic_my_ntequan" /> + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginEnd="16dp" + android:background="@drawable/shape_recommend_bg" + android:orientation="vertical" /> - + android:layout_marginStart="16dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="62dp" + android:background="@drawable/shape_recommend_bg" + android:orientation="vertical" /> - - + - + - - diff --git a/app/src/main/res/layout/item_channel_anchor1.xml b/app/src/main/res/layout/item_channel_anchor1.xml index 130f2f1..cd6c60b 100644 --- a/app/src/main/res/layout/item_channel_anchor1.xml +++ b/app/src/main/res/layout/item_channel_anchor1.xml @@ -49,7 +49,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - diff --git a/app/src/main/res/layout/item_dynamic_list1.xml b/app/src/main/res/layout/item_dynamic_list1.xml index f45ed74..eefa68b 100644 --- a/app/src/main/res/layout/item_dynamic_list1.xml +++ b/app/src/main/res/layout/item_dynamic_list1.xml @@ -34,6 +34,8 @@ android:id="@+id/dynamic_list_photo" android:layout_width="40dp" android:layout_height="40dp" + fresco:roundingBorderColor="#6CE4B7" + fresco:roundingBorderWidth="@dimen/dp1" fresco:roundedCornerRadius="24dp" /> + + + android:src="@drawable/shape_button_e472ed" /> + android:src="@drawable/shape_button_e472ed" /> + android:src="@drawable/shape_button_e472ed" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_dynamic_topic_title.xml b/app/src/main/res/layout/item_dynamic_topic_title.xml new file mode 100644 index 0000000..4d3a8e6 --- /dev/null +++ b/app/src/main/res/layout/item_dynamic_topic_title.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_free_video.xml b/app/src/main/res/layout/item_free_video.xml index 94fec18..5353fdf 100644 --- a/app/src/main/res/layout/item_free_video.xml +++ b/app/src/main/res/layout/item_free_video.xml @@ -6,7 +6,7 @@ tools:viewBindingIgnore="true" android:padding="4dp"> - diff --git a/app/src/main/res/layout/item_news.xml b/app/src/main/res/layout/item_news.xml index ac485c7..dcb8c0b 100644 --- a/app/src/main/res/layout/item_news.xml +++ b/app/src/main/res/layout/item_news.xml @@ -37,7 +37,7 @@ android:layout_marginTop="1dp" android:layout_toRightOf="@+id/news_photo" android:layout_marginLeft="15.5dp" - android:text="Hi，欢迎来到私语世界" + android:text="Hi，欢迎来到芊颜世界" android:textColor="@color/loginText2" android:maxLines="1" android:ellipsize="end" diff --git a/app/src/main/res/layout/item_notice_1_child.xml b/app/src/main/res/layout/item_notice_1_child.xml index 4d8474d..f344ea4 100644 --- a/app/src/main/res/layout/item_notice_1_child.xml +++ b/app/src/main/res/layout/item_notice_1_child.xml @@ -33,7 +33,7 @@ android:layout_below="@+id/notice_1_child_name" android:layout_marginTop="1dp" android:layout_marginLeft="17dp" - android:text="Hi, 欢迎来到私语世界" + android:text="Hi, 欢迎来到芊颜世界" android:textSize="17sp" android:textColor="@color/loginText2"/> diff --git a/app/src/main/res/layout/item_play_video_view.xml b/app/src/main/res/layout/item_play_video_view.xml index 9811bd6..26725b6 100644 --- a/app/src/main/res/layout/item_play_video_view.xml +++ b/app/src/main/res/layout/item_play_video_view.xml @@ -78,7 +78,7 @@ android:background="@drawable/shape_home_progress" android:visibility="gone" /> - - @@ -111,6 +111,18 @@ android:textSize="14sp" android:visibility="gone" /> +