Просмотр исходного кода

调整邀请赚钱界面风格

zengjiebin лет назад: 7
Родитель
Сommit
207378d281
30 измененных файлов с 204 добавлено и 313 удалено
  1. 1 1
      app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java
  2. 3 3
      app/src/main/java/com/kfzs/duanduan/ActSearch.java
  3. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/CategoryRankFragment.java
  4. 4 12
      app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
  5. 1 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSignRankings.java
  6. 2 2
      app/src/main/java/com/kfzs/duanduan/utils/ListViewUtil.java
  7. 27 14
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  8. 4 1
      app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java
  9. 6 6
      app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchGame.java
  10. 1 29
      app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java
  11. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/SignRecordAct.java
  12. 2 2
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGame.java
  13. 7 0
      app/src/main/res/drawable/button_full_normal_purple_click.xml
  14. 9 0
      app/src/main/res/drawable/selector_button_full_purple.xml
  15. 33 0
      app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_purple.xml
  16. 29 0
      app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_purple_red.xml
  17. 4 4
      app/src/main/res/layout/empty_view.xml
  18. 4 4
      app/src/main/res/layout/empty_view_bottom.xml
  19. 4 4
      app/src/main/res/layout/fgt_sign_rankings.xml
  20. 9 9
      app/src/main/res/layout/friend_list_empty.xml
  21. 3 3
      app/src/main/res/layout/list_has_empty.xml
  22. 4 4
      app/src/main/res/layout/sign_record_layout.xml
  23. 1 1
      app/src/main/res/layout/x_ask_award_item.xml
  24. 14 197
      app/src/main/res/layout/x_ask_getmoney_act_layout.xml
  25. 4 4
      app/src/main/res/layout/x_ask_getmoney_act_layout_include.xml
  26. 4 4
      app/src/main/res/layout/x_ask_getmoney_act_layout_item.xml
  27. 3 3
      app/src/main/res/layout/x_ask_top5_item.xml
  28. 3 3
      app/src/main/res/layout/x_ask_top5_title.xml
  29. 7 0
      app/src/main/res/values/color_app_theme_colors.xml
  30. 9 0
      app/src/main/res/values/dd_styles.xml

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/ActDownloadMgr.java

