Ver código fonte

修改部分样式问题

Pq 1 ano atrás
pai
commit
3bac42ec44

+ 9 - 0
TUIKit/TIMCommon/timcommon/src/main/java/com/tencent/qcloud/tuikit/timcommon/component/MessageProperties.java

@@ -29,6 +29,7 @@ public class MessageProperties implements IMessageProperties {
     private Drawable conversationListEmptyDrawable;
     private int searchIconRes =-1;
     private int mainStyleColor = -1;
+    private int searchTextColor = -1;
 
     private MessageProperties() {
     }
@@ -248,6 +249,14 @@ public class MessageProperties implements IMessageProperties {
         this.mainStyleColor = mainStyleColor;
     }
 
+    public void setSearchTextColor(int searchTextColor) {
+        this.searchTextColor = searchTextColor;
+    }
+
+    public int getSearchTextColor() {
+        return searchTextColor;
+    }
+
     public void setEditStyle(int colorRes, EditText editText) {
         Drawable textCursorDrawable = null;
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {

+ 3 - 2
TUIKit/TUISearch/tuisearch/src/main/java/com/tencent/qcloud/tuikit/tuisearch/classicui/page/SearchMainActivity.java

@@ -93,9 +93,10 @@ public class SearchMainActivity extends BaseLightActivity {
             mIvSearch.setImageResource(searchIconRes);
         }
         int mainStyleColor = MessageProperties.getInstance().getMainStyleColor();
+        int searchTextColor = MessageProperties.getInstance().getSearchTextColor();
         MessageProperties.getInstance().setEditStyle(mainStyleColor,mEdtSearch);
-        if (mainStyleColor != -1) {
-            mCancleView.setTextColor(mainStyleColor);
+        if (searchTextColor != -1) {
+            mCancleView.setTextColor(searchTextColor);
         }
 
         if (mContactRcSearchAdapter == null) {

+ 3 - 2
TUIKit/TUISearch/tuisearch/src/main/java/com/tencent/qcloud/tuikit/tuisearch/classicui/page/SearchMoreListActivity.java

@@ -78,9 +78,10 @@ public class SearchMoreListActivity extends BaseLightActivity {
             mIvSearch.setImageResource(searchIconRes);
         }
         int mainStyleColor = MessageProperties.getInstance().getMainStyleColor();
+        int searchTextColor = MessageProperties.getInstance().getSearchTextColor();
         MessageProperties.getInstance().setEditStyle(mainStyleColor,mEdtSearch);
-        if (mainStyleColor != -1) {
-            mCancleView.setTextColor(mainStyleColor);
+        if (searchTextColor != -1) {
+            mCancleView.setTextColor(searchTextColor);
         }
 
         if (mContactRcSearchAdapter == null) {

+ 3 - 2
TUIKit/TUISearch/tuisearch/src/main/java/com/tencent/qcloud/tuikit/tuisearch/classicui/page/SearchMoreMsgListActivity.java

@@ -74,9 +74,10 @@ public class SearchMoreMsgListActivity extends BaseLightActivity {
             mIvSearch.setImageResource(searchIconRes);
         }
         int mainStyleColor = MessageProperties.getInstance().getMainStyleColor();
+        int searchTextColor = MessageProperties.getInstance().getSearchTextColor();
         MessageProperties.getInstance().setEditStyle(mainStyleColor,mEdtSearch);
-        if (mainStyleColor != -1) {
-            mCancleView.setTextColor(mainStyleColor);
+        if (searchTextColor != -1) {
+            mCancleView.setTextColor(searchTextColor);
         }
 
 

+ 1 - 0
chatModule/src/main/java/com/cooleshow/chatmodule/ui/ImAppealActivity.java

@@ -73,6 +73,7 @@ public class ImAppealActivity extends BaseMVPActivity<TcActivityImAppealBinding,
     @Override
     protected void initView() {
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "投诉");
+        IMThemManager.getInstance().setMainButtonStyles(viewBinding.btnCommit);
 
         Intent intent = getIntent();
         targetId = intent.getStringExtra("targetId");

+ 8 - 0
chatModule/src/main/java/com/cooleshow/chatmodule/utils/helper/IMThemManager.java

@@ -38,6 +38,7 @@ import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
 public class IMThemManager {
     private Drawable tabIndicatorDrawable = null;
     private int mainStyleColor = -1;
+    private int searchTextColor = -1;
     private int searchIconRes = -1;
     private int searchBtBackgroundRes = -1;
     private int checkBtDrawableRes = -1;
@@ -162,6 +163,12 @@ public class IMThemManager {
         instance.setMainStyleColor(mainStyleColor);
     }
 
+    public void setSearchTextColor(int searchTextColor) {
+        this.searchTextColor = searchTextColor;
+        MessageProperties instance = MessageProperties.getInstance();
+        instance.setSearchTextColor(searchTextColor);
+    }
+
     public void setSearchIconRes(int searchIconRes) {
         this.searchIconRes = searchIconRes;
         MessageProperties.getInstance().setSearchIconRes(searchIconRes);
@@ -187,6 +194,7 @@ public class IMThemManager {
         this.tabIndicatorDrawable = null;
         setMainStyleColor(-1);
         setSearchIconRes(-1);
+        setSearchTextColor(-1);
         this.searchBtBackgroundRes = -1;
         this.checkBtDrawableRes = -1;
         this.mainButtonBackgroundRes = -1;

+ 1 - 0
institution/src/main/java/com/cooleshow/institution/stu/ui/main/MainActivity.java

@@ -103,6 +103,7 @@ public class MainActivity extends BaseMVPActivity<ActivityInstitutionMainLayoutB
         StyleConfig.isStudentStyle = false;
         IMThemManager.getInstance().setEmptyDrawable(getResources().getDrawable(R.drawable.jg_icon_empty_content));
         IMThemManager.getInstance().setMainStyleColor(getResources().getColor(R.color.color_fe2451));
+        IMThemManager.getInstance().setSearchTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
         IMThemManager.getInstance().setSearchBtBackgroundRes(R.drawable.shape_ff3c81_toff76a6_14dp);
         IMThemManager.getInstance().setSearchIconRes(R.drawable.jg_icon_search);
         IMThemManager.getInstance().setCheckBtDrawableRes(R.drawable.jg_switch_selector);

BIN
institution/src/main/res/drawable-xhdpi/jg_bg_chat_top.png


BIN
institution/src/main/res/drawable-xxhdpi/jg_bg_chat_top.png


+ 1 - 0
student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -255,6 +255,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     private void setStyleConfig() {
         StyleConfig.isStudentStyle = true;
         IMThemManager.getInstance().resetStyleValue();
+        IMThemManager.getInstance().setSearchTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
     }
 
     /**