Merge branch 'dev_ad' into dev_ad_sougou

GoodMoney/app/build.gradle

@@ -105,6 +105,7 @@ android {
 
     productFlavors {
         goodmoneypkg {}
+//        toutiao {}
 //        share_goodmoney {}
     }
 

GoodMoney/app/proguard-rules.pro

@@ -507,17 +507,41 @@
     -keep class com.lzy.okgo.** {*;}
     -keep class com.fly.scenemodule.** {*;}
 
+    #GSON
+    -keep class com.google.gson.** {*;}
+    -keep class com.google.**{*;}
+    -keep class sun.misc.Unsafe { *; }
+    -keep class com.google.gson.stream.** { *; }
+    -keep class com.google.gson.examples.android.model.** { *; }
+
     #agentweb
     -keep class com.just.agentweb.** {
         *;
     }
     -dontwarn com.just.agentweb.**
 
-#    # Okio
-#    -dontwarn com.squareup.**
-#    -dontwarn okio.**
-#    -keep class  okio.* { *; }
-#    -keep public class org.codehaus.* { *; }
-#    -keep public class java.nio.* { *; }
+    #http3
+    #-------------- okhttp3 start-------------
+    # OkHttp3
+
+    -keepattributes Signature
+    -keepattributes *Annotation*
+    -keep class com.squareup.okhttp.* { *; }
+    -keep interface com.squareup.okhttp.** { *; }
+    -dontwarn com.squareup.okhttp.**
+
+    # okhttp 3
+    -keepattributes Signature
+    -keepattributes *Annotation*
+    -keep class okhttp3.** { *; }
+    -keep interface okhttp3.** { *; }
+    -dontwarn okhttp3.**
+
+    # Okio
+    -dontwarn com.squareup.**
+    -dontwarn okio.**
+    -keep class  okio.* { *; }
+    -keep public class org.codehaus.* { *; }
+    -keep public class java.nio.* { *; }
 
     # ======================= 聚乐云 END ================
\ No newline at end of file

GoodMoney/app/src/main/AndroidManifest.xml

@@ -182,7 +182,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activitys.FeedbackActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible" />
         <activity
             android:name=".ui.activitys.AccountMergeActivity"
             android:screenOrientation="portrait" />

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/VedioAdingManager.java

@@ -10,6 +10,7 @@ import com.mints.goodmoney.mvp.model.WeightBean;
 import com.mints.goodmoney.utils.LogUtil;
 import com.mints.goodmoney.utils.ToastUtil;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -40,7 +41,8 @@ public class VedioAdingManager {
 
     public static VedioAdingManager getInstance(Activity activity) {
         if (_inst == null) {
-            _inst = new VedioAdingManager(activity);
+            WeakReference<Activity> activityWeakReference = new WeakReference<>(activity);
+            _inst = new VedioAdingManager(activityWeakReference.get());
         }
         return _inst;
     }
@@ -88,10 +90,10 @@ public class VedioAdingManager {
      * @param bean
      */
     public void loadAding(Activity activity, VedioAdingBean bean) {
-        this.activity = activity;
+        WeakReference<Activity> activityWeakReference = new WeakReference<>(activity);
+        this.activity = activityWeakReference.get();
         isVedioAdDownload = false;
 
-
         if (AppConfig.flVideoFlag) {
             // 先展示枫岚视频
             firstLoadFlVideo(bean);
@@ -132,7 +134,9 @@ public class VedioAdingManager {
      * @param bean
      */
     public void loadFailAding(Activity activity, VedioAdingBean bean) {
-        this.activity = activity;
+        WeakReference<Activity> activityWeakReference = new WeakReference<>(activity);
+        this.activity = activityWeakReference.get();
+
         isVedioAdDownload = false;
         loadAdVedio(getNextAdType(), bean);
     }

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/YlhVedioAdManager.java

@@ -13,8 +13,6 @@ import com.qq.e.ads.rewardvideo.RewardVideoAD;
 import com.qq.e.ads.rewardvideo.RewardVideoADListener;
 import com.qq.e.comm.util.AdError;
 
-import java.util.HashMap;
-
 /**
  * 优量汇视频
  */

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/FeedbackActivity.kt

@@ -18,8 +18,7 @@ import kotlinx.android.synthetic.main.header_layout.*
  * 作者：孟崔广
  * 时间：2020/11/18 19:19
  */
-class FeedbackActivity : BaseActivity()
-        , View.OnClickListener, FeedbackView {
+class FeedbackActivity : BaseActivity(), View.OnClickListener, FeedbackView {
 
     private val feedbackPresenter by lazy { FeedbackPresenter() }
     private var typeName = "界面"
@@ -36,6 +35,10 @@ class FeedbackActivity : BaseActivity()
         iv_left_icon.visibility = View.VISIBLE
         iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
 
+        etFeedbackContent.isFocusable = true
+        etFeedbackContent.isFocusableInTouchMode = true
+        etFeedbackContent.requestFocus()
+
         initListener()
         feedbackPresenter.attachView(this)
     }
@@ -55,6 +58,7 @@ class FeedbackActivity : BaseActivity()
 
         etFeedbackContent.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
             @SuppressLint("SetTextI18n")
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
                 if (s.toString().trim { it <= ' ' }.length > maxLength) {

GoodMoney/app/src/main/res/animator/appbar_elevation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!--折叠状态下的阴影-->
+    <item app:state_collapsed="true">
+        <objectAnimator
+            android:propertyName="elevation"
+            android:valueTo="1.5dp"
+            android:valueType="floatType" />
+    </item>
+    <!--展开状态下的阴影-->
+    <item app:state_collapsed="false">
+        <objectAnimator
+            android:propertyName="elevation"
+            android:valueTo="1.5dp"
+            android:valueType="floatType" />
+    </item>
+</selector>
\ No newline at end of file

GoodMoney/app/src/main/res/layout/activity_drawcash.xml

@@ -71,11 +71,9 @@
             </RelativeLayout>
 
             <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
+                style="@style/view_line_E6E6E6"
                 android:layout_marginLeft="15dp"
-                android:layout_marginRight="15dp"
-                android:background="@color/color_E6E6E6" />
+                android:layout_marginRight="15dp" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -162,7 +160,7 @@
         <!--                android:textSize="14sp"-->
         <!--                android:visibility="gone" />-->
 
-        <TextView
+        <Button
             android:id="@+id/tvDrawcashNext"
             android:layout_width="match_parent"
             android:layout_height="40dp"

GoodMoney/app/src/main/res/layout/activity_feekback.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
@@ -87,25 +86,19 @@
 
         </LinearLayout>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="235dp"
             android:layout_marginTop="13dp"
+            android:layout_marginBottom="10dp"
             android:background="@color/white"
-            android:orientation="vertical"
             android:padding="15dp">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginBottom="10dp"
-                android:layout_weight="1">
-
             <EditText
                 android:id="@+id/etFeedbackContent"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                    android:background="@color/white"
+                android:background="@color/transparent"
                 android:gravity="top"
                 android:hint="请留下您的批评、表扬或者建议，我们会虚心听取， 认真改正。(请保持在5-150字内)"
                 android:textSize="13sp" />
@@ -120,9 +113,7 @@
                 android:textSize="12sp" />
         </RelativeLayout>
 
-        </LinearLayout>
-
-        <TextView
+        <Button
             android:id="@+id/btn_feedback_next"
             android:layout_width="match_parent"
             android:layout_height="50dp"
@@ -134,7 +125,7 @@
             android:gravity="center"
             android:text="提交"
             android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:textSize="16sp" />
 
     </LinearLayout>
 </LinearLayout>

GoodMoney/app/src/main/res/layout/activity_friends.xml

@@ -40,10 +40,7 @@
                 app:xTabTextColor="#666666"
                 app:xTabTextSize="15sp" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/color_E6E6E6" />
+            <View style="@style/view_line_E6E6E6" />
 
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/view_pager_friends"

GoodMoney/app/src/main/res/layout/activity_guide.xml

@@ -3,9 +3,7 @@
     xmlns:attrs="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <!-- Viewpager -->
     <androidx.viewpager.widget.ViewPager

GoodMoney/app/src/main/res/layout/activity_main.xml

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:clipChildren="false">
 
     <FrameLayout
@@ -9,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp"
-        android:background="@color/white"
         android:orientation="vertical" />
 
     <View
@@ -23,7 +23,6 @@
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/white"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 

GoodMoney/app/src/main/res/layout/fragment_main_friends.xml

@@ -25,19 +25,15 @@
             <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:stateListAnimator="@animator/appbar_elevation"
                 android:background="@color/color_F8F8F8"
                 app:layout_behavior=".ui.widgets.FlingBehavior">
 
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsingToolbarLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                    android:orientation="vertical"
+                    app:layout_scrollFlags="scroll">
 
                     <RelativeLayout
                         android:layout_width="match_parent"
@@ -285,51 +281,41 @@
                             android:background="@color/color_F8F8F8"
                             app:layout_constraintTop_toBottomOf="@id/textView" />
 
-                            <LinearLayout
-                                android:id="@+id/ll1"
-                                android:layout_width="100dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                app:layout_constraintEnd_toStartOf="@id/ll2"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@id/line">
-
                         <TextView
                             android:id="@+id/friends_sum"
-                                    android:layout_width="wrap_content"
+                            android:layout_width="100dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="15dp"
+                            android:gravity="center"
                             android:text="@string/dot"
                             android:textColor="@color/black"
-                                    android:textSize="20sp" />
+                            android:textSize="20sp"
+                            app:layout_constraintEnd_toStartOf="@id/friends_directly_sum"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/line" />
 
                         <TextView
+                            android:id="@+id/friends_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="6dp"
-                                    android:text="总人数" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:id="@+id/ll2"
-                                android:layout_width="100dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                app:layout_constraintEnd_toStartOf="@id/ll3"
-                                app:layout_constraintStart_toEndOf="@id/ll1"
-                                app:layout_constraintTop_toBottomOf="@id/line">
+                            android:text="总人数"
+                            app:layout_constraintEnd_toEndOf="@+id/friends_sum"
+                            app:layout_constraintStart_toStartOf="@+id/friends_sum"
+                            app:layout_constraintTop_toBottomOf="@id/friends_sum" />
 
                         <TextView
                             android:id="@+id/friends_directly_sum"
-                                    android:layout_width="wrap_content"
+                            android:layout_width="100dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="15dp"
+                            android:gravity="center"
                             android:text="@string/dot"
                             android:textColor="@color/black"
-                                    android:textSize="20sp" />
+                            android:textSize="20sp"
+                            app:layout_constraintEnd_toStartOf="@id/friends_indirect_sum"
+                            app:layout_constraintStart_toEndOf="@id/friends_sum"
+                            app:layout_constraintTop_toBottomOf="@id/line" />
 
                         <TextView
                             android:id="@+id/tv_friends_directly"
@@ -338,28 +324,23 @@
                             android:layout_marginTop="6dp"
                             android:drawableEnd="@mipmap/ic_question"
                             android:drawablePadding="6dp"
-                                    android:text="直接亲友" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:id="@+id/ll3"
-                                android:layout_width="100dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintStart_toEndOf="@id/ll2"
-                                app:layout_constraintTop_toBottomOf="@id/line">
+                            android:text="直接亲友"
+                            app:layout_constraintEnd_toEndOf="@+id/friends_directly_sum"
+                            app:layout_constraintStart_toStartOf="@+id/friends_directly_sum"
+                            app:layout_constraintTop_toBottomOf="@id/friends_directly_sum" />
 
                         <TextView
                             android:id="@+id/friends_indirect_sum"
-                                    android:layout_width="wrap_content"
+                            android:layout_width="100dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="15dp"
+                            android:gravity="center"
                             android:text="@string/dot"
                             android:textColor="@color/black"
-                                    android:textSize="20sp" />
+                            android:textSize="20sp"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@id/friends_directly_sum"
+                            app:layout_constraintTop_toBottomOf="@id/line" />
 
                         <TextView
                             android:id="@+id/tv_friends_indirect"
@@ -368,9 +349,11 @@
                             android:layout_marginTop="6dp"
                             android:drawablePadding="6dp"
                             android:text="间接亲友"
-                                    app:drawableEndCompat="@mipmap/ic_question" />
+                            app:drawableEndCompat="@mipmap/ic_question"
+                            app:layout_constraintEnd_toEndOf="@+id/friends_indirect_sum"
+                            app:layout_constraintStart_toStartOf="@+id/friends_indirect_sum"
+                            app:layout_constraintTop_toBottomOf="@id/friends_indirect_sum" />
 
-                            </LinearLayout>
 
                         <Button
                             android:id="@+id/btn_invite"
@@ -385,14 +368,12 @@
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@id/ll2" />
+                            app:layout_constraintTop_toBottomOf="@id/tv_friends_directly" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
 
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-
                 <com.androidkun.xtablayout.XTabLayout
                     android:id="@+id/tab_friends"
                     android:layout_width="match_parent"

GoodMoney/app/src/main/res/layout/fragment_main_money.xml

@@ -21,6 +21,8 @@
         app:xTabTextColor="#000"
         app:xTabTextSize="18sp" />
 
+    <View style="@style/view_line_E6E6E6" />
+
     <com.mints.goodmoney.ui.widgets.MyViewPager
         android:id="@+id/vpFragmentMoney"
         android:layout_width="match_parent"

GoodMoney/app/src/main/res/layout/header_layout.xml

@@ -59,9 +59,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/color_E6E6E6"
+        style="@style/view_line_E6E6E6"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/iv_right_icon" />
 

GoodMoney/app/src/main/res/layout/item_fragment_main_my_title.xml

@@ -21,11 +21,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="4dp"
             android:text="未登录"
             android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/item_title_invitecode"
             app:layout_constraintStart_toEndOf="@id/item_title_avatar"
             app:layout_constraintTop_toTopOf="@id/item_title_avatar" />
 
@@ -108,12 +108,12 @@
                 android:id="@+id/btn_coinRecord"
                 android:layout_width="60dp"
                 android:layout_height="30dp"
-            android:layout_marginTop="6dp"
                 android:layout_marginEnd="10dp"
                 android:background="@drawable/shape_btn_switch"
                 android:text="明细"
                 android:textColor="@color/white"
                 android:textSize="16sp"
+                app:layout_constraintBottom_toTopOf="@id/btn_withdraw"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -122,13 +122,13 @@
                 android:layout_width="60dp"
                 android:layout_height="30dp"
                 android:layout_marginEnd="10dp"
-            android:layout_marginBottom="6dp"
                 android:background="@drawable/shape_btn_switch"
                 android:text="提现"
                 android:textColor="@color/white"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btn_coinRecord" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

GoodMoney/app/src/main/res/layout/item_settings.xml

@@ -34,8 +34,6 @@
         android:visibility="gone" />
 
     <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_alignParentBottom="true"
-        android:background="@color/color_E6E6E6" />
+        style="@style/view_line_E6E6E6"
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>
\ No newline at end of file

GoodMoney/app/src/main/res/layout/view_title.xml

@@ -19,7 +19,7 @@
         android:id="@+id/view_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="6dp"
         android:textColor="@color/black"
         android:textSize="18sp"
         android:textStyle="bold"
@@ -28,10 +28,8 @@
         app:layout_constraintTop_toTopOf="@id/view" />
 
     <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
+        style="@style/view_line_E6E6E6"
         android:layout_alignParentBottom="true"
-        android:background="@color/color_E6E6E6"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

GoodMoney/app/src/main/res/values/styles.xml

@@ -31,12 +31,6 @@
         <item name="android:activityCloseExitAnimation">@anim/out_from_right</item>
     </style>
 
-    <style name="line_1">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1px</item>
-        <item name="android:background">#d3d3d3</item>
-    </style>
-
     <style name="notice_dialog" parent="android:style/Theme.Dialog">
         <item name="android:background">#00000000</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -77,12 +71,6 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="line_3">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1px</item>
-        <item name="android:background">#E8E8F0</item>
-    </style>
-
     <style name="main_btn_login_style">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -131,4 +119,23 @@
     <style name="BigTabLayoutTextStyle">
         <item name="android:textSize">@dimen/font_size_20</item>
     </style>
+
+    <!--浅灰色line-->
+    <style name="view_line_E6E6E6">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/color_E6E6E6</item>
+    </style>
+
+    <style name="line_1">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1px</item>
+        <item name="android:background">#d3d3d3</item>
+    </style>
+
+    <style name="line_3">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1px</item>
+        <item name="android:background">#E8E8F0</item>
+    </style>
 </resources>