@@ -55,7 +55,7 @@ public class ActDownloadMgr extends BaseCompatActivity {
     @BindView(R.id.download_mgr_listview)
     ListView lvDownloadMgr;
 
-    @BindView(R.id.download_mgr_empty_view)
+    @BindView(R.id.empty_view)
     View tvEmptyView;
 
     /**

+ 3 - 3
app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -230,7 +230,7 @@ public class ActSearch extends BaseCompatActivity {
     private void initTabGame() {
         View view = View.inflate(this, R.layout.list_search, null);
         ListView listView = view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
+        listView.setEmptyView(view.findViewById(R.id.empty_view));
         mAdpSearchGame = new AdpSearchGame(this);
         mAdpSearchGame.setmInstallButtonMgrMap(mInstallButtonMgrMap);
         listView.setAdapter(mAdpSearchGame);
@@ -244,7 +244,7 @@ public class ActSearch extends BaseCompatActivity {
     private void initTabNewGame() {
         View view = View.inflate(this, R.layout.list_search, null);
         ListView listView = view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
+        listView.setEmptyView(view.findViewById(R.id.empty_view));
 
         //mAdpSearchNewGame = new AdpSearchNewGame(this);
         //mAdpSearchNewGame.setmInstallButtonMgrMap(mInstallButtonMgrMap);
@@ -259,7 +259,7 @@ public class ActSearch extends BaseCompatActivity {
     private void initTabTest() {
         View view = View.inflate(this, R.layout.list_search, null);
         ListView listView = view.findViewById(R.id.list_list_search);
-        listView.setEmptyView(view.findViewById(R.id.download_mgr_empty_view));
+        listView.setEmptyView(view.findViewById(R.id.empty_view));
 
         //mAdpSearchTest = new AdpSearchTest(this);
         //mAdpSearchTest.setmInstallButtonMgrMap(mInstallButtonMgrMap);

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/CategoryRankFragment.java

@@ -68,7 +68,7 @@ public class CategoryRankFragment extends BaseCompatFragment {
 
         mRecyclerView = ViewFindUtils.find(mContentView, R.id.recy_fgt_main_game);
         //隐藏空空如也
-        ViewFindUtils.find(mContentView, R.id.download_mgr_empty_view).setVisibility(View.GONE);
+        ViewFindUtils.find(mContentView, R.id.empty_view).setVisibility(View.GONE);
         mAdpFragmentRank = new AdpFragmentRank(activity, mRecyclerView, ClsTypeChoose);
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(activity));

+ 4 - 12
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java

@@ -33,8 +33,8 @@ import rx.schedulers.Schedulers;
 public class FgtFriendExtractPage extends BaseFragment {
     @BindView(R.id.friend_list_ll)
     LinearLayout friend_list_ll;
-    @BindView(R.id.download_mgr_empty_view)
-    View download_mgr_empty_view;
+    @BindView(R.id.empty_view)
+    View empty_view;
     @Override
     public int getLayoutId() {
         return R.layout.friend_list_empty;
@@ -75,11 +75,7 @@ public class FgtFriendExtractPage extends BaseFragment {
                 view.setVisibility(View.INVISIBLE);
             }
         }
-        if(list.isEmpty()){
-            CommonUtil.getInstance().updateEmptyView(download_mgr_empty_view, true);
-        } else {
-            download_mgr_empty_view.setVisibility(View.GONE);
-        }
+        CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty(), true);
     }
     private boolean isLoadding = false;
     private void initData(){
@@ -111,11 +107,7 @@ public class FgtFriendExtractPage extends BaseFragment {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage);
-                        if(list.isEmpty()){
-                            CommonUtil.getInstance().updateEmptyView(download_mgr_empty_view, true);
-                        } else {
-                            download_mgr_empty_view.setVisibility(View.GONE);
-                        }
+                        CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty(), true);
                         isLoadding = false;
                     }
                 });

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtSignRankings.java

@@ -51,7 +51,7 @@ public class FgtSignRankings extends BaseCompatFragment implements SignRankingsC
     @BindView(R.id.main_content)
     LinearLayout main_content;
 
-    @BindView(R.id.download_mgr_empty_view)
+    @BindView(R.id.empty_view)
     View empty_view;
     Unbinder unbinder;
     RecyclerViewAdapter recyclerViewAdapter;

+ 2 - 2
app/src/main/java/com/kfzs/duanduan/utils/ListViewUtil.java

@@ -29,8 +29,8 @@ public class ListViewUtil {
 
     public ListViewUtil setEmptyView(Context context, ListView listView) {
         mViewEmpty = View.inflate(context, R.layout.empty_view, null);
-        mImgEmpty = ViewFindUtils.find(mViewEmpty, R.id.img_list_empty);
-        mTxtEmpty = ViewFindUtils.find(mViewEmpty, R.id.txt_list_empty);
+        mImgEmpty = ViewFindUtils.find(mViewEmpty, R.id.empty_view_img);
+        mTxtEmpty = ViewFindUtils.find(mViewEmpty, R.id.empty_view_msg);
         mViewEmpty.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams
                 .MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         mViewEmpty.setVisibility(View.GONE);

+ 27 - 14
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1514,41 +1514,54 @@ public class CommonUtil {
     //设置无数据显示 为加载中
     public void resetEmptyView(View empty_view) {
         if (empty_view.getVisibility() == View.VISIBLE) {
-            ImageView img_list_empty = empty_view.findViewById(R.id.img_list_empty);
-            if (img_list_empty == null) {
+            ImageView empty_view_img = empty_view.findViewById(R.id.empty_view_img);
+            if (empty_view_img == null) {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到ImageView");
                 return;
             }
-            TextView txt_list_empty = empty_view.findViewById(R.id.txt_list_empty);
-            if (txt_list_empty == null) {
+            TextView empty_view_msg = empty_view.findViewById(R.id.empty_view_msg);
+            if (empty_view_msg == null) {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到TextView");
                 return;
             }
-            img_list_empty.setImageResource(R.drawable.loading_01);
-            txt_list_empty.setText(R.string.loading);
+            empty_view_img.setImageResource(R.drawable.loading_01);
+            empty_view_msg.setText(R.string.loading);
         }
     }
 
     //设置无数据显示
     public void updateEmptyView(View empty_view, boolean showEmpty) {
+        updateEmptyView(empty_view, showEmpty, false);
+    }
+
+    //设置无数据显示
+    public void updateEmptyView(View empty_view, boolean showEmpty, boolean isNetImg) {
         if (showEmpty) {
             empty_view.setVisibility(View.VISIBLE);
-            ImageView img_list_empty = empty_view.findViewById(R.id.img_list_empty);
-            if (img_list_empty == null) {
+            ImageView empty_view_img = empty_view.findViewById(R.id.empty_view_img);
+            if (empty_view_img == null) {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到ImageView");
                 return;
             }
-            TextView txt_list_empty = empty_view.findViewById(R.id.txt_list_empty);
-            if (txt_list_empty == null) {
+            TextView empty_view_msg = empty_view.findViewById(R.id.empty_view_msg);
+            if (empty_view_msg == null) {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到TextView");
                 return;
             }
             if (NetUtil.isConnected(SheepApp.getInstance())) {
-                img_list_empty.setImageResource(R.mipmap.wushuju);
-                txt_list_empty.setText(R.string.wushuju);
+                if(isNetImg){
+                    GlideImageLoader.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju"));
+                } else {
+                    empty_view_img.setImageResource(R.mipmap.wushuju);
+                }
+                empty_view_msg.setText(R.string.wushuju);
             } else {
-                img_list_empty.setImageResource(R.mipmap.wushuju_net_error);
-                txt_list_empty.setText(R.string.wushuju_net_error);
+                if(isNetImg){
+                    GlideImageLoader.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju_net_error"));
+                } else {
+                    empty_view_img.setImageResource(R.mipmap.wushuju_net_error);
+                }
+                empty_view_msg.setText(R.string.wushuju_net_error);
             }
         } else {
             empty_view.setVisibility(View.GONE);

+ 4 - 1
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -877,7 +877,7 @@ public class ViewUtil {
                 ImageView ask_to_share_item_img = itemView.findViewById(R.id.ask_to_share_item_img);
                 TextView ask_to_share_item_name = itemView.findViewById(R.id.ask_to_share_item_name);
                 int position = holder.getAdapterPosition();
-                GlideImageLoader.setImage(ask_to_share_item_img, String.format(Locale.CHINA, "http://cdngame.kuaifazs.com/%s.png", imgList.get(position)));
+                GlideImageLoader.setImage(ask_to_share_item_img, getNetImgByName(imgList.get(position)));
                 ask_to_share_item_name.setText(nameList.get(position));
                 itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -902,4 +902,7 @@ public class ViewUtil {
             e.printStackTrace();
         }
     }
+    public static String getNetImgByName(String name){
+        return String.format(Locale.CHINA, "http://cdngame.kuaifazs.com/%s.png", name);
+    }
 }

+ 6 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchGame.java

@@ -70,8 +70,8 @@ public class ActSearchGame extends BaseActivity {
     RecyclerView search_game_list;
     @BindView(R.id.search_game_hot)
     View search_game_hot;
-    @BindView(R.id.download_mgr_empty_view)
-    View download_mgr_empty_view;
+    @BindView(R.id.empty_view)
+    View empty_view;
 
     private int type;//1:小米游戏过来
 
@@ -90,7 +90,7 @@ public class ActSearchGame extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this, "搜索游戏")
                 .setTitleFinish(this);
-        download_mgr_empty_view.setVisibility(View.GONE);
+        empty_view.setVisibility(View.GONE);
         initHotList();
         initList();
         initInput();
@@ -271,7 +271,7 @@ public class ActSearchGame extends BaseActivity {
                     .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            CommonUtil.getInstance().updateEmptyView(download_mgr_empty_view, true);
+                            CommonUtil.getInstance().updateEmptyView(empty_view, true);
                             search_game_hot.setVisibility(View.GONE);
                             search_game_list.setVisibility(View.GONE);
                         }
@@ -370,7 +370,7 @@ public class ActSearchGame extends BaseActivity {
         adapter.notifyDataSetChanged();
         if (list.isEmpty()) {
             if(hotList.isEmpty()) {
-                CommonUtil.getInstance().updateEmptyView(download_mgr_empty_view, true);
+                CommonUtil.getInstance().updateEmptyView(empty_view, true);
             } else {
                 search_game_hot.setVisibility(View.VISIBLE);
             }
@@ -378,7 +378,7 @@ public class ActSearchGame extends BaseActivity {
         } else {
             search_game_list.setVisibility(View.VISIBLE);
             if(hotList.isEmpty()) {
-                download_mgr_empty_view.setVisibility(View.GONE);
+                empty_view.setVisibility(View.GONE);
             } else {
                 search_game_hot.setVisibility(View.GONE);
             }

+ 1 - 29
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -56,7 +56,7 @@ import rx.schedulers.Schedulers;
  * Created by Administrator on 2018/3/19.
  */
 
-public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, AskGetMoneyContract.View {
+public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContract.View {
 
 
     @Inject
@@ -65,14 +65,6 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
     TextView tvSize;
     @BindView(R.id.tv_money)
     TextView tvMoney;
-    @BindView(R.id.rl_wx)
-    RelativeLayout rlWx;
-    @BindView(R.id.rl_qq)
-    RelativeLayout rlQq;
-    @BindView(R.id.rl_qr)
-    RelativeLayout rlQr;
-    @BindView(R.id.rl_link)
-    RelativeLayout rlLink;
     @BindView(R.id.friend_extract_vp)
     ViewPager friend_extract_vp;
     @BindView(R.id.friend_extract_count_tv)
@@ -296,26 +288,6 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
 
 
     @Override
-    public void onStart(SHARE_MEDIA share_media) {
-
-    }
-
-    @Override
-    public void onResult(SHARE_MEDIA share_media) {
-
-    }
-
-    @Override
-    public void onError(SHARE_MEDIA share_media, Throwable throwable) {
-
-    }
-
-    @Override
-    public void onCancel(SHARE_MEDIA share_media) {
-
-    }
-
-    @Override
     public void NetSuccess(int code, String msg, String s) {
 
     }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/SignRecordAct.java

@@ -71,7 +71,7 @@ public class SignRecordAct extends BaseActivity implements SignRecordContract.Vi
     @Override
     public void initView() {
         activity = this;
-        empty_view = findViewById(R.id.download_mgr_empty_view);
+        empty_view = findViewById(R.id.empty_view);
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, "我的战绩")

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGame.java

@@ -47,9 +47,9 @@ import rx.schedulers.Schedulers;
 
 public class FgtMyGame extends BaseFragment {
 
-    @BindView(R.id.img_list_empty)
+    @BindView(R.id.empty_view_img)
     ImageView imgListEmpty;
-    @BindView(R.id.txt_list_empty)
+    @BindView(R.id.empty_view_msg)
     TextView txtListEmpty;
     @BindView(R.id.recyclerview)
     RecyclerView recyclerview;

+ 7 - 0
app/src/main/res/drawable/button_full_normal_purple_click.xml

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

+ 9 - 0
app/src/main/res/drawable/selector_button_full_purple.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
+  <item android:state_focused="true" android:drawable="@drawable/button_full_normal_purple_click" />
+  <item android:state_checked="true" android:drawable="@drawable/button_full_normal_purple_click"/>
+  <item android:state_selected="true" android:drawable="@drawable/button_full_normal_purple_click"/>
+  <item android:state_pressed="true" android:drawable="@drawable/button_full_normal_purple_click"/>
+  <item android:drawable="@drawable/button_full_normal_purple_click"/>
+</selector>

+ 33 - 0
app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_purple.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--第一层-->
+    <item>
+        <shape>
+            <solid android:color="@color/button_color_purple_yy" />
+            <!--描边-->
+            <stroke
+                android:width="1px"
+                android:color="@color/button_color_purple_yy"
+                />
+
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <!--第二层-->
+    <item
+        android:left="1px"
+        android:top="1px"
+        android:bottom="1px"
+        android:right="1px">
+        <shape>
+            <solid android:color="@color/button_color_purple" />
+            <!--描边-->
+            <stroke
+                android:width="0.33dp"
+                android:color="@color/button_color_purple" />
+
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+</layer-list>

+ 29 - 0
app/src/main/res/drawable/x_shap_shadow_bg_rectgangle_purple_red.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--第一层-->
+    <item>
+        <shape>
+            <gradient
+                android:startColor="@color/button_color_purple_start_yy"
+                android:endColor="@color/button_color_purple_end_yy"
+                android:angle="90"/>
+
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <!--第二层-->
+    <item
+        android:left="1px"
+        android:top="1px"
+        android:bottom="1px"
+        android:right="1px">
+        <shape>
+            <gradient
+                android:startColor="@color/button_color_purple_start"
+                android:endColor="@color/button_color_purple_end"
+                android:angle="90"/>
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+</layer-list>

+ 4 - 4
app/src/main/res/layout/empty_view.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/download_mgr_empty_view"
+    android:id="@+id/empty_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
 
     <ImageView
-        android:id="@+id/img_list_empty"
+        android:id="@+id/empty_view_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -18,11 +18,11 @@
         android:visibility="visible" />
 
     <TextView
-        android:id="@+id/txt_list_empty"
+        android:id="@+id/empty_view_msg"
         style="@style/style_empty_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/img_list_empty"
+        android:layout_below="@id/empty_view_img"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/content_padding_big"
         android:text="@string/loading" />

+ 4 - 4
app/src/main/res/layout/empty_view_bottom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/download_mgr_empty_view"
+    android:id="@+id/empty_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <View
@@ -9,7 +9,7 @@
         android:layout_marginBottom="@dimen/dp_10"
         android:background="@color/white"/>
     <ImageView
-        android:id="@+id/img_list_empty"
+        android:id="@+id/empty_view_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -21,11 +21,11 @@
         android:visibility="visible" />
 
     <TextView
-        android:id="@+id/txt_list_empty"
+        android:id="@+id/empty_view_msg"
         style="@style/style_empty_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/img_list_empty"
+        android:layout_below="@id/empty_view_img"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/content_padding_big"
         android:text="@string/wushuju" />

+ 4 - 4
app/src/main/res/layout/fgt_sign_rankings.xml

@@ -6,14 +6,14 @@
     android:orientation="vertical">
 
     <RelativeLayout
-        android:id="@+id/download_mgr_empty_view"
+        android:id="@+id/empty_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
         android:visibility="gone">
 
         <ImageView
-            android:id="@+id/img_list_empty"
+            android:id="@+id/empty_view_img"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
@@ -25,11 +25,11 @@
             android:visibility="visible" />
 
         <TextView
-            android:id="@+id/txt_list_empty"
+            android:id="@+id/empty_view_msg"
             style="@style/style_empty_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/img_list_empty"
+            android:layout_below="@id/empty_view_img"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/content_padding_big"
             android:text="@string/wushuju" />

+ 9 - 9
app/src/main/res/layout/friend_list_empty.xml

@@ -6,33 +6,33 @@
     android:orientation="vertical">
 
     <RelativeLayout
-        android:id="@+id/download_mgr_empty_view"
+        android:id="@+id/empty_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
         android:visibility="gone">
 
         <ImageView
-            android:id="@+id/img_list_empty"
+            android:id="@+id/empty_view_img"
             android:layout_width="wrap_content"
             android:layout_height="80dp"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/dp_10"
-            android:background="@color/white"
             android:gravity="center"
             android:scaleType="centerInside"
             android:src="@mipmap/wushuju"
             android:visibility="visible" />
 
         <TextView
-            android:id="@+id/txt_list_empty"
-            style="@style/style_empty_text"
+            android:id="@+id/empty_view_msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/img_list_empty"
+            android:layout_below="@id/empty_view_img"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/content_padding_5"
-            android:text="@string/wushuju" />
+            android:text="@string/wushuju"
+            android:textColor="#ffffff"
+            android:textSize="15sp" />
     </RelativeLayout>
-    <include layout="@layout/friend_list"/>
+
+    <include layout="@layout/friend_list" />
 </LinearLayout>

+ 3 - 3
app/src/main/res/layout/list_has_empty.xml

@@ -13,7 +13,7 @@
         android:layout_marginBottom="@dimen/dp_10">
 
         <ImageView
-            android:id="@+id/img_list_empty"
+            android:id="@+id/empty_view_img"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
@@ -25,11 +25,11 @@
             android:visibility="visible" />
 
         <TextView
-            android:id="@+id/txt_list_empty"
+            android:id="@+id/empty_view_msg"
             style="@style/style_empty_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/img_list_empty"
+            android:layout_below="@id/empty_view_img"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/content_padding_big"
             android:text="@string/wushuju" />

+ 4 - 4
app/src/main/res/layout/sign_record_layout.xml

@@ -100,7 +100,7 @@
         >
 
         <RelativeLayout
-            android:id="@+id/download_mgr_empty_view"
+            android:id="@+id/empty_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
@@ -108,7 +108,7 @@
             >
 
             <ImageView
-                android:id="@+id/img_list_empty"
+                android:id="@+id/empty_view_img"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
@@ -120,11 +120,11 @@
                 android:visibility="visible" />
 
             <TextView
-                android:id="@+id/txt_list_empty"
+                android:id="@+id/empty_view_msg"
                 style="@style/style_empty_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/img_list_empty"
+                android:layout_below="@id/empty_view_img"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="@dimen/content_padding_big"
                 android:text="@string/wushuju" />

+ 1 - 1
app/src/main/res/layout/x_ask_award_item.xml

@@ -4,5 +4,5 @@
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
     android:text="发放情况:"
-    android:textColor="#ff333333"
+    android:textColor="#ffffff"
     android:textSize="12sp" />

+ 14 - 197
app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -125,7 +125,7 @@
                     android:layout_marginEnd="@dimen/content_padding_10"
                     android:layout_marginStart="@dimen/content_padding_10"
                     android:layout_marginTop="@dimen/content_padding_10"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
                     android:padding="@dimen/content_padding_10">
 
                     <TextView
@@ -133,7 +133,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="本月排行榜top5"
-                        android:textColor="#4889FF"
+                        android:textColor="#ffffff"
                         android:textSize="14sp"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -143,7 +143,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="center"
                         android:text="你还未上榜,再接再厉"
-                        android:textColor="#999999"
+                        android:textColor="#ffffff"
                         android:textSize="10sp"
                         app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -158,6 +158,7 @@
 
                 </android.support.constraint.ConstraintLayout>
 
+                <!--发放情况-->
                 <LinearLayout
                     android:id="@+id/homepage_item_notice_layout"
                     android:layout_width="match_parent"
@@ -165,7 +166,7 @@
                     android:layout_marginEnd="@dimen/content_padding_10"
                     android:layout_marginStart="@dimen/content_padding_10"
                     android:layout_marginTop="@dimen/content_padding_10"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple"
                     android:orientation="horizontal"
                     android:padding="@dimen/content_padding_10">
 
@@ -173,14 +174,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="发放情况:"
-                        android:textColor="#ff333333"
+                        android:textColor="#ffffff"
                         android:textSize="12sp" />
 
                     <com.sunfusheng.marqueeview.MarqueeView
                         android:id="@+id/ask_award_info"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textColor="#ff333333"
+                        android:textColor="#ffffff"
                         android:textSize="12sp"
                         app:mvAnimDuration="1000"
                         app:mvDirection="right_to_left"
@@ -194,7 +195,7 @@
                     android:layout_marginEnd="@dimen/content_padding_10"
                     android:layout_marginStart="@dimen/content_padding_10"
                     android:layout_marginTop="@dimen/content_padding_10"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+                    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
                     android:orientation="vertical"
                     android:paddingBottom="@dimen/content_padding_10"
                     android:paddingTop="@dimen/content_padding_10">
@@ -205,7 +206,7 @@
                         android:layout_marginBottom="@dimen/content_padding_10"
                         android:layout_marginStart="9dp"
                         android:text="已邀请好友列表"
-                        android:textColor="#191919"
+                        android:textColor="#ffffff"
                         android:textSize="@dimen/text_size_15" />
 
                     <include layout="@layout/x_ask_getmoney_act_layout_include" />
@@ -228,7 +229,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="共0条"
-                            android:textColor="#a3282828"
+                            android:textColor="#ffffff"
                             android:textSize="11sp" />
 
                         <TextView
@@ -242,7 +243,7 @@
                             android:paddingStart="17dp"
                             android:paddingTop="2dp"
                             android:text="@string/last_page"
-                            android:textColor="#282828"
+                            android:textColor="#ffffff"
                             android:textSize="12sp" />
 
                         <TextView
@@ -256,7 +257,7 @@
                             android:paddingStart="7dp"
                             android:paddingTop="2dp"
                             android:text="1"
-                            android:textColor="#282828"
+                            android:textColor="#ffffff"
                             android:textSize="12sp" />
 
                         <TextView
@@ -270,195 +271,11 @@
                             android:paddingStart="17dp"
                             android:paddingTop="2dp"
                             android:text="@string/next_page"
-                            android:textColor="#282828"
+                            android:textColor="#ffffff"
                             android:textSize="12sp" />
                     </LinearLayout>
                 </LinearLayout>
 
-                <!--好友邀请-->
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    android:layout_margin="@dimen/content_padding_10"
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-                    android:orientation="vertical"
-                    android:padding="15dp">
-
-                    <TextView
-                        style="@style/txt_style_15"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:text="好友邀请" />
-
-                    <RelativeLayout
-                        android:id="@+id/rl_wx"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginTop="10dp">
-
-                        <ImageView
-                            android:id="@+id/iv_wx"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_marginEnd="@dimen/content_padding_10"
-                            android:background="@null"
-                            android:src="@mipmap/x_ic_wx" />
-
-                        <TextView
-                            android:id="@+id/tv_wx"
-                            style="@style/txt_style_15"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_toRightOf="@id/iv_wx"
-                            android:text="@string/wx_friend" />
-
-                        <TextView
-                            style="@style/hint_txt_style"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/tv_wx"
-                            android:layout_marginTop="3dp"
-                            android:layout_toRightOf="@id/iv_wx"
-                            android:text="@string/wx_friend_content" />
-
-                    </RelativeLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:background="@color/white_bg_line" />
-
-
-                    <RelativeLayout
-                        android:id="@+id/rl_qq"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginTop="10dp">
-
-                        <ImageView
-                            android:id="@+id/iv_qq"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_marginEnd="@dimen/content_padding_10"
-                            android:background="@null"
-                            android:src="@mipmap/x_ic_qq"
-
-                            />
-
-                        <TextView
-                            android:id="@+id/tv_qq"
-                            style="@style/txt_style_15"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_toEndOf="@id/iv_qq"
-                            android:text="@string/qq_friend" />
-
-                        <TextView
-                            style="@style/hint_txt_style"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/tv_qq"
-                            android:layout_marginTop="3dp"
-                            android:layout_toEndOf="@id/iv_qq"
-                            android:text="@string/qq_friend_content" />
-
-                    </RelativeLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:background="@color/white_bg_line" />
-
-
-                    <RelativeLayout
-                        android:id="@+id/rl_qr"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginTop="10dp">
-
-                        <ImageView
-                            android:id="@+id/iv_qr"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_marginEnd="@dimen/content_padding_10"
-                            android:background="@null"
-                            android:src="@mipmap/x_ic_qr"
-
-                            />
-
-                        <TextView
-                            android:id="@+id/tv_qr"
-                            style="@style/txt_style_15"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_toEndOf="@id/iv_qr"
-                            android:text="@string/share_qr_code" />
-
-                        <TextView
-                            style="@style/hint_txt_style"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/tv_qr"
-                            android:layout_marginTop="3dp"
-                            android:layout_toEndOf="@id/iv_qr"
-                            android:text="@string/share_qr_code_content" />
-
-                    </RelativeLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:background="@color/white_bg_line" />
-
-
-                    <RelativeLayout
-                        android:id="@+id/rl_link"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:layout_marginTop="10dp">
-
-                        <ImageView
-                            android:id="@+id/iv_link"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_marginEnd="@dimen/content_padding_10"
-                            android:background="@null"
-                            android:src="@mipmap/x_ic_link"
-
-                            />
-
-                        <TextView
-                            android:id="@+id/tv_link"
-                            style="@style/txt_style_15"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_toEndOf="@id/iv_link"
-                            android:text="@string/share_link" />
-
-                        <TextView
-                            android:id="@+id/tv_link_content"
-                            style="@style/hint_txt_style"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@id/tv_link"
-                            android:layout_marginTop="3dp"
-                            android:layout_toEndOf="@id/iv_link"
-                            android:text="@string/share_link_content" />
-
-                    </RelativeLayout>
-
-                </LinearLayout>
             </LinearLayout>
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
@@ -470,7 +287,7 @@
         android:background="#ffffff">
 
         <TextView
-            style="@style/style_button"
+            style="@style/style_button_purple"
             android:onClick="showShareView"
             android:text="立即邀请" />
     </LinearLayout>

+ 4 - 4
app/src/main/res/layout/x_ask_getmoney_act_layout_include.xml

@@ -11,7 +11,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="12sp"
-        android:textColor="#282828"
+        android:textColor="#ffffff"
         android:text="绵羊ID"/>
     <TextView
         android:layout_width="0dp"
@@ -20,7 +20,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="12sp"
-        android:textColor="#282828"
+        android:textColor="#ffffff"
         android:text="好友昵称"/>
     <TextView
         android:layout_width="0dp"
@@ -29,7 +29,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="12sp"
-        android:textColor="#282828"
+        android:textColor="#ffffff"
         android:text="获得提成"/>
     <TextView
         android:layout_width="0dp"
@@ -38,7 +38,7 @@
         android:singleLine="true"
         android:gravity="center"
         android:textSize="12sp"
-        android:textColor="#282828"
+        android:textColor="#ffffff"
         android:text="注册时间"/>
 
 </LinearLayout>

+ 4 - 4
app/src/main/res/layout/x_ask_getmoney_act_layout_item.xml

@@ -11,7 +11,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="10sp"
-        android:textColor="#a3282828"
+        android:textColor="#ffffff"
         android:text="绵羊ID"/>
     <TextView
         android:layout_width="0dp"
@@ -20,7 +20,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="10sp"
-        android:textColor="#a3282828"
+        android:textColor="#ffffff"
         android:text="好友昵称"/>
     <TextView
         android:layout_width="0dp"
@@ -29,7 +29,7 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="10sp"
-        android:textColor="#a3282828"
+        android:textColor="#ffffff"
         android:text="获得奖励金"/>
     <TextView
         android:layout_width="0dp"
@@ -38,7 +38,7 @@
         android:singleLine="true"
         android:gravity="center"
         android:textSize="10sp"
-        android:textColor="#a3282828"
+        android:textColor="#ffffff"
         android:text="注册时间"/>
 
 </LinearLayout>

+ 3 - 3
app/src/main/res/layout/x_ask_top5_item.xml

@@ -35,7 +35,7 @@
             android:layout_weight="3"
             android:gravity="start"
             android:text="用户"
-            android:textColor="#404040"
+            android:textColor="#ffffff"
             android:textSize="12sp" />
 
         <TextView
@@ -46,7 +46,7 @@
             android:gravity="start"
             android:singleLine="true"
             android:text="已赚"
-            android:textColor="#404040"
+            android:textColor="#ffffff"
             android:textSize="12sp" />
 
         <TextView
@@ -57,7 +57,7 @@
             android:gravity="start"
             android:singleLine="true"
             android:text="排行奖励"
-            android:textColor="#404040"
+            android:textColor="#ffffff"
             android:textSize="12sp" />
 
     </LinearLayout>

+ 3 - 3
app/src/main/res/layout/x_ask_top5_title.xml

@@ -16,7 +16,7 @@
         android:gravity="start"
         android:singleLine="true"
         android:textSize="12sp"
-        android:textColor="#333333"
+        android:textColor="#ffffff"
         android:text="用户"/>
     <TextView
         android:layout_width="0dp"
@@ -25,7 +25,7 @@
         android:gravity="start"
         android:singleLine="true"
         android:textSize="12sp"
-        android:textColor="#333333"
+        android:textColor="#ffffff"
         android:text="已赚"/>
     <TextView
         android:layout_width="0dp"
@@ -34,7 +34,7 @@
         android:singleLine="true"
         android:gravity="start"
         android:textSize="12sp"
-        android:textColor="#333333"
+        android:textColor="#ffffff"
         android:text="排行奖励"/>
 
 </LinearLayout>

+ 7 - 0
app/src/main/res/values/color_app_theme_colors.xml

@@ -23,4 +23,11 @@
     <!--divider-->
     <color name="theme_app_divider_color">#f5f5f5</color>
 
+    <color name="button_color_purple">#A528F1</color>
+    <color name="button_color_purple_yy">#10A528F1</color>
+
+    <color name="button_color_purple_start">#6C61D2</color>
+    <color name="button_color_purple_end">#BE0FFF</color>
+    <color name="button_color_purple_start_yy">#106C61D2</color>
+    <color name="button_color_purple_end_yy">#10BE0FFF</color>
 </resources>

+ 9 - 0
app/src/main/res/values/dd_styles.xml

@@ -14,6 +14,15 @@
         <item name="android:textSize">@dimen/text_size_15</item>
     </style>
 
+    <style name="style_button_purple" >
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_purple</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:layout_margin">@dimen/dp_10</item>
+        <item name="android:textSize">@dimen/text_size_15</item>
+    </style>
     <style name="style_button" parent="button">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">40dp</item>