红包模块的修改

skWeiChatBaidu/build.gradle

@@ -173,6 +173,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
     implementation 'com.android.support:appcompat-v7:' + support_version
     implementation 'com.android.support:design:' + support_version

skWeiChatBaidu/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.liaobo.im">
-    <!--com.xunmi.im-->
-
+    <!-- com.xunmi.im -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -75,9 +74,9 @@
 
     <uses-permission android:name="${APP_ID}.permission.C2D_MESSAGE" /> <!-- OPPO 推送 -->
     <uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE" />
-    <!--tools:replace="android:name,android:icon"-->
+
     <application
-        android:name="com.liaobo.im.MyApplication"
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:fitsSystemWindows="true"
         android:icon="@mipmap/icon"
@@ -85,18 +84,19 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:name">
-        <activity android:name="com.liaobo.im.ui.backup.ReceiveChatHistoryActivity"></activity>
+        <activity android:name=".ui.me.redpacket.MyRedPacketActivity"/>
+        <activity android:name=".ui.backup.ReceiveChatHistoryActivity" />
         <activity
-            android:name="com.liaobo.im.ui.backup.SendChatHistoryActivity"
+            android:name=".ui.backup.SendChatHistoryActivity"
             android:launchMode="singleInstance" />
-        <activity android:name="com.liaobo.im.ui.backup.SelectChatActivity" />
-        <activity android:name="com.liaobo.im.ui.backup.BackupHistoryActivity" />
+        <activity android:name=".ui.backup.SelectChatActivity" />
+        <activity android:name=".ui.backup.BackupHistoryActivity" />
         <activity
-            android:name="com.liaobo.im.ui.other.PrivacyAgreeActivity"
+            android:name=".ui.other.PrivacyAgreeActivity"
             android:launchMode="singleTop" />
-        <activity android:name="com.liaobo.im.ui.login.H5LoginActivity" />
+        <activity android:name=".ui.login.H5LoginActivity" />
         <activity
-            android:name="com.liaobo.im.ui.login.H5LoginProxyActivity"
+            android:name=".ui.login.H5LoginProxyActivity"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -111,7 +111,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.liaobo.im.ui.notification.NotificationProxyActivity"
+            android:name=".ui.notification.NotificationProxyActivity"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -125,19 +125,18 @@
                     android:scheme="sk" />
             </intent-filter>
         </activity>
-        <activity android:name="com.liaobo.im.ui.account.ChangePasswordActivity" />
-        <activity android:name="com.liaobo.im.ui.me.PrivacyWhitelistActivity" />
-        <activity android:name="com.liaobo.im.ui.groupchat.FaceToFaceGroup" />
-        <activity android:name="com.liaobo.im.ui.groupchat.RoomSearchResultActivity" />
-        <activity android:name="com.liaobo.im.ui.groupchat.RoomSearchActivity" /> <!-- 启动页面 -->
-        <activity android:name=".ui.me.LifeCircleActivity"/>
-
-        <activity android:name=".ui.me.FriendsCircleFragmentActivity"/>
-
-        <activity android:name=".ui.account.SignInActivity"
+        <activity android:name=".ui.account.ChangePasswordActivity" />
+        <activity android:name=".ui.me.PrivacyWhitelistActivity" />
+        <activity android:name=".ui.groupchat.FaceToFaceGroup" />
+        <activity android:name=".ui.groupchat.RoomSearchResultActivity" />
+        <activity android:name=".ui.groupchat.RoomSearchActivity" /> <!-- 启动页面 -->
+        <activity android:name=".ui.me.LifeCircleActivity" />
+        <activity android:name=".ui.me.FriendsCircleFragmentActivity" />
+        <activity
+            android:name=".ui.account.SignInActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.liaobo.im.ui.SplashActivity"
+            android:name=".ui.SplashActivity"
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"
             android:theme="@style/SplashTheme">
@@ -172,92 +171,96 @@
             android:name=".call.JitsiInviteActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
-        <activity android:name="com.liaobo.im.course.CourseDateilsActivity" />
-        <activity android:name="com.liaobo.im.course.LocalCourseActivity" />
-        <activity android:name="com.liaobo.im.course.SelectFriendsActivity" />
-        <activity android:name="com.liaobo.im.ui.me.BankCardActivity"
+        <activity android:name=".course.CourseDateilsActivity" />
+        <activity android:name=".course.LocalCourseActivity" />
+        <activity android:name=".course.SelectFriendsActivity" />
+        <activity
+            android:name=".ui.me.BankCardActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.me.AddBankCardActivity"
+        <activity
+            android:name=".ui.me.AddBankCardActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.me.BankCardTXActivity"
+        <activity
+            android:name=".ui.me.BankCardTXActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.me.BankCardDetailActivity"
+        <activity
+            android:name=".ui.me.BankCardDetailActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.me.TXDetailActivity"
+        <activity
+            android:name=".ui.me.TXDetailActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.QuxianHistiry"
+        <activity
+            android:name=".ui.me.redpacket.QuxianHistiry"
             android:windowSoftInputMode="adjustPan" />
-
-
         <activity
-            android:name="com.liaobo.im.ui.account.RegisterActivity"
+            android:name=".ui.account.RegisterActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.liaobo.im.ui.account.RegisterPasswordActivity"
+            android:name=".ui.account.RegisterPasswordActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.liaobo.im.ui.account.RegisterUserBasicInfoActivity"
+            android:name=".ui.account.RegisterUserBasicInfoActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.liaobo.im.ui.account.LoginActivity"
+            android:name=".ui.account.LoginActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name="com.liaobo.im.ui.account.LoginHistoryActivity"
+            android:name=".ui.account.LoginHistoryActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.account.DataDownloadActivity" />
+        <activity android:name=".ui.account.DataDownloadActivity" />
         <activity
-            android:name="com.liaobo.im.ui.account.SelectPrefixActivity"
+            android:name=".ui.account.SelectPrefixActivity"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name="com.liaobo.im.ui.account.SwitchLoginActivity" />
+        <activity android:name=".ui.account.SwitchLoginActivity" />
         <activity
-            android:name="com.liaobo.im.ui.account.FindPwdActivity"
+            android:name=".ui.account.FindPwdActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.circle.range.AtSeeCircleActivity" />
-        <activity android:name="com.liaobo.im.ui.circle.range.NewZanActivity" />
-        <activity android:name="com.liaobo.im.ui.circle.range.SeeCircleActivity" />
+        <activity android:name=".ui.circle.range.AtSeeCircleActivity" />
+        <activity android:name=".ui.circle.range.NewZanActivity" />
+        <activity android:name=".ui.circle.range.SeeCircleActivity" />
         <activity
-            android:name="com.liaobo.im.ui.circle.range.SendShuoshuoActivity"
+            android:name=".ui.circle.range.SendShuoshuoActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity
-            android:name="com.liaobo.im.ui.circle.range.SendAudioActivity"
+            android:name=".ui.circle.range.SendAudioActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity
-            android:name="com.liaobo.im.ui.circle.range.SendVideoActivity"
+            android:name=".ui.circle.range.SendVideoActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity
-            android:name="com.liaobo.im.ui.circle.range.SendFileActivity"
+            android:name=".ui.circle.range.SendFileActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
-        <activity android:name="com.liaobo.im.ui.circle.BusinessCircleActivity" /> <!-- 我的同事 -->
-        <activity android:name="com.liaobo.im.ui.company.AddEmployee" />
-        <activity android:name="com.liaobo.im.ui.company.ChangeEmployeeDepartment" />
-        <activity android:name="com.liaobo.im.ui.company.CreateCompany" />
-        <activity android:name="com.liaobo.im.ui.company.CreateDepartment" />
-        <activity android:name="com.liaobo.im.ui.company.CreateGroup" />
-        <activity android:name="com.liaobo.im.ui.company.ManagerCompany" />
-        <activity android:name="com.liaobo.im.ui.company.ModifyCompanyName" />
-        <activity android:name="com.liaobo.im.ui.company.ModifyDepartmentName" /> <!-- 通讯录头部 -->
-        <activity
-            android:name="com.liaobo.im.ui.contacts.label.CreateLabelActivity"
+        <activity android:name=".ui.circle.BusinessCircleActivity" /> <!-- 我的同事 -->
+        <activity android:name=".ui.company.AddEmployee" />
+        <activity android:name=".ui.company.ChangeEmployeeDepartment" />
+        <activity android:name=".ui.company.CreateCompany" />
+        <activity android:name=".ui.company.CreateDepartment" />
+        <activity android:name=".ui.company.CreateGroup" />
+        <activity android:name=".ui.company.ManagerCompany" />
+        <activity android:name=".ui.company.ModifyCompanyName" />
+        <activity android:name=".ui.company.ModifyDepartmentName" /> <!-- 通讯录头部 -->
+        <activity
+            android:name=".ui.contacts.label.CreateLabelActivity"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name="com.liaobo.im.ui.contacts.label.LabelActivity"
+            android:name=".ui.contacts.label.LabelActivity"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name="com.liaobo.im.ui.contacts.label.SelectLabelFriendActivity" />
-        <activity android:name="com.liaobo.im.ui.contacts.BlackActivity" />
+        <activity android:name=".ui.contacts.label.SelectLabelFriendActivity" />
+        <activity android:name=".ui.contacts.BlackActivity" />
         <activity
-            android:name="com.liaobo.im.ui.contacts.ContactInviteActivity"
+            android:name=".ui.contacts.ContactInviteActivity"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name="com.liaobo.im.ui.contacts.ContactsActivity" />
-        <activity android:name="com.liaobo.im.ui.contacts.ContactsMsgInviteActivity" />
-        <activity android:name="com.liaobo.im.ui.contacts.DeviceActivity" />
-        <activity android:name="com.liaobo.im.ui.contacts.NewFriendActivity" />
-        <activity android:name="com.liaobo.im.ui.contacts.PublishNumberActivity" />
-        <activity android:name="com.liaobo.im.ui.contacts.RoomActivity" />
-        <activity
-            android:name="com.liaobo.im.ui.contacts.SearchFriendActivity"
+        <activity android:name=".ui.contacts.ContactsActivity" />
+        <activity android:name=".ui.contacts.ContactsMsgInviteActivity" />
+        <activity android:name=".ui.contacts.DeviceActivity" />
+        <activity android:name=".ui.contacts.NewFriendActivity" />
+        <activity android:name=".ui.contacts.PublishNumberActivity" />
+        <activity android:name=".ui.contacts.RoomActivity" />
+        <activity
+            android:name=".ui.contacts.SearchFriendActivity"
             android:windowSoftInputMode="stateVisible" />
-        <activity android:name="com.liaobo.im.ui.contacts.TalkHistoryActivity" />
-        <activity android:name="com.liaobo.im.ui.groupchat.SelectContactsActivity" /> <!-- 直播 -->
+        <activity android:name=".ui.contacts.TalkHistoryActivity" />
+        <activity android:name=".ui.groupchat.SelectContactsActivity" /> <!-- 直播 -->
         <activity android:name=".ui.live.CreateLiveActivity" />
         <activity android:name=".ui.live.LiveActivity" /> <!-- 抖音 -->
         <activity
@@ -291,128 +294,129 @@
             android:name=".ui.live.PushFlowActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name="com.liaobo.im.ui.map.MapActivity" />
-        <activity android:name="com.liaobo.im.ui.map.MapPickerActivity" /> <!-- 红包 -->
-        <activity android:name="com.liaobo.im.ui.me.redpacket.MucSendRedPacketActivity" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.MyConsumeRecord" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.QuXianActivity" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.RedDetailsActivity" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.RedListActivity" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.SendRedPacketActivity" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.WxPayAdd" />
-        <activity android:name="com.liaobo.im.ui.me.redpacket.WxPayBlance" />
-        <activity android:name="com.liaobo.im.ui.me.sendgroupmessage.ChatActivityForSendGroup" /> <!-- 收付款、转账 -->
-        <activity
-            android:name="com.liaobo.im.pay.sk.SKPayActivity"
+        <activity android:name=".ui.map.MapActivity" />
+        <activity android:name=".ui.map.MapPickerActivity" /> <!-- 红包 -->
+        <activity android:name=".ui.me.redpacket.MucSendRedPacketActivity" />
+        <activity android:name=".ui.me.redpacket.MyConsumeRecord" />
+        <activity android:name=".ui.me.redpacket.QuXianActivity" />
+        <activity android:name=".ui.me.redpacket.RedDetailsActivity" />
+        <activity android:name=".ui.me.redpacket.RedListActivity" />
+        <activity android:name=".ui.me.redpacket.SendRedPacketActivity" />
+        <activity android:name=".ui.me.redpacket.WxPayAdd" />
+        <activity android:name=".ui.me.redpacket.WxPayBlance" />
+        <activity android:name=".ui.me.sendgroupmessage.ChatActivityForSendGroup" /> <!-- 收付款、转账 -->
+        <activity
+            android:name=".pay.sk.SKPayActivity"
             android:launchMode="singleTask" />
-        <activity android:name="com.liaobo.im.pay.TransferMoneyActivity" />
-        <activity android:name="com.liaobo.im.pay.TransferMoneyDetailActivity" />
-        <activity android:name="com.liaobo.im.pay.TransferRecordActivity" />
-        <activity android:name="com.liaobo.im.pay.PaymentActivity" />
-        <activity android:name="com.liaobo.im.pay.PaymentReceiptMoneyActivity" />
-        <activity android:name="com.liaobo.im.pay.ReceiptActivity" />
-        <activity android:name="com.liaobo.im.pay.ReceiptPayMoneyActivity" />
-        <activity android:name="com.liaobo.im.pay.ReceiptSetMoneyActivity" /> <!-- Me模块 -->
-        <activity android:name="com.liaobo.im.ui.me.AboutActivity" />
-        <activity
-            android:name="com.liaobo.im.ui.me.BasicInfoEditActivity"
+        <activity android:name=".pay.TransferMoneyActivity" />
+        <activity android:name=".pay.TransferMoneyDetailActivity" />
+        <activity android:name=".pay.TransferRecordActivity" />
+        <activity android:name=".pay.PaymentActivity" />
+        <activity android:name=".pay.PaymentReceiptMoneyActivity" />
+        <activity android:name=".pay.ReceiptActivity" />
+        <activity android:name=".pay.ReceiptPayMoneyActivity" />
+        <activity android:name=".pay.ReceiptSetMoneyActivity" /> <!-- Me模块 -->
+        <activity android:name=".ui.me.AboutActivity" />
+        <activity android:name=".ui.me.AccessibilityActivity" />
+        <activity
+            android:name=".ui.me.BasicInfoEditActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
-        <activity android:name="com.liaobo.im.ui.me.FontSizeActivity" />
-        <activity android:name="com.liaobo.im.ui.me.LocalVideoActivity" />
-        <activity android:name="com.liaobo.im.ui.me.MyCollection" />
-        <activity android:name="com.liaobo.im.ui.me.NearPersonActivity" />
-        <activity android:name="com.liaobo.im.ui.me.PrivacySettingActivity" />
-        <activity android:name="com.liaobo.im.ui.me.BandAccountActivity" />
-        <activity
-            android:name="com.liaobo.im.ui.me.SelectFriendsActivity"
+        <activity android:name=".ui.me.FontSizeActivity" />
+        <activity android:name=".ui.me.LocalVideoActivity" />
+        <activity android:name=".ui.me.MyCollection" />
+        <activity android:name=".ui.me.NearPersonActivity" />
+        <activity android:name=".ui.me.PrivacySettingActivity" />
+        <activity android:name=".ui.me.BandAccountActivity" />
+        <activity
+            android:name=".ui.me.SelectFriendsActivity"
             android:windowSoftInputMode="stateHidden|stateUnchanged" />
-        <activity android:name="com.liaobo.im.ui.me.SelectLabelActivity" />
-        <activity android:name="com.liaobo.im.ui.me.SetAccountActivity" />
-        <activity android:name="com.liaobo.im.ui.me.SetConfigActivity" />
-        <activity android:name="com.liaobo.im.ui.me.SettingActivity" />
-        <activity android:name="com.liaobo.im.ui.me.SkinStore" />
-        <activity android:name="com.liaobo.im.ui.me.SwitchLanguage" /> <!-- 消息模块 -->
-        <activity
-            android:name="com.liaobo.im.ui.message.assistant.GroupAssistantAddKeywordActivity"
+        <activity android:name=".ui.me.SelectLabelActivity" />
+        <activity android:name=".ui.me.SetAccountActivity" />
+        <activity android:name=".ui.me.SetConfigActivity" />
+        <activity android:name=".ui.me.SettingActivity" />
+        <activity android:name=".ui.me.SkinStore" />
+        <activity android:name=".ui.me.SwitchLanguage" /> <!-- 消息模块 -->
+        <activity
+            android:name=".ui.message.assistant.GroupAssistantAddKeywordActivity"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name="com.liaobo.im.ui.message.assistant.GroupAssistantDetailActivity" />
-        <activity android:name="com.liaobo.im.ui.message.assistant.SelectGroupAssistantActivity" />
+        <activity android:name=".ui.message.assistant.GroupAssistantDetailActivity" />
+        <activity android:name=".ui.message.assistant.SelectGroupAssistantActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.ChatActivity"
+            android:name=".ui.message.ChatActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-        <activity android:name="com.liaobo.im.ui.message.ChatHistoryActivity" />
+        <activity android:name=".ui.message.ChatHistoryActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.ChatOverviewActivity"
+            android:name=".ui.message.ChatOverviewActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme_Sliding" />
-        <activity android:name="com.liaobo.im.ui.message.single.PersonSettingActivity" />
-        <activity android:name="com.liaobo.im.ui.message.single.SetChatBackActivity" />
-        <activity android:name="com.liaobo.im.ui.message.single.SetLabelActivity" />
-        <activity android:name="com.liaobo.im.ui.message.single.SetRemarkActivity" />
+        <activity android:name=".ui.message.single.PersonSettingActivity" />
+        <activity android:name=".ui.message.single.SetChatBackActivity" />
+        <activity android:name=".ui.message.single.SetLabelActivity" />
+        <activity android:name=".ui.message.single.SetRemarkActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.MucChatActivity"
+            android:name=".ui.message.MucChatActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-        <activity android:name="com.liaobo.im.ui.message.multi.AddContactsActivity" />
-        <activity android:name="com.liaobo.im.ui.message.multi.GroupManager" />
+        <activity android:name=".ui.message.multi.AddContactsActivity" />
+        <activity android:name=".ui.message.multi.GroupManager" />
         <activity
-            android:name="com.liaobo.im.ui.message.multi.GroupMoreFeaturesActivity"
+            android:name=".ui.message.multi.GroupMoreFeaturesActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity android:name="com.liaobo.im.ui.message.multi.GroupTransferActivity" />
-        <activity android:name="com.liaobo.im.ui.message.multi.InviteVerifyActivity" />
-        <activity android:name="com.liaobo.im.ui.message.multi.NoticeListActivity" />
-        <activity android:name="com.liaobo.im.ui.message.multi.ProclamationActivity" />
+        <activity android:name=".ui.message.multi.GroupTransferActivity" />
+        <activity android:name=".ui.message.multi.InviteVerifyActivity" />
+        <activity android:name=".ui.message.multi.NoticeListActivity" />
+        <activity android:name=".ui.message.multi.ProclamationActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.multi.RoomInfoActivity"
+            android:name=".ui.message.multi.RoomInfoActivity"
             android:launchMode="singleTop" />
-        <activity android:name="com.liaobo.im.ui.message.multi.RoomReadListActivity" />
+        <activity android:name=".ui.message.multi.RoomReadListActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.multi.SetManagerActivity"
+            android:name=".ui.message.multi.SetManagerActivity"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name="com.liaobo.im.ui.message.ManagerEmojiActivity" />
+        <activity android:name=".ui.message.ManagerEmojiActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.MessageRemindActivity"
+            android:name=".ui.message.MessageRemindActivity"
             android:theme="@style/Anim_fade" />
-        <activity android:name="com.liaobo.im.ui.message.search.SearchChatHistoryActivity" />
-        <activity android:name="com.liaobo.im.ui.message.search.SearchDesignationContent" />
-        <activity android:name="com.liaobo.im.ui.message.search.SearchImageVideoContent" />
+        <activity android:name=".ui.message.search.SearchChatHistoryActivity" />
+        <activity android:name=".ui.message.search.SearchDesignationContent" />
+        <activity android:name=".ui.message.search.SearchImageVideoContent" />
         <activity
-            android:name="com.liaobo.im.ui.message.InstantMessageActivity"
+            android:name=".ui.message.InstantMessageActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
-        <activity android:name="com.liaobo.im.ui.message.QuickSendPreviewActivity" />
+        <activity android:name=".ui.message.QuickSendPreviewActivity" />
         <activity
-            android:name="com.liaobo.im.ui.message.SelectNewContactsActivity"
+            android:name=".ui.message.SelectNewContactsActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.message.SelectNewGroupInstantActivity"
+            android:name=".ui.message.SelectNewGroupInstantActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" /> <!-- 群文件 -->
-        <activity android:name="com.liaobo.im.ui.mucfile.AddMucFileActivity" />
-        <activity android:name="com.liaobo.im.ui.mucfile.MucFileDetails" />
-        <activity android:name="com.liaobo.im.ui.mucfile.MucFileListActivity" />
-        <activity android:name="com.liaobo.im.ui.mucfile.MucFilePreviewActivity" /> <!-- 附近模块 -->
-        <activity android:name="com.liaobo.im.ui.nearby.UserSearchActivity" />
-        <activity android:name="com.liaobo.im.ui.nearby.UserListActivity" />
-        <activity android:name="com.liaobo.im.ui.nearby.UserListGatherActivity" />
-        <activity android:name="com.liaobo.im.ui.other.BasicInfoActivity" />
-        <activity android:name="com.liaobo.im.ui.other.MoreInfoActivity" />
-        <activity android:name="com.liaobo.im.ui.other.QRcodeActivity" /> <!-- 分享模块 -->
-        <activity
-            android:name="com.liaobo.im.ui.share.ShareLoginActivity"
+        <activity android:name=".ui.mucfile.AddMucFileActivity" />
+        <activity android:name=".ui.mucfile.MucFileDetails" />
+        <activity android:name=".ui.mucfile.MucFileListActivity" />
+        <activity android:name=".ui.mucfile.MucFilePreviewActivity" /> <!-- 附近模块 -->
+        <activity android:name=".ui.nearby.UserSearchActivity" />
+        <activity android:name=".ui.nearby.UserListActivity" />
+        <activity android:name=".ui.nearby.UserListGatherActivity" />
+        <activity android:name=".ui.other.BasicInfoActivity" />
+        <activity android:name=".ui.other.MoreInfoActivity" />
+        <activity android:name=".ui.other.QRcodeActivity" /> <!-- 分享模块 -->
+        <activity
+            android:name=".ui.share.ShareLoginActivity"
             android:exported="true"
             android:launchMode="singleTop" />
         <activity
-            android:name="com.liaobo.im.ui.share.AuthorizationActivity"
+            android:name=".ui.share.AuthorizationActivity"
             android:exported="true"
             android:launchMode="singleTop" />
         <activity
-            android:name="com.liaobo.im.ui.share.ShareNearChatFriend"
+            android:name=".ui.share.ShareNearChatFriend"
             android:exported="true"
             android:launchMode="singleTask">
             <intent-filter>
@@ -428,45 +432,46 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.liaobo.im.ui.share.ShareLifeCircleActivity"
+            android:name=".ui.share.ShareLifeCircleActivity"
             android:exported="true"
             android:launchMode="singleTop" />
         <activity
-            android:name="com.liaobo.im.ui.share.ShareNewFriend"
+            android:name=".ui.share.ShareNewFriend"
             android:launchMode="singleTop" />
         <activity
-            android:name="com.liaobo.im.ui.share.ShareNewGroup"
+            android:name=".ui.share.ShareNewGroup"
             android:launchMode="singleTop" /> <!-- Tool Activity -->
         <activity
-            android:name="com.liaobo.im.ui.tool.MultiImagePreviewActivity"
+            android:name=".ui.tool.MultiImagePreviewActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme_Sliding" />
         <activity
-            android:name="com.liaobo.im.ui.tool.SelectAreaActivity"
+            android:name=".ui.tool.SelectAreaActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.tool.SelectConstantActivity"
+            android:name=".ui.tool.SelectConstantActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.tool.SelectConstantSectionActivity"
+            android:name=".ui.tool.SelectConstantSectionActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.tool.SingleImagePreviewActivity"
+            android:name=".ui.tool.SingleImagePreviewActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme_Sliding" />
         <activity
-            android:name="com.liaobo.im.video.ChatVideoPreviewActivity"
+            android:name=".video.ChatVideoPreviewActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.tool.WebViewActivity"
+            android:name=".ui.tool.WebViewActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".ui.tool.WebViewOnlyActivity"
+        <activity
+            android:name=".ui.tool.WebViewOnlyActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.tool.SelectDateActivity"
+            android:name=".ui.tool.SelectDateActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.liaobo.im.ui.MainActivity"
+            android:name=".ui.MainActivity"
             android:fitsSystemWindows="true"
             android:label="@string/app_name"
             android:launchMode="singleTask"
@@ -478,30 +483,30 @@
             android:theme="@style/IMTheme.DialogStyle"/>
         -->
         <activity
-            android:name="com.liaobo.im.ui.UserCheckedActivity"
+            android:name=".ui.UserCheckedActivity"
             android:theme="@style/IMTheme.DialogStyle" />
         <activity
-            android:name="com.liaobo.im.video.EasyCameraActivity"
+            android:name=".video.EasyCameraActivity"
             android:screenOrientation="portrait" /> <!-- android:screenOrientation="portrait" 强制竖屏 -->
-        <!--CameraWithFilterActivity-->
+        <!-- CameraWithFilterActivity -->
         <activity
-            android:name="com.liaobo.im.luo.activity.CameraWithFilterActivity"
+            android:name=".luo.activity.CameraWithFilterActivity"
             android:exported="true"
             android:launchMode="singleTask" />
         <activity
-            android:name="com.liaobo.im.video.VideoRecorderActivity"
+            android:name=".video.VideoRecorderActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/RecxTheme" />
         <activity
-            android:name="com.liaobo.im.wxapi.WXEntryActivity"
+            android:name=".wxapi.WXEntryActivity"
             android:exported="true"
             android:launchMode="singleTask" />
         <activity
-            android:name="com.liaobo.im.wxapi.WXPayEntryActivity"
+            android:name=".wxapi.WXPayEntryActivity"
             android:exported="true"
             android:launchMode="singleTop" />
         <activity
-            android:name="com.liaobo.im.ui.me.redpacket.ChangePayPasswordActivity"
+            android:name=".ui.me.redpacket.ChangePayPasswordActivity"
             android:windowSoftInputMode="stateAlwaysVisible" /> <!-- 图片多选框架 -->
         <!--
                 <activity
@@ -513,21 +518,21 @@
                     android:theme="@style/PhotoPickerTheme"/>
         -->
         <activity
-            android:name="com.liaobo.im.view.photopicker.PhotoPickerActivity"
+            android:name=".view.photopicker.PhotoPickerActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/PhotoPickerTheme" />
         <activity
-            android:name="com.liaobo.im.view.photopicker.PhotoPreviewActivity"
+            android:name=".view.photopicker.PhotoPreviewActivity"
             android:theme="@style/PhotoPickerTheme" />
 
         <service
-            android:name="com.liaobo.im.xmpp.CoreService"
+            android:name=".xmpp.CoreService"
             android:enabled="true"
             android:exported="true" />
         <service android:name=".call.JitsiFloatService" />
         <service android:name=".call.RecordService" />
-        <service android:name="com.liaobo.im.view.window.WindowShowService" />
-        <service android:name="com.liaobo.im.RestartService" />
+        <service android:name=".view.window.WindowShowService" />
+        <service android:name=".RestartService" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -540,7 +545,7 @@
         </provider>
 
         <receiver
-            android:name="com.liaobo.im.MyBroadcastReceiver"
+            android:name=".MyBroadcastReceiver"
             android:process=":restart">
             <intent-filter>
                 <action android:name="${APP_ID}.action.broadcasttest.startActivity" />
@@ -600,7 +605,7 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name="com.liaobo.im.xmpp.helloDemon.MiMessageReceiver"
+            android:name=".xmpp.helloDemon.MiMessageReceiver"
             android:exported="true">
 
             <!-- 这里com.xiaomi.mipushdemo.DemoMessageRreceiver改成app中定义的完整类名 -->
@@ -617,7 +622,7 @@
         <service
             android:name="com.xiaomi.mipush.sdk.MessageHandleService"
             android:enabled="true" />
-        <service android:name="com.liaobo.im.xmpp.helloDemon.FirebaseMessageService">
+        <service android:name=".xmpp.helloDemon.FirebaseMessageService">
             <intent-filter>
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
@@ -634,7 +639,7 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- push应用定义消息receiver声明 -->
-        <receiver android:name="com.liaobo.im.xmpp.helloDemon.VivoPushMessageReceiver">
+        <receiver android:name=".xmpp.helloDemon.VivoPushMessageReceiver">
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -649,7 +654,7 @@
             android:name="com.vivo.push.app_id"
             android:value="${VIVO_APP_ID}" /> <!-- OPPO 推送 -->
         <service
-            android:name="com.liaobo.im.xmpp.helloDemon.OppoPushMessageService"
+            android:name=".xmpp.helloDemon.OppoPushMessageService"
             android:permission="com.coloros.mcs.permission.SEND_MCS_MESSAGE">
             <intent-filter>
                 <action android:name="com.coloros.mcs.action.RECEIVE_MCS_MESSAGE" />
@@ -675,7 +680,7 @@
             android:authorities="${APP_ID}.hms.update.provider"
             android:exported="false"
             android:grantUriPermissions="true" /> <!-- 4.用来接收PUSH消息的receiver： -->
-        <receiver android:name="com.liaobo.im.xmpp.helloDemon.HuaweiPushRevicer">
+        <receiver android:name=".xmpp.helloDemon.HuaweiPushRevicer">
             <intent-filter>
 
                 <!-- 必须,用于接收TOKEN -->
@@ -696,17 +701,17 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name="com.liaobo.im.ui.life.LifeCircleActivity" />
-        <activity android:name="com.liaobo.im.ui.nearby.PublicNumberSearchActivity" />
-        <activity android:name="com.liaobo.im.ui.nearby.PublicNumberListActivity" />
-        <activity android:name="com.liaobo.im.ui.circle.range.PraiseListActivity" />
+        <activity android:name=".ui.life.LifeCircleActivity" />
+        <activity android:name=".ui.nearby.PublicNumberSearchActivity" />
+        <activity android:name=".ui.nearby.PublicNumberListActivity" />
+        <activity android:name=".ui.circle.range.PraiseListActivity" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/icon_notification" /> <!-- 魅族推送， -->
         <!-- 绑定进程保活 -->
         <service
-            android:name="com.liaobo.im.xmpp.helloDemon.MeizuForegroundService"
+            android:name=".xmpp.helloDemon.MeizuForegroundService"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
@@ -714,7 +719,7 @@
         </service>
 
         <receiver
-            android:name="com.liaobo.im.xmpp.helloDemon.MeizuPushMsgReceiver"
+            android:name=".xmpp.helloDemon.MeizuPushMsgReceiver"
             tools:ignore="ExportedReceiver">
             <intent-filter>
 
@@ -732,7 +737,7 @@
         </receiver>
 
         <activity
-            android:name="com.liaobo.im.ui.systemshare.ShareNearChatFriend"
+            android:name=".ui.systemshare.ShareNearChatFriend"
             android:label="@string/send_to_friend">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -742,10 +747,10 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
-        <activity android:name="com.liaobo.im.ui.systemshare.ShareNewFriend" />
-        <activity android:name="com.liaobo.im.ui.systemshare.ShareNewGroup" />
+        <activity android:name=".ui.systemshare.ShareNewFriend" />
+        <activity android:name=".ui.systemshare.ShareNewGroup" />
         <activity
-            android:name="com.liaobo.im.ui.systemshare.ShareLifeCircleProxyActivity"
+            android:name=".ui.systemshare.ShareLifeCircleProxyActivity"
             android:label="@string/send_to_life_circle">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -755,10 +760,10 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
-        <activity android:name="com.liaobo.im.ui.systemshare.ShareShuoshuoActivity" />
-        <activity android:name="com.liaobo.im.ui.systemshare.ShareVideoActivity" />
-        <activity android:name="com.liaobo.im.ui.systemshare.ShareFileActivity" />
-        <activity android:name="com.liaobo.im.ui.account.QuickPay">
+        <activity android:name=".ui.systemshare.ShareShuoshuoActivity" />
+        <activity android:name=".ui.systemshare.ShareVideoActivity" />
+        <activity android:name=".ui.systemshare.ShareFileActivity" />
+        <activity android:name=".ui.account.QuickPay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -786,16 +791,16 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.liaobo.im.ui.lock.DeviceLockActivity"
+            android:name=".ui.lock.DeviceLockActivity"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateVisible|adjustResize" />
-        <activity android:name="com.liaobo.im.ui.me.SecureSettingActivity" />
+        <activity android:name=".ui.me.SecureSettingActivity" />
         <activity
-            android:name="com.liaobo.im.ui.lock.ChangeDeviceLockPasswordActivity"
+            android:name=".ui.lock.ChangeDeviceLockPasswordActivity"
             android:windowSoftInputMode="stateVisible|adjustResize" />
-        <activity android:name="com.liaobo.im.ui.contacts.SendContactsActivity" />
-        <activity android:name="com.liaobo.im.ui.login.WebLoginActivity" />
-        <activity android:name="com.liaobo.im.ui.message.multi.RoomCopyActivity"></activity>
+        <activity android:name=".ui.contacts.SendContactsActivity" />
+        <activity android:name=".ui.login.WebLoginActivity" />
+        <activity android:name=".ui.message.multi.RoomCopyActivity" />
     </application>
 
 </manifest>

skWeiChatBaidu/src/main/java/com/liaobo/im/bean/PrivacySetting.java

@@ -40,6 +40,7 @@ public class PrivacySetting {
     private int showTelephone;
     private int allowMsg;
     private int allowCall;
+    private boolean isAutoGetAssign;    //是否自动抢群指定红包
     private int allowJoinRoom;
     private List<String> throughoutShowLastLoginTimeList;// 始终显示上线时间的用户列表
     private List<String> noShowLastLoginTimeList;// 始终不显示上线时间的用户列表
@@ -204,6 +205,14 @@ public class PrivacySetting {
         this.isEncrypt = isEncrypt;
     }
 
+    public boolean isAutoGetAssign() {
+        return isAutoGetAssign;
+    }
+
+    public void setAutoGetAssign(boolean autoGetAssign) {
+        isAutoGetAssign = autoGetAssign;
+    }
+
     public int getIsVibration() {
         return isVibration;
     }

skWeiChatBaidu/src/main/java/com/liaobo/im/bean/QueryRedPacketDateBean.java

@@ -0,0 +1,34 @@
+package com.liaobo.im.bean;
+
+import java.io.Serializable;
+
+public class QueryRedPacketDateBean implements Serializable {
+    private static final long serialVersionUID = -6549035871525857859L;
+    private long startTime;
+    private long endTime;
+    private String queryTitle;
+
+    public long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(long startTime) {
+        this.startTime = startTime;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getQueryTitle() {
+        return queryTitle;
+    }
+
+    public void setQueryTitle(String queryTitle) {
+        this.queryTitle = queryTitle;
+    }
+}

skWeiChatBaidu/src/main/java/com/liaobo/im/bean/redpacket/BaseRedPacketItemEntity.java

@@ -0,0 +1,27 @@
+package com.liaobo.im.bean.redpacket;
+
+import java.io.Serializable;
+
+public class BaseRedPacketItemEntity implements Serializable {
+    private static final long serialVersionUID = 2382326423054556213L;
+
+
+    /**
+     * sendId : 10000664
+     * money : 8.63
+     * sendName : 15111111111
+     * redId : 5f4c5b4472e9871f36c34dc8
+     * id : 5f4c5bfa72e9871f36c34dcb
+     * time : 1598839802
+     * userName : 15111111111
+     * userId : 10000664
+     */
+    public long sendId;
+    public double money;
+    public String sendName;
+    public String redId;
+    public String id;
+    public long time;
+    public String userName;
+    public String userId;
+}

skWeiChatBaidu/src/main/java/com/liaobo/im/bean/redpacket/RedPacketSendBean.java

@@ -13,6 +13,7 @@ public class RedPacketSendBean implements Serializable {
      * redPacketSum : 5
      * amountSum : 131
      */
+
     private List<RedSendRedItemEntry> list = new ArrayList<>();
     private int redPacketSum;
     private double amountSum;
@@ -41,178 +42,5 @@ public class RedPacketSendBean implements Serializable {
         return amountSum;
     }
 
-    public class RedSendRedItemEntry {
-        /**
-         * over : 91.37
-         * receivedRemark :
-         * count : 10
-         * userRedType : 0
-         * greetings : 恭喜发财,万事如意
-         * type : 2
-         * userName : 15111111111
-         * toUserId : 0
-         * userId : 10000664
-         * sendTime : 1598839620
-         * money : 100
-         * roomJid : ba1e5b380fc94a0982b7bee300b734cc
-         * userIds : [10000664]
-         * receiveCount : 1
-         * id : 5f4c5b4472e9871f36c34dc8
-         * outTime : 1598926020
-         * status : 1
-         */
-        private double over;
-        private String receivedRemark;
-        private int count;
-        private int userRedType;
-        private String greetings;
-        private int type;
-        private String userName;
-        private int toUserId;
-        private int userId;
-        private int sendTime;
-        private int money;
-        private String roomJid;
-        private List<String> userIds;
-        private int receiveCount;
-        private String id;
-        private int outTime;
-        private int status;
-
-        public void setOver(double over) {
-            this.over = over;
-        }
-
-        public void setReceivedRemark(String receivedRemark) {
-            this.receivedRemark = receivedRemark;
-        }
-
-        public void setCount(int count) {
-            this.count = count;
-        }
-
-        public void setUserRedType(int userRedType) {
-            this.userRedType = userRedType;
-        }
-
-        public void setGreetings(String greetings) {
-            this.greetings = greetings;
-        }
-
-        public void setType(int type) {
-            this.type = type;
-        }
-
-        public void setUserName(String userName) {
-            this.userName = userName;
-        }
-
-        public void setToUserId(int toUserId) {
-            this.toUserId = toUserId;
-        }
-
-        public void setUserId(int userId) {
-            this.userId = userId;
-        }
-
-        public void setSendTime(int sendTime) {
-            this.sendTime = sendTime;
-        }
-
-        public void setMoney(int money) {
-            this.money = money;
-        }
-
-        public void setRoomJid(String roomJid) {
-            this.roomJid = roomJid;
-        }
-
-        public void setUserIds(List<String> userIds) {
-            this.userIds = userIds;
-        }
-
-        public void setReceiveCount(int receiveCount) {
-            this.receiveCount = receiveCount;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public void setOutTime(int outTime) {
-            this.outTime = outTime;
-        }
-
-        public void setStatus(int status) {
-            this.status = status;
-        }
 
-        public double getOver() {
-            return over;
-        }
-
-        public String getReceivedRemark() {
-            return receivedRemark;
-        }
-
-        public int getCount() {
-            return count;
-        }
-
-        public int getUserRedType() {
-            return userRedType;
-        }
-
-        public String getGreetings() {
-            return greetings;
-        }
-
-        public int getType() {
-            return type;
-        }
-
-        public String getUserName() {
-            return userName;
-        }
-
-        public int getToUserId() {
-            return toUserId;
-        }
-
-        public int getUserId() {
-            return userId;
-        }
-
-        public int getSendTime() {
-            return sendTime;
-        }
-
-        public int getMoney() {
-            return money;
-        }
-
-        public String getRoomJid() {
-            return roomJid;
-        }
-
-        public List<String> getUserIds() {
-            return userIds;
-        }
-
-        public int getReceiveCount() {
-            return receiveCount;
-        }
-
-        public String getId() {
-            return id;
-        }
-
-        public int getOutTime() {
-            return outTime;
-        }
-
-        public int getStatus() {
-            return status;
-        }
-    }
 }

skWeiChatBaidu/src/main/java/com/liaobo/im/bean/redpacket/RedSendRedItemEntry.java

@@ -0,0 +1,43 @@
+package com.liaobo.im.bean.redpacket;
+
+import java.util.List;
+
+
+public class RedSendRedItemEntry  extends BaseRedPacketItemEntity{
+
+
+    /**
+     * over : 91.37
+     * receivedRemark :
+     * count : 10
+     * userRedType : 0
+     * greetings : 恭喜发财,万事如意
+     * type : 2
+     * userName : 15111111111
+     * toUserId : 0
+     * userId : 10000664
+     * sendTime : 1598839620
+     * money : 100
+     * roomJid : ba1e5b380fc94a0982b7bee300b734cc
+     * userIds : [10000664]
+     * receiveCount : 1
+     * id : 5f4c5b4472e9871f36c34dc8
+     * outTime : 1598926020
+     * status : 1
+     */
+    public double over;
+    public String receivedRemark;
+    public int count;
+    public int userRedType;
+    public String greetings;
+    public int type;
+    public int toUserId;
+    public long sendTime;
+    public String roomJid;
+    public List<String> userIds;
+    public int receiveCount;
+    public long outTime;
+    public int status;
+
+
+}

skWeiChatBaidu/src/main/java/com/liaobo/im/fragment/MeFragment.java

@@ -14,7 +14,6 @@ import android.widget.TextView;
 import com.liaobo.im.AppConstant;
 import com.liaobo.im.R;
 import com.liaobo.im.Reporter;
-import com.liaobo.im.bean.SignInStatus;
 import com.liaobo.im.bean.User;
 import com.liaobo.im.broadcast.OtherBroadcast;
 import com.liaobo.im.course.LocalCourseActivity;
@@ -29,11 +28,12 @@ import com.liaobo.im.ui.base.EasyFragment;
 import com.liaobo.im.ui.circle.BusinessCircleActivity;
 import com.liaobo.im.ui.contacts.RoomActivity;
 import com.liaobo.im.ui.dialog.VerifiedDialogView;
+import com.liaobo.im.ui.me.AccessibilityActivity;
 import com.liaobo.im.ui.me.BasicInfoEditActivity;
 import com.liaobo.im.ui.me.MyCollection;
 import com.liaobo.im.ui.me.SelectFriendsActivity;
 import com.liaobo.im.ui.me.SettingActivity;
-import com.liaobo.im.ui.me.redpacket.RedListActivity;
+import com.liaobo.im.ui.me.redpacket.MyRedPacketActivity;
 import com.liaobo.im.ui.me.redpacket.WxPayBlance;
 import com.liaobo.im.ui.tool.SingleImagePreviewActivity;
 import com.liaobo.im.ui.tool.WebViewActivity;
@@ -49,7 +49,6 @@ import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
 
 import org.jetbrains.anko.ToastsKt;
 
-import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -156,6 +155,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.rlt_red_packet_record).setOnClickListener(this);
 
         findViewById(R.id.llGroup).setOnClickListener(v -> RoomActivity.start(requireContext()));
+        findViewById(R.id.rlt_accessibility).setOnClickListener(this);
 
         initTitleBackground();
 
@@ -229,7 +229,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 break;
             case R.id.rlt_red_packet_record:
                 //红包记录
-                startActivity(new Intent(getContext(), RedListActivity.class));
+                startActivity(new Intent(getContext(), MyRedPacketActivity.class));
                 break;
             case R.id.rlt_real_name_auth:
                 //实名认证
@@ -239,6 +239,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     checkVerified();
                 }
                 break;
+            case R.id.rlt_accessibility:
+                startActivity(new Intent(getContext(), AccessibilityActivity.class));
+                break;
         }
     }
 

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/MainActivity.java

@@ -573,6 +573,7 @@ public class MainActivity extends BaseActivity implements PermissionUtil.OnReque
         mTvMessageNum = (TextView) findViewById(R.id.main_tab_one_tv);
         mTvNewFriendNum = (TextView) findViewById(R.id.main_tab_two_tv);
         Friend newFriend = FriendDao.getInstance().getFriend(coreManager.getSelf().getUserId(), Friend.ID_NEW_FRIEND_MESSAGE);
+        if (newFriend!=null)
         updateNewFriendMsgNum(newFriend.getUnReadNum());
 
         mTvCircleNum = (TextView) findViewById(R.id.main_tab_three_tv);

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/AccessibilityActivity.java

@@ -0,0 +1,137 @@
+package com.liaobo.im.ui.me;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.liaobo.im.R;
+import com.liaobo.im.bean.PrivacySetting;
+import com.liaobo.im.bean.redpacket.RedSendRedItemEntry;
+import com.liaobo.im.helper.DialogHelper;
+import com.liaobo.im.helper.PrivacySettingHelper;
+import com.liaobo.im.ui.base.BaseActivity;
+import com.liaobo.im.ui.me.redpacket.MyRedPacketActivity;
+import com.liaobo.im.ui.me.redpacket.RedListActivity;
+import com.liaobo.im.util.PreferenceUtils;
+import com.liaobo.im.util.ToastUtil;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.HttpUtils;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.Result;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import okhttp3.Call;
+
+/**
+ * 辅助功能
+ */
+public class AccessibilityActivity extends BaseActivity  {
+    private SwitchCompat mSwitchCompat;
+    private boolean isAutoGetAssign;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_accessibility);
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
+        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
+        tvTitle.setText(R.string.accessibility);
+        mSwitchCompat = findViewById(R.id.switch_auto);
+        mSwitchCompat.setOnCheckedChangeListener( (compoundButton, bool) -> {
+            int type = 0;
+            if (bool){
+                type = 1;
+            }
+            if (bool!= isAutoGetAssign){
+                updateAutoGetAssign(type);
+
+            }
+
+        });
+        findViewById(R.id.flt_packet_record).setOnClickListener(view -> {
+            Intent intent = new Intent(this,RedListActivity.class);
+            intent.putExtra(RedListActivity.ADAPTER_TYPE,2);
+            startActivity(intent);
+        });
+        getPrivacySetting();
+
+
+
+    }
+
+
+    private void updateAutoGetAssign(int autoType){
+        DialogHelper.showMessageProgressDialog(this,"请稍等...");
+        Map<String, String> params = new HashMap<>();
+        params.put("access_token", coreManager.getSelfStatus().accessToken);
+        params.put("userId", coreManager.getSelf().getUserId());
+        params.put("isAutoGetAssign", String.valueOf(autoType));
+
+        HttpUtils.get().url(coreManager.getConfig().USER_SET_PRIVACY_SETTING)
+                .params(params)
+                .build()
+                .execute(new BaseCallback<Void>(Void.class) {
+
+                    @Override
+                    public void onResponse(ObjectResult<Void> result) {
+                        DialogHelper.dismissProgressDialog();
+                        if (Result.checkSuccess(AccessibilityActivity.this, result)) {
+                            Toast.makeText(AccessibilityActivity.this, getString(R.string.update_success), Toast.LENGTH_SHORT).show();
+                            setAutoGetAssignStatus(!isAutoGetAssign);
+
+
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Exception e) {
+                        DialogHelper.dismissProgressDialog();
+                        ToastUtil.showErrorNet(mContext);
+                        setAutoGetAssignStatus(isAutoGetAssign);
+                    }
+                });
+    }
+
+
+    // 获取用户的设置状态
+    private void getPrivacySetting() {
+        Map<String, String> params = new HashMap<>();
+        params.put("access_token", coreManager.getSelfStatus().accessToken);
+        params.put("userId", coreManager.getSelf().getUserId());
+        DialogHelper.showDefaulteMessageProgressDialog(this);
+
+        HttpUtils.get().url(coreManager.getConfig().USER_GET_PRIVACY_SETTING)
+                .params(params)
+                .build()
+                .execute(new BaseCallback<PrivacySetting>(PrivacySetting.class) {
+
+                    @Override
+                    public void onResponse(ObjectResult<PrivacySetting> result) {
+                        DialogHelper.dismissProgressDialog();
+                        if (Result.checkSuccess(AccessibilityActivity.this, result)) {
+                            setAutoGetAssignStatus(result.getData().isAutoGetAssign());
+                        }
+
+                    }
+
+                    @Override
+                    public void onError(Call call, Exception e) {
+                        DialogHelper.dismissProgressDialog();
+                        ToastUtil.showNetError(AccessibilityActivity.this);
+
+                    }
+                });
+    }
+
+    private void setAutoGetAssignStatus(boolean autoType){
+        isAutoGetAssign = autoType;
+        mSwitchCompat.setChecked(isAutoGetAssign);
+
+    }
+}

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/redpacket/MyRedPacketActivity.java

@@ -0,0 +1,152 @@
+package com.liaobo.im.ui.me.redpacket;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.liaobo.im.R;
+import com.liaobo.im.bean.redpacket.RedPacketReceiveBean;
+import com.liaobo.im.helper.AvatarHelper;
+import com.liaobo.im.helper.DialogHelper;
+import com.liaobo.im.ui.base.BaseActivity;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.HttpUtils;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
+import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
+import com.makeramen.roundedimageview.RoundedImageView;
+
+import java.util.HashMap;
+
+import okhttp3.Call;
+
+public class MyRedPacketActivity extends BaseActivity {
+    private RoundedImageView mAvatarImg;
+    private TextView tvUserId,tvReceivePacket,tvLucy, tvRedPacketMoney;
+    private Spinner mSpinner;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_my_red_packet);
+
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
+        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
+
+        tvTitle.setText(R.string.my_red_packet);
+        tvUserId = findViewById(R.id.tv_userId);
+        tvReceivePacket = findViewById(R.id.tv_lucy);
+        tvLucy = findViewById(R.id.receive_packet);
+        tvRedPacketMoney = findViewById(R.id.tv_red_packet_money);
+        mAvatarImg = findViewById(R.id.avatar_img);
+        mSpinner = findViewById(R.id.spinner_packet);
+        AvatarHelper.getInstance().displayAvatar(coreManager.getSelf().getUserId(), mAvatarImg, true);
+        tvUserId.setText(coreManager.getSelf().getUserId());
+        findViewById(R.id.received_red_packet).setOnClickListener(view -> {
+            Intent intent = new Intent(this,RedListActivity.class);
+            intent.putExtra(RedListActivity.ADAPTER_TYPE,0);
+            startActivity(intent);
+        });
+        findViewById(R.id.send_red_packet).setOnClickListener(view -> {
+            Intent intent = new Intent(this,RedListActivity.class);
+            intent.putExtra(RedListActivity.ADAPTER_TYPE,1);
+            startActivity(intent);
+        });
+        initSpinner();
+        loadReceiveRedPacket(null,null);
+
+
+    }
+
+    private void loadReceiveRedPacket(String startTime,String endTime) {
+        DialogHelper.showMessageProgressDialog(this,"请稍等...");
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", coreManager.getSelfStatus().accessToken);
+        params.put("pageIndex",   "1");
+        params.put("pageSize", "25");
+        if (!TextUtils.isEmpty(startTime)){
+            params.put("startTime",startTime);
+        }
+        if (!TextUtils.isEmpty(endTime)){
+            params.put("endTime",endTime);
+        }
+
+
+
+        HttpUtils.get().url(coreManager.getConfig().RECIVE_REDPACKET_LIST_GET)
+                .params(params)
+                .build()
+                .execute(new BaseCallback<RedPacketReceiveBean>(RedPacketReceiveBean.class) {
+
+                    @Override
+                    public void onResponse(ObjectResult<RedPacketReceiveBean> result) {
+                        DialogHelper.dismissProgressDialog();
+                        updateUI(result.getData());
+
+
+                    }
+
+                    @Override
+                    public void onError(Call call, Exception e) {
+                        DialogHelper.dismissProgressDialog();
+                    }
+                });
+    }
+
+    private void updateUI(RedPacketReceiveBean receiveBean){
+
+        if (receiveBean!=null){
+            tvLucy.setText(Html.fromHtml(getResources().getString(R.string.red_best_lucky)+"<font color='#159bfb'>"+receiveBean.bestSum+"</font>次"));
+            tvReceivePacket.setText(Html.fromHtml(getResources().getString(R.string.received_red_packet)+"<font color='#159bfb'>"+receiveBean.redReceiveSum+"</font>个"));
+            tvRedPacketMoney.setText("￥"+receiveBean.amountSum);
+        }
+
+
+    }
+
+    private void initSpinner(){
+
+        mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int position, long l) {
+                long currentTime = System.currentTimeMillis()/1000;
+                int day = 0;
+                switch (position){
+                    case 1:
+                        day = 7;
+                        break;
+                    case 2:
+                        day =30;
+                        break;
+                    case 3:
+                        day=90;
+                        break;
+                    default:
+                        day=-1;
+                        break;
+                }
+                long startTime = getStartTime(currentTime,day);
+            loadReceiveRedPacket(String.valueOf(startTime),String.valueOf(currentTime));
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
+
+
+    }
+    private long getStartTime(long currentTime,int day){
+        if (day==-1) return 0;
+        long startTime = currentTime - day*24*3600;
+        return  startTime;
+
+    }
+
+
+}

skWeiChatBaidu/src/main/java/com/liaobo/im/ui/me/redpacket/RedListActivity.java

@@ -1,27 +1,27 @@
 package com.liaobo.im.ui.me.redpacket;
 
 import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.v4.view.ViewPager;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.ListView;
 import android.widget.TextView;
 
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.liaobo.im.R;
-import com.liaobo.im.bean.redpacket.RedPacketReceviceBean;
+import com.liaobo.im.bean.redpacket.BaseRedPacketItemEntity;
+import com.liaobo.im.bean.redpacket.RedPacketReceiveBean;
 import com.liaobo.im.bean.redpacket.RedPacketSendBean;
+import com.liaobo.im.bean.redpacket.RedSendRedItemEntry;
 import com.liaobo.im.db.InternationalizationHelper;
 import com.liaobo.im.ui.base.BaseActivity;
-import com.liaobo.im.ui.smarttab.SmartTabLayout;
 import com.liaobo.im.xuan.xuanhttplibrary.okhttp.HttpUtils;
 import com.liaobo.im.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
-import com.liaobo.im.xuan.xuanhttplibrary.okhttp.callback.ListCallback;
-import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.ArrayResult;
 import com.liaobo.im.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -36,120 +36,96 @@ import okhttp3.Call;
  * 红包记录界面Activity
  * Created by 魏正旺 on 2016/9/23.
  */
-public class RedListActivity extends BaseActivity implements View.OnClickListener, PullToRefreshBase.OnRefreshListener2 {
+public class RedListActivity extends BaseActivity  {
+
     // 数据格式，保留两位小数
     DecimalFormat df;
     // 显示时间的格式
     SimpleDateFormat sdf;
-    private SmartTabLayout smartTabLayout;
-    private ViewPager redlistPager;
-    private List<View> views;
-    private List<String> mTitleList;
-    private LayoutInflater inflater;
-    private PullToRefreshListView pullToRefreshListViewRedrecive;
-    private PullToRefreshListView pullToRefreshListViewRedsend;
+
+    public static final String ADAPTER_TYPE = "adapterType";
     // 数据集合
-    private RedPacketSendBean redSendBean;
-    private RedPacketReceviceBean mRedPacketReceviceBean;
+//    private RedPacketSendBean redSendBean;
+//    private RedPacketReceiveBean mRedPacketReceviceBean;
     // 表示发出的还是接受的红包list  0代表收到  1代表发出
     private int adapterType;
     // 两个listview数据加载的页数
-    private int pageIndexSend, getPageIndexRecive;
+    private int mPageIndex =1;
     private RedListItemAdapter redListItemAdapter;
+    private SmartRefreshLayout smartRefreshLayout;
+    private ListView mRedPacketListView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.redpacket_list);
-        inflater = LayoutInflater.from(this);
+
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(view -> finish());
+        TextView tvTitle = findViewById(R.id.tv_title_center);
+        adapterType = getIntent().getIntExtra(ADAPTER_TYPE,0);
+        if (adapterType==0){
+            redListItemAdapter = new RedListItemAdapter<>();
+            tvTitle.setText(InternationalizationHelper.getString("PACKETS_RECEIVED"));
+
+        }else if (adapterType ==1){
+            redListItemAdapter = new RedListItemAdapter<RedSendRedItemEntry>();
+            tvTitle.setText(InternationalizationHelper.getString("ENVELOPES_ISSUED"));
+        }else {
+            tvTitle.setText(R.string.view_auto_get_red_packet_title);
+            redListItemAdapter = new RedListItemAdapter<>();
+        }
+        mRedPacketListView = findViewById(R.id.red_packet_list_view);
+        smartRefreshLayout = findViewById(R.id.smart_refresh_layout);
+
         df = new DecimalFormat("######0.00");
         sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
         initView();
-        initData();
+        getData(1);
     }
 
     private void initView() {
-        getSupportActionBar().hide();
-        findViewById(R.id.tv_title_left).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
-        tvTitle.setText(InternationalizationHelper.getString("RED_PACKETS"));
 
-        mTitleList = new ArrayList<String>();
-        views = new ArrayList<View>();
-
-        redSendBean = new RedPacketSendBean();
-        mRedPacketReceviceBean = new RedPacketReceviceBean();
-        //        mTitleList.add("收到的红包");
-        //        mTitleList.add("发出的红包");
-        mTitleList.add(InternationalizationHelper.getString("PACKETS_RECEIVED"));
-        mTitleList.add(InternationalizationHelper.getString("ENVELOPES_ISSUED"));
-
-        views.add(inflater.inflate(R.layout.redpacket_recivelist, null));
-        views.add(inflater.inflate(R.layout.redpacket_sendlist, null));
-
-        redlistPager = (ViewPager) findViewById(R.id.viewpagert_redlist);
-        smartTabLayout = (SmartTabLayout) findViewById(R.id.smarttablayout_redlist);
-        pullToRefreshListViewRedrecive =
-                (PullToRefreshListView) views.get(0).findViewById(R.id.pull_refresh_list_redrecive);
-
-        pullToRefreshListViewRedsend =
-                (PullToRefreshListView) views.get(1).findViewById(R.id.pull_refresh_list_redsend);
-        redlistPager.setAdapter(new PagerAdapter());
-        smartTabLayout.setViewPager(redlistPager);
+//        redSendBean = new RedPacketSendBean();
+//        mRedPacketReceviceBean = new RedPacketReceiveBean();
 
         // 设置Adapter
         redListItemAdapter = new RedListItemAdapter();
-        pullToRefreshListViewRedsend.getRefreshableView().setAdapter(redListItemAdapter);
-        pullToRefreshListViewRedrecive.getRefreshableView().setAdapter(redListItemAdapter);
-
-        redlistPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        mRedPacketListView.setAdapter(redListItemAdapter);
+        smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
             @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                getData(mPageIndex+1);
             }
 
             @Override
-            public void onPageSelected(int position) {
-                // 切换listview的时候。Adapter类型也要换
-                adapterType = position;
-                redListItemAdapter.notifyDataSetChanged(); // 切换Tab的时候要重新适配一下
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                smartRefreshLayout.setEnableLoadMore(true);
+                mPageIndex =1;
+                getData(mPageIndex);
 
             }
         });
 
-        /**
-         * 为了实现点击Tab栏切换的时候不出现动画
-         * 为每个Tab重新设置点击事件
-         */
-        for (int i = 0; i < mTitleList.size(); i++) {
-            View view = smartTabLayout.getTabAt(i);
-            view.setTag(i + "");
-            view.setOnClickListener(this);
-        }
-        // 添加listview下拉加载的监听处理
-        pullToRefreshListViewRedrecive.setOnRefreshListener(this);
-        pullToRefreshListViewRedsend.setOnRefreshListener(this);
     }
 
-    private void initData() {
-        loadReciveRed();
-        loadSendRed();
+
+    private void getData(int pageIndex) {
+        if (adapterType==0){
+            loadReceiveRedPacket(pageIndex);
+        }else if (adapterType ==1){
+            loadSendRed(pageIndex);
+        }else {
+            loadAutoGetAssignRedReceiveList(pageIndex);
+        }
     }
 
-    private void loadSendRed() {
+    private void loadSendRed(int pageIndex) {
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", coreManager.getSelfStatus().accessToken);
-        params.put("pageIndex", pageIndexSend + "");
-        params.put("pageSize", 25 + "");
+        params.put("pageIndex", pageIndex + "");
+        params.put("pageSize", "25");
         params.put("secret","");
 
         HttpUtils.get().url(coreManager.getConfig().SEND_REDPACKET_LIST_GET)
@@ -159,127 +135,120 @@ public class RedListActivity extends BaseActivity implements View.OnClickListene
 
                     @Override
                     public void onResponse(ObjectResult<RedPacketSendBean> result) {
+                        smartRefreshLayout.finishLoadMore();
+                        smartRefreshLayout.finishRefresh();
                         if (result!=null && result.getData()!=null && result.getData().getList()!=null && result.getData().getList().size() > 0) {
-                            if (redSendBean.getList()==null){
-                                redSendBean.setList(new ArrayList<>());
-                            }
-                            for (RedPacketSendBean.RedSendRedItemEntry item : result.getData().getList()) {
-                                redSendBean.getList().add(item);
+                          List<RedSendRedItemEntry> dataList = result.getData().getList();
+
+                            if (mPageIndex==1){
+                                redListItemAdapter.setData(dataList);
+
+                            }else {
+                                redListItemAdapter.addData(dataList);
                             }
                             redListItemAdapter.notifyDataSetChanged();
-                            pageIndexSend++;
+                            mPageIndex++;
+                        }else {
+                            smartRefreshLayout.setEnableLoadMore(false);
                         }
-                        pullToRefreshListViewRedsend.onRefreshComplete();
+
                     }
 
                     @Override
                     public void onError(Call call, Exception e) {
-
+                        smartRefreshLayout.finishLoadMore();
+                        smartRefreshLayout.finishRefresh();
                     }
                 });
     }
 
-    private void loadReciveRed() {
+    private void loadAutoGetAssignRedReceiveList(int pageIndex) {
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", coreManager.getSelfStatus().accessToken);
-        params.put("pageIndex", getPageIndexRecive + "");
+        params.put("pageIndex", pageIndex + "");
         params.put("pageSize", 25 + "");
 
-        HttpUtils.get().url(coreManager.getConfig().RECIVE_REDPACKET_LIST_GET)
+        HttpUtils.get().url(coreManager.getConfig().GET_AUTO_ASSIGN_RED_RECEIVE_LIST)
                 .params(params)
                 .build()
-                .execute(new BaseCallback<RedPacketReceviceBean>(RedPacketReceviceBean.class) {
+                .execute(new BaseCallback<RedPacketReceiveBean>(RedPacketReceiveBean.class) {
 
                     @Override
-                    public void onResponse(ObjectResult<RedPacketReceviceBean> result) {
-
-                        if (mRedPacketReceviceBean.getList()==null){
-                            mRedPacketReceviceBean.setList(new ArrayList<>());
-                        }
-                        if (result!=null && result.getData()!=null&& result.getData().getList()!=null && result.getData().getList().size() > 0) {
-                            for (RedPacketReceviceBean.RedPacketReceviceItemEntity  itemEntity : result.getData().getList()) {
-                                mRedPacketReceviceBean.getList().add(itemEntity);
+                    public void onResponse(ObjectResult<RedPacketReceiveBean> result) {
+                        smartRefreshLayout.finishLoadMore();
+                        smartRefreshLayout.finishRefresh();
+
+                        if (result!=null && result.getData()!=null&& result.getData().list!=null && result.getData().list.size() > 0) {
+                            List<BaseRedPacketItemEntity> dataList = result.getData().list;
+                            if (mPageIndex==1){
+                                redListItemAdapter.setData(dataList);
+                            }else {
+                                redListItemAdapter.addData(dataList);
                             }
-                            redListItemAdapter.notifyDataSetChanged();
-                            getPageIndexRecive++;
+                            mPageIndex++;
+                        }else {
+                            smartRefreshLayout.setEnableLoadMore(false);
                         }
-                        pullToRefreshListViewRedrecive.onRefreshComplete();
+
                     }
 
                     @Override
                     public void onError(Call call, Exception e) {
+                        smartRefreshLayout.finishLoadMore();
+                        smartRefreshLayout.finishRefresh();
                     }
                 });
     }
 
-    @Override
-    public void onPullDownToRefresh(PullToRefreshBase refreshView) {
-    }
-
-    @Override
-    public void onPullUpToRefresh(PullToRefreshBase refreshView) {
-        if (refreshView.getId() == R.id.pull_refresh_list_redrecive) {
-            loadReciveRed();
-        } else if (refreshView.getId() == R.id.pull_refresh_list_redsend) {
-            loadSendRed();
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        // 根据Tab按钮传递的Tag来判断是那个页面，设置到相应的界面并且去掉动画
-        int index = Integer.parseInt(v.getTag().toString());
-        redlistPager.setCurrentItem(index, false);
-    }
-
-    private class PagerAdapter extends android.support.v4.view.PagerAdapter {
-
-        @Override
-        public int getCount() {
-            return views.size();
-        }
-
-        @Override
-        public boolean isViewFromObject(View view, Object object) {
-            return view == object;
-        }
 
+    private void loadReceiveRedPacket(int pageIndex) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", coreManager.getSelfStatus().accessToken);
+        params.put("pageIndex", pageIndex + "");
+        params.put("pageSize", 25 + "");
 
-        @Override
-        public Object instantiateItem(View container, int position) {
-            ((ViewGroup) container).addView(views.get(position));
+        HttpUtils.get().url(coreManager.getConfig().RECIVE_REDPACKET_LIST_GET)
+                .params(params)
+                .build()
+                .execute(new BaseCallback<RedPacketReceiveBean>(RedPacketReceiveBean.class) {
 
-            return views.get(position);
-        }
+                    @Override
+                    public void onResponse(ObjectResult<RedPacketReceiveBean> result) {
+                        smartRefreshLayout.finishLoadMore();
+                        smartRefreshLayout.finishRefresh();
+
+                        if (result!=null && result.getData()!=null&& result.getData().list!=null && result.getData().list.size() > 0) {
+                            List<BaseRedPacketItemEntity> dataList = result.getData().list;
+                            if (mPageIndex==1){
+                                redListItemAdapter.setData(dataList);
+                            }else {
+                                redListItemAdapter.addData(dataList);
+                            }
+                            mPageIndex++;
+                        }else {
+                            smartRefreshLayout.setEnableLoadMore(false);
+                        }
 
-        @Override
-        public Parcelable saveState() {
-            return null;
-        }
+                    }
 
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return mTitleList.get(position);
-        }
+                    @Override
+                    public void onError(Call call, Exception e) {
+                        smartRefreshLayout.finishLoadMore();
+                        smartRefreshLayout.finishRefresh();
+                    }
+                });
     }
 
+
     /**
      * listview Adapter
      */
-    public class RedListItemAdapter extends BaseAdapter {
-
-        View view;
+    public class RedListItemAdapter<T extends BaseRedPacketItemEntity> extends BaseAdapter {
+        List<T> mList = new ArrayList<>();
 
         @Override
         public int getCount() {
-
-            if (adapterType == 0) {
-                if (mRedPacketReceviceBean.getList()==null) return 0;
-                return mRedPacketReceviceBean.getList().size();
-            } else {
-                if (redSendBean.getList()==null) return 0;
-                return redSendBean.getList().size();
-            }
+            return mList ==null?0:mList.size();
         }
 
         @Override
@@ -287,6 +256,23 @@ public class RedListActivity extends BaseActivity implements View.OnClickListene
             return null;
         }
 
+        public void addData(List<T> list){
+            if (list!=null){
+                mList.addAll(list);
+                notifyDataSetChanged();
+            }
+        }
+        public void addData(T entity){
+            mList.add(entity);
+            notifyDataSetChanged();
+        }
+        public void setData(List<T> list){
+            if (list!=null){
+                mList= list;
+                notifyDataSetChanged();
+            }
+        }
+
         @Override
         public long getItemId(int position) {
             return 0;
@@ -297,6 +283,7 @@ public class RedListActivity extends BaseActivity implements View.OnClickListene
 
             RedViewHolder redViewHolder;
             if (convertView == null) {
+                LayoutInflater inflater = LayoutInflater.from(getApplicationContext());
                 convertView = inflater.inflate(R.layout.red_item, null);
                 redViewHolder = new RedViewHolder();
 
@@ -308,15 +295,15 @@ public class RedListActivity extends BaseActivity implements View.OnClickListene
                 redViewHolder = (RedViewHolder) convertView.getTag();
             }
 
-            if (adapterType == 0) {
-                long lcc_time = mRedPacketReceviceBean.getList().get(position).getTime();
+            if (adapterType == 0 ||adapterType==2) {
+                long lcc_time = mList.get(position).time;
                 String StrTime = sdf.format(new Date(lcc_time * 1000L));
-                redViewHolder.userNameTv.setText(mRedPacketReceviceBean.getList().get(position).getSendName());
+                redViewHolder.userNameTv.setText(mList.get(position).sendName);
                 redViewHolder.timeTv.setText(StrTime);
-                redViewHolder.moneyTv.setText(df.format(mRedPacketReceviceBean.getList().get(position).getMoney()) + InternationalizationHelper.getString("YUAN"));
+                redViewHolder.moneyTv.setText(df.format(mList.get(position).money) + InternationalizationHelper.getString("YUAN"));
             } else if (adapterType == 1) {
-
-                switch (redSendBean.getList().get(position).getType()) {
+                int type = ((RedSendRedItemEntry)mList.get(position)).type;
+                switch (type) {
                     case 1: {
                         //                        redViewHolder.userNameTv.setText("普通红包");
                         redViewHolder.userNameTv.setText(InternationalizationHelper.getString("JX_UsualGift"));
@@ -335,10 +322,10 @@ public class RedListActivity extends BaseActivity implements View.OnClickListene
                     }
                     break;
                 }
-                long lcc_time = (long) redSendBean.getList().get(position).getSendTime();
+                long lcc_time = ((RedSendRedItemEntry)mList.get(position)).sendTime;
                 String StrTime = sdf.format(new Date(lcc_time * 1000L));
                 redViewHolder.timeTv.setText(StrTime);
-                redViewHolder.moneyTv.setText(df.format(redSendBean.getList().get(position).getMoney()) + InternationalizationHelper.getString("YUAN"));
+                redViewHolder.moneyTv.setText(df.format(mList.get(position).money) + InternationalizationHelper.getString("YUAN"));
             }
             return convertView;
         }

skWeiChatBaidu/src/main/res/drawable/shape_bg_gray_dcdcdc_radius_12.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="12dp"/>
+    <solid android:color="#dcdcdc"/>
+
+
+</shape>

skWeiChatBaidu/src/main/res/drawable/shape_bg_gray_eeeeee_radius_24.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp"/>
+    <solid android:color="#eeeeee"/>
+
+
+</shape>

skWeiChatBaidu/src/main/res/layout/activity_accessibility.xml

@@ -0,0 +1,144 @@
+<?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="#e1e1e1"
+
+    android:orientation="vertical">
+
+    <include layout="@layout/a_view_actionbar" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:gravity="center"
+        android:padding="5dp"
+        android:text="@string/automatic_function"
+        android:textColor="@color/black"
+        android:textSize="16sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="130dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
+        android:background="@drawable/shape_bg_gray_eeeeee_radius_24"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="10dp"
+        android:paddingEnd="16dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+
+            <android.support.v7.widget.SwitchCompat
+                android:id="@+id/switch_auto"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:theme="@style/SwitchCompat.Control"
+                android:layout_centerVertical="true" />
+
+            <TextView
+                android:id="@+id/tv_auto_get_assign_red_packet"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="15dp"
+                android:layout_toStartOf="@+id/switch_auto"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="@string/auto_get_assign_red_packet"
+                android:textColor="@color/black"
+                android:textSize="22sp" />
+        </RelativeLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:gravity="center_vertical"
+            android:text="@string/auto_get_assign_red_packet_explain"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="130dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp"
+        android:gravity="center_vertical"
+        android:layout_marginEnd="10dp"
+        android:background="@drawable/shape_bg_gray_eeeeee_radius_24"
+        android:orientation="vertical"
+        android:paddingStart="10dp"
+        android:paddingEnd="16dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <FrameLayout
+                android:id="@+id/flt_packet_record"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center"
+                    android:src="@color/white"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    style="@style/IMTbleLine_ArrowImg.Me"
+                    android:layout_gravity="center"
+                    android:background="@drawable/me_chevron_right"
+                    android:contentDescription="@string/app_name" />
+
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/tv_record"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="15dp"
+                android:layout_toStartOf="@+id/flt_packet_record"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="@string/view_record"
+                android:textColor="@color/black"
+                android:textSize="22sp" />
+
+        </RelativeLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_record"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="15dp"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:text="@string/view_auto_get_red_packet"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+
+</LinearLayout>

skWeiChatBaidu/src/main/res/layout/activity_my_red_packet.xml

@@ -0,0 +1,142 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context=".ui.me.redpacket.MyRedPacketActivity">
+    <include layout="@layout/a_view_actionbar" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:paddingEnd="12dp"
+        android:background="@drawable/shape_bg_gray_dcdcdc_radius_12"
+        android:layout_height="wrap_content">
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avatar_img"
+            android:src="#159bfb"
+            android:layout_width="68dp"
+            android:layout_margin="12dp"
+            app:riv_corner_radius="6dp"
+            android:layout_height="68dp"/>
+        <TextView
+            android:id="@+id/tv_userId"
+            android:textColor="#159bfb"
+            android:text="111111111"
+            android:textSize="16sp"
+            android:layout_alignTop="@+id/avatar_img"
+            android:layout_toRightOf="@+id/avatar_img"
+            android:layout_toLeftOf="@+id/receive_packet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+        <Spinner
+            android:id="@+id/spinner_packet"
+            android:layout_toRightOf="@+id/avatar_img"
+            android:layout_alignBottom="@+id/avatar_img"
+            android:layout_width="wrap_content"
+            android:entries="@array/query_red_packet"
+            android:layout_height="wrap_content"/>
+
+
+        <TextView
+            android:id="@+id/receive_packet"
+            android:layout_marginTop="4dp"
+            android:layout_alignTop="@+id/avatar_img"
+            android:layout_alignParentEnd="true"
+            android:textColor="#333333"
+            android:text="收到红包"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/tv_lucy"
+            android:layout_alignParentEnd="true"
+            android:textColor="#333333"
+            android:layout_alignBottom="@+id/avatar_img"
+            android:layout_marginBottom="4dp"
+            android:text="手气最佳"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+        <LinearLayout
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_below="@+id/avatar_img"
+            android:layout_alignLeft="@+id/avatar_img"
+            android:layout_height="wrap_content">
+
+            <TextView
+            android:text="共计收到"
+            android:textSize="16sp"
+            android:textColor="#666666"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+            <TextView
+                android:id="@+id/tv_red_packet_money"
+                android:text="￥0.00"
+                android:textSize="20sp"
+
+                android:layout_marginStart="12dp"
+                android:textColor="@color/black"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+
+
+    </RelativeLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:padding="12dp"
+        android:background="@drawable/gray_bg_shadow"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/iv_red_packet_record"
+            android:layout_width="96dp"
+            android:layout_marginEnd="24dp"
+
+
+            android:src="@mipmap/icon_red_packet_record"
+            android:layout_height="96dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_marginEnd="24dp"
+            android:gravity="center_vertical"
+            android:layout_toEndOf="@+id/iv_red_packet_record"
+            android:layout_alignBottom="@+id/iv_red_packet_record"
+            android:layout_alignTop="@+id/iv_red_packet_record"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/received_red_packet"
+
+
+                android:text="@string/received_red_packet2"
+                android:textSize="16sp"
+                android:textColor="@color/black"
+                android:drawableRight="@drawable/me_chevron_right"
+
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:id="@+id/send_red_packet"
+               android:layout_marginTop="24dp"
+                android:text="@string/send_red_packet2"
+                android:textSize="16sp"
+                android:drawableRight="@drawable/me_chevron_right"
+                android:textColor="@color/black"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
+
+
+
+</LinearLayout>

skWeiChatBaidu/src/main/res/layout/redpacket_list.xml

@@ -4,84 +4,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:background="@color/redpacket_bg">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="20dp">
-
-            <TextView
-                android:id="@+id/tv_title_left"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
-                android:gravity="center"
-                android:text="@string/cancel"
-                android:textColor="@color/yellow"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/tv_title_center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginLeft="10dp"
-                android:text="@string/send_red_packet"
-                android:textColor="@color/yellow"
-                android:textSize="17sp" />
-
-        </RelativeLayout>
-
-    </FrameLayout>
-
-    <RelativeLayout
+    <include layout="@layout/a_view_actionbar" />
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/smart_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.liaobo.im.ui.smarttab.SmartTabLayout
-            android:id="@+id/smarttablayout_redlist"
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@color/redpacket_bg"
-            app:stl_customTabTextLayoutId="@layout/a_custom_tab2"
-            app:stl_defaultTabTextAllCaps="true"
-            app:stl_defaultTabTextColor="@color/yellow"
-            app:stl_defaultTabTextHorizontalPadding="10dp"
-            app:stl_defaultTabTextMinWidth="0dp"
-            app:stl_defaultTabTextSize="16sp"
-            app:stl_distributeEvenly="true"
-            app:stl_dividerColor="#00000000"
-            app:stl_dividerThickness="1dp"
-            app:stl_drawDecorationAfterTab="false"
-            app:stl_indicatorAlwaysInCenter="false"
-            app:stl_indicatorColor="#00FFFFFF"
-            app:stl_indicatorCornerRadius="2dp"
-            app:stl_indicatorGravity="bottom"
-            app:stl_indicatorInFront="false"
-            app:stl_indicatorInterpolation="linear"
-            app:stl_indicatorThickness="1dp"
-            app:stl_indicatorWithoutPadding="true"
-            app:stl_overlineColor="#ffffff"
-            app:stl_overlineThickness="0dp"
-            app:stl_titleOffset="24dp"
-            app:stl_underlineColor="#ffffff"
-            app:stl_underlineThickness="0dp">
-
-        </com.liaobo.im.ui.smarttab.SmartTabLayout>
-
-        <android.support.v4.view.ViewPager
-            android:id="@+id/viewpagert_redlist"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="#1aa8ff" />
+        <ListView
+            android:id="@+id/red_packet_list_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@+id/smarttablayout_redlist">
-
-        </android.support.v4.view.ViewPager>
+            android:layout_height="match_parent"/>
+        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="#1aa8ff" />
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-    </RelativeLayout>
 
 </LinearLayout>

skWeiChatBaidu/src/main/res/values-en/arrays.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="query_red_packet">
+        <item>All</item>
+        <item>7 days</item>
+        <item>30 days</item>
+        <item>90 days</item>
+    </string-array>
+</resources>

skWeiChatBaidu/src/main/res/values-en/strings.xml

@@ -1661,4 +1661,19 @@
     <string name="filter_crayon">Crayon</string>
     <string name="copy_sure">Determine Replication</string>
     <string name="input_card_num">Please fill in the bank card information</string>
+
+    <string name="accessibility">Accessibility</string>
+    <string name="red_packet_record">RedPacket Record</string>
+    <string name="automatic_function">Automatic</string>
+    <string name="auto_get_assign_red_packet">Auto get assign red packet</string>
+    <string name="auto_get_assign_red_packet_explain">Automatically pick up the designated red packets sent to me in the group after opening</string>
+    <string name="view_record">Check the record</string>
+    <string name="view_auto_get_red_packet">Check the automatic receipt of red packets</string>
+    <string name="received_red_packet">The red packet received</string>
+    <string name="received_red_packet2">The red packet received</string>
+    <string name="send_red_packet2">The red packet send</string>
+    <string name="recent_days">%1$1days</string>
+    <string name="all_record">All</string>
+    <string name="my_red_packet">My red packet</string>
+    <string name="view_auto_get_red_packet_title">Automatic receipt of red packets</string>
 </resources>

skWeiChatBaidu/src/main/res/values-zh-rHK/arrays.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="query_red_packet">
+        <item>所有記錄</item>
+        <item>最近7天</item>
+        <item>最近30天</item>
+        <item>最近90天</item>
+    </string-array>
+</resources>

skWeiChatBaidu/src/main/res/values-zh-rHK/strings.xml

@@ -1685,4 +1685,19 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="copy_sure">確定復制</string>
     <string name="input_card_num">請填寫銀行卡信息</string>
 
+    <string name="accessibility">輔助功能</string>
+    <string name="red_packet_record">紅包記錄</string>
+    <string name="automatic_function">自動功能</string>
+
+    <string name="auto_get_assign_red_packet">自動領取指定紅包</string>
+    <string name="auto_get_assign_red_packet_explain">開啓後自動領取群組中發給本人的指定聊啵紅包</string>
+    <string name="view_record">查看記錄</string>
+    <string name="view_auto_get_red_packet">查看自動領取的紅包記錄</string>
+    <string name="received_red_packet">收到紅包</string>
+    <string name="received_red_packet2">收到的紅包</string>
+    <string name="send_red_packet2">發出的紅包</string>
+    <string name="recent_days">最近%1$1d天</string>
+    <string name="all_record">所有記錄</string>
+    <string name="my_red_packet">我的紅包</string>
+    <string name="view_auto_get_red_packet_title">自動領取的指定紅包</string>
 </resources>

skWeiChatBaidu/src/main/res/values-zh-rTW/arrays.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="query_red_packet">
+        <item>所有記錄</item>
+        <item>最近7天</item>
+        <item>最近30天</item>
+        <item>最近90天</item>
+    </string-array>
+</resources>

skWeiChatBaidu/src/main/res/values-zh-rTW/strings.xml

@@ -1682,5 +1682,19 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="start_edit">編輯</string>
     <string name="copy_sure">確定復制</string>
     <string name="input_card_num">請填寫銀行卡信息</string>
-
+    <string name="accessibility">輔助功能</string>
+    <string name="red_packet_record">紅包記錄</string>
+    <string name="automatic_function">自動功能</string>
+
+    <string name="auto_get_assign_red_packet">自動領取指定紅包</string>
+    <string name="auto_get_assign_red_packet_explain">開啓後自動領取群組中發給本人的指定聊啵紅包</string>
+    <string name="view_record">查看記錄</string>
+    <string name="view_auto_get_red_packet">查看自動領取的紅包記錄</string>
+    <string name="received_red_packet">收到紅包</string>
+    <string name="received_red_packet2">收到的紅包</string>
+    <string name="send_red_packet2">發出的紅包</string>
+    <string name="recent_days">最近%1$1d天</string>
+    <string name="all_record">所有記錄</string>
+    <string name="my_red_packet">我的紅包</string>
+    <string name="view_auto_get_red_packet_title">自動領取的指定紅包</string>
 </resources>

skWeiChatBaidu/src/main/res/values/arrays.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="query_red_packet">
+        <item>所有记录</item>
+        <item>最近7天</item>
+        <item>最近30天</item>
+        <item>最近90天</item>
+    </string-array>
+</resources>

skWeiChatBaidu/src/main/res/values/strings.xml

@@ -536,6 +536,7 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+<>@&#03
     <string name="all_withdrawals">全部提现</string>
     <string name="accessibility">辅助功能</string>
     <string name="red_packet_record">红包记录</string>
+    <string name="automatic_function">自动功能</string>
     <string name="modify_job">修改职位</string>
     <string name="delete">删除</string>
     <string name="most_recent_contact">最近联系人</string>
@@ -1836,5 +1837,16 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ`¬!"£$%^*()~=#{}[];':,./?/*-_+&#060;&#062;&#064;&#03
     <string name="replay_infix_comment">回复</string>
     <string name="input_card_num">请填写银行卡信息</string>
     <string name="sigh">签</string>
+    <string name="auto_get_assign_red_packet">自动领取指定红包</string>
+    <string name="auto_get_assign_red_packet_explain">开启后自动领取群组中发给本人的指定聊啵红包</string>
+    <string name="view_record">查看记录</string>
+    <string name="view_auto_get_red_packet">查看自动领取的红包记录</string>
+    <string name="received_red_packet">收到红包</string>
+    <string name="received_red_packet2">收到的红包</string>
+    <string name="send_red_packet2">发出的红包</string>
+    <string name="recent_days">最近%1$1d天</string>
+    <string name="all_record">所有记录</string>
+    <string name="my_red_packet">我的红包</string>
+    <string name="view_auto_get_red_packet_title">自动领取的指定红包</string>
 
 </resources>

skWeiChatBaidu/src/main/res/values/styles.xml

@@ -584,4 +584,12 @@
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">18sp</item>
     </style>
+
+    <style name="SwitchCompat.Control" parent="Theme.AppCompat.Light">
+
+        <item name="colorControlActivated">#159bfb</item>
+
+        <item name="colorSwitchThumbNormal">#ffffff</item>
+        <item name="android:colorForeground">#999999</item>
+    </style>
 </resources>