1、修改Demo个人中心展示效果-增加item icon及分享功能

AriesHoo · AriesHoo · commit a0d184588b70 · 2017-10-13T11:13:32.000+08:00
diff --git a/apk/sample.apk b/apk/sample.apk
diff --git a/app/src/main/java/com/aries/library/fast/demo/module/WebViewActivity.java b/app/src/main/java/com/aries/library/fast/demo/module/WebViewActivity.java
@@ -13,10 +13,10 @@
 import com.aries.ui.view.title.TitleBarView;
 import com.just.library.AgentWeb;
 
-
 /**
- * Created: AriesHoo on 2017/8/8 10:31
- * Function:
+ * Created: AriesHoo on 2017/10/13 8:47
+ * E-Mail: AriesHoo@126.com
+ * Function: 应用内浏览器
  * Desc:
  */
 public class WebViewActivity extends FastWebActivity {
diff --git a/app/src/main/java/com/aries/library/fast/demo/module/activity/MovieBaseFragment.java b/app/src/main/java/com/aries/library/fast/demo/module/activity/MovieBaseFragment.java
@@ -1,7 +1,6 @@
 package com.aries.library.fast.demo.module.activity;
 
 import android.os.Bundle;
-import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -113,7 +112,6 @@ public void onClick(View v) {
             });
         }
         imageViewTop.setVisibility(enable ? View.VISIBLE : View.GONE);
-        ViewCompat.setElevation(imageViewTop,20);
     }
 
     @Override
diff --git a/app/src/main/java/com/aries/library/fast/demo/module/mine/MineFragment.java b/app/src/main/java/com/aries/library/fast/demo/module/mine/MineFragment.java
@@ -28,9 +28,6 @@
 public class MineFragment extends BaseTitleFragment {
 
     @BindView(R.id.stv_infoMine) SuperTextView stvInfo;
-    @BindView(R.id.stv_libraryMine) SuperTextView stvLibrary;
-    @BindView(R.id.stv_thirdLib) SuperTextView stvThird;
-    @BindView(R.id.stv_setting) SuperTextView stvSetting;
     private ImageView ivHead;
 
     public static MineFragment newInstance() {
@@ -87,7 +84,8 @@ public void onClickListener() {
                 getDimensionPixelSize(R.dimen.dp_elevation));
     }
 
-    @OnClick({R.id.stv_setting, R.id.stv_libraryMine, R.id.stv_thirdLib})
+    @OnClick({R.id.stv_setting, R.id.stv_libraryMine, R.id.stv_thirdLibMine
+            , R.id.stv_shareMine})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.stv_setting:
@@ -96,9 +94,12 @@ public void onViewClicked(View view) {
             case R.id.stv_libraryMine:
                 WebViewActivity.start(mContext, "https://github.com/AriesHoo/FastLib/blob/master/README.md");
                 break;
-            case R.id.stv_thirdLib:
+            case R.id.stv_thirdLibMine:
                 FastUtil.startActivity(mContext, ThirdLibraryActivity.class);
                 break;
+            case R.id.stv_shareMine:
+                FastUtil.startShareText(mContext,getString(R.string.share_content));
+                break;
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/colorTitleText" android:pathData="M959,521.4c0,97.4 -28.4,185.1 -85.3,262.9 -56.9,77.8 -130.3,131.7 -220.4,161.6 -10.5,1.9 -18.1,0.6 -23,-4.1s-7.3,-10.5 -7.3,-17.5V801.5c0,-37.7 -10.1,-65.2 -30.3,-82.7 22.1,-2.3 42,-5.8 59.7,-10.5 17.7,-4.6 35.9,-12.2 54.7,-22.7 18.8,-10.5 34.6,-23.4 47.2,-38.7 12.6,-15.3 22.9,-35.7 30.9,-61.2 7.9,-25.4 11.9,-54.7 11.9,-87.6 0,-47 -15.3,-87 -46,-120 14.4,-35.3 12.8,-74.9 -4.7,-118.8 -10.9,-3.5 -26.6,-1.4 -47.2,6.4 -20.6,7.8 -38.4,16.3 -53.6,25.6l-22.1,14c-36.1,-10.1 -73.4,-15.1 -111.8,-15.1s-75.7,5 -111.8,15.1c-6.2,-4.3 -14.5,-9.5 -24.7,-15.7 -10.3,-6.2 -26.5,-13.7 -48.6,-22.4 -22.1,-8.7 -38.8,-11.4 -50.1,-7.9 -17.1,43.9 -18.4,83.5 -4.1,118.8 -30.7,33 -46,73 -46,120 0,33 4,62.1 11.9,87.3 8,25.2 18.1,45.6 30.6,61.2 12.4,15.5 28,28.5 46.9,39 18.8,10.5 37.1,18 54.7,22.7 17.7,4.6 37.6,8.1 59.7,10.5 -15.5,14 -25,33.9 -28.5,60 -8.1,3.9 -16.9,6.8 -26.2,8.7 -9.3,1.9 -20.4,2.9 -33.2,2.9 -12.8,0 -25.5,-4.2 -38.1,-12.5 -12.6,-8.3 -23.4,-20.5 -32.3,-36.4 -7.4,-12.4 -16.8,-22.5 -28.2,-30.3 -11.5,-7.8 -21.1,-12.4 -28.8,-14l-11.7,-1.8c-8.1,0 -13.8,0.9 -16.9,2.6 -3.1,1.7 -4.1,4 -2.9,6.7 1.2,2.7 2.9,5.5 5.3,8.2 2.3,2.7 4.9,5 7.6,7l4.1,2.9c8.5,3.9 17,11.3 25.3,22.1 8.3,10.9 14.5,20.8 18.3,29.7l5.8,13.4c5,14.8 13.6,26.7 25.6,35.8 12,9.1 25.1,14.9 39,17.5 14,2.5 27.5,3.9 40.5,4.1 13,0.2 23.8,-0.5 32.3,-2l13.4,-2.3c0,14.8 0.1,32 0.3,51.8 0.2,19.8 0.3,30.3 0.3,31.5 0,7 -2.5,12.8 -7.6,17.5 -5,4.7 -12.8,6 -23.3,4.1 -90.1,-29.9 -163.5,-83.7 -220.4,-161.6 -56.9,-77.8 -85.3,-165.5 -85.3,-262.9 0,-81.1 20,-156 60,-224.5s94.2,-122.7 162.7,-162.7c68.5,-40 143.3,-60 224.5,-60 81.1,0 155.9,20 224.5,60 68.5,39.9 122.8,94.2 162.7,162.7s60,143.4 60,224.5l-0,0.1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_project.xml b/app/src/main/res/drawable/ic_project.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/colorTitleText" android:pathData="M513,62.7c-248.5,0 -450,201.5 -450,450s201.5,450 450,450 450,-201.5 450,-450 -201.5,-450 -450,-450zM495,674.7c0,19.9 -16.1,36 -36,36L351,710.7c-19.9,0 -36,-16.1 -36,-36v-108c0,-19.9 16.1,-36 36,-36h108c19.9,0 36,16.1 36,36v108zM495,458.7c0,19.9 -16.1,36 -36,36L351,494.7c-19.9,0 -36,-16.1 -36,-36v-108c0,-19.9 16.1,-36 36,-36h108c19.9,0 36,16.1 36,36v108zM711,674.7c0,19.9 -16.1,36 -36,36L567,710.7c-19.9,0 -36,-16.1 -36,-36v-108c0,-19.9 16.1,-36 36,-36h108c19.9,0 36,16.1 36,36v108zM711,458.7c0,19.9 -16.1,36 -36,36L567,494.7c-19.9,0 -36,-16.1 -36,-36v-108c0,-19.9 16.1,-36 36,-36h108c19.9,0 36,16.1 36,36v108z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_setting.xml b/app/src/main/res/drawable/ic_setting.xml
@@ -1,4 +1,5 @@
 <vector android:height="24dp" android:viewportHeight="1024.0"
     android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorTitleText" android:pathData="M631.5,512C631.5,479 619.8,450.9 596.5,427.5 573.1,404.2 545,392.5 512,392.5 479,392.5 450.9,404.2 427.5,427.5 404.2,450.9 392.5,479 392.5,512 392.5,545 404.2,573.1 427.5,596.5 450.9,619.8 479,631.5 512,631.5 545,631.5 573.1,619.8 596.5,596.5 619.8,573.1 631.5,545 631.5,512L631.5,512ZM870.4,461.1 L870.4,564.7C870.4,568.5 869.2,572 866.7,575.5 864.2,578.9 861.1,580.9 857.3,581.5L771,594.6C765.1,611.4 759,625.6 752.8,637.1 763.7,652.6 780.3,674.1 802.7,701.5 805.8,705.2 807.4,709.1 807.4,713.1 807.4,717.2 806,720.8 803.2,723.9 794.8,735.4 779.4,752.2 757,774.3 734.6,796.4 720,807.4 713.1,807.4 709.4,807.4 705.4,806 701,803.2L636.6,752.8C622.9,760 608.8,765.9 594.1,770.5 589.2,812.8 584.6,841.8 580.6,857.3 578.4,866 572.8,870.4 563.8,870.4L460.2,870.4C455.8,870.4 452,869.1 448.8,866.4 445.5,863.8 443.7,860.4 443.4,856.4L430.3,770.5C415.1,765.6 401.1,759.8 388.3,753.3L322.5,803.2C319.4,806 315.5,807.4 310.9,807.4 306.5,807.4 302.6,805.7 299.2,802.3 260,766.8 234.3,740.7 222.2,723.9 220,720.8 218.9,717.2 218.9,713.1 218.9,709.4 220.2,705.8 222.7,702.4 227.3,695.9 235.3,685.5 246.5,671.4 257.7,657.2 266.1,646.2 271.7,638.5 263.3,622.9 256.9,607.5 252.5,592.3L167.1,579.7C163.1,579 159.8,577.1 157.3,573.8 154.8,570.6 153.6,566.9 153.6,562.9L153.6,459.3C153.6,455.5 154.8,452 157.3,448.5 159.8,445.1 162.8,443.1 166.2,442.5L253,429.4C257.4,415.1 263.4,400.8 271.2,386.5 258.8,368.7 242.1,347.3 221.3,322.1 218.2,318.3 216.6,314.6 216.6,310.9 216.6,307.8 218,304.2 220.8,300.1 228.9,288.9 244.2,272.2 266.8,250 289.3,227.7 304,216.6 310.9,216.6 314.9,216.6 319,218.2 323,221.3L387.4,271.2C401.1,264 415.2,258.1 429.9,253.5 434.8,211.2 439.4,182.2 443.4,166.7 445.6,158 451.2,153.6 460.2,153.6L563.8,153.6C568.2,153.6 572,154.9 575.2,157.6 578.5,160.2 580.3,163.6 580.6,167.6L593.7,253.5C608.9,258.4 622.9,264.2 635.7,270.7L701.9,220.8C704.7,218 708.5,216.6 713.1,216.6 717.2,216.6 721.1,218.2 724.8,221.3 764.9,258.3 790.6,284.7 801.8,300.6 804,303.1 805.1,306.5 805.1,310.9 805.1,314.6 803.8,318.2 801.3,321.6 796.7,328.1 788.7,338.5 777.5,352.6 766.3,366.8 757.9,377.8 752.3,385.5 760.4,401.1 766.8,416.3 771.5,431.3L856.9,444.3C860.9,445 864.2,446.9 866.7,450.2 869.2,453.4 870.4,457.1 870.4,461.1L870.4,461.1Z"/>
+    <path android:fillColor="@color/colorTitleText" android:pathData="M511.5,388.8c-66.6,0 -120.6,54.2 -120.6,121.1 0,66.9 54,121.1 120.6,121.1 66.6,0 120.6,-54.2 120.6,-121.1C632.1,443 578.1,388.8 511.5,388.8zM511.5,569.7c-33,0 -59.8,-26.8 -59.8,-59.8 0,-33 26.8,-59.8 59.8,-59.8 33,0 59.8,26.8 59.8,59.8C571.3,543 544.5,569.7 511.5,569.7z"/>
+    <path android:fillColor="@color/colorTitleText" android:pathData="M511.5,64.8c-245.8,0 -445.1,199.3 -445.1,445.1s199.3,445.1 445.1,445.1 445.1,-199.3 445.1,-445.1S757.3,64.8 511.5,64.8zM746.6,599.1l-43.6,70.8 -61.9,-25.5c-9.9,9.8 -21.4,18.6 -33.9,26.2l7.3,68.8 -80.8,19.3 -25.1,-60.6c-15,-0.1 -29.6,-2.1 -44,-5.7l-42.4,52.6 -70.7,-43.6 24.6,-59.6c-10.5,-10.7 -19.5,-22.8 -27.2,-36.2l-66.7,7.2 -19.3,-80.9 59.8,-24.8c0.3,-15.1 2.6,-30.1 6.4,-44.5l-52.5,-42.4 43.6,-70.7 61,25.1c9.1,-8.6 19.2,-16.4 30.3,-23.3l-9.4,-68.1 80.3,-21.6 27.7,61.6c15.9,0.1 31.7,2.1 47,6.1l44.1,-54.9 70.7,43.6 -26.1,63.4c9.3,9.8 17.6,20.8 24.7,32.8l70.6,-7.6 19.2,80.8 -63,26.3c-0.2,13.9 -2.1,27.8 -5.4,41.3L746.6,599.1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/colorTitleText" android:pathData="M352.4,505.2 L351.6,503.1C341.5,486.8 323.2,476.7 303.7,476.7c-31.2,0 -56.6,25 -56.6,55.6 0,30.7 25.4,55.7 56.6,55.7 31.1,0 56.4,-25 56.4,-55.7 0,-8.1 -1.7,-16 -5.2,-23.3L352.4,505.2z"/>
+    <path android:fillColor="@color/colorTitleText" android:pathData="M719.8,641.9c-23,0 -43.5,13.6 -52.2,34.4C667.4,677 667,677.6 666.9,678.2l0.3,0.1L666.6,679C664.3,685.6 663.3,691.5 663.3,697.5c0,30.6 25.4,55.7 56.5,55.7 31.1,0 56.4,-25 56.4,-55.7S750.9,641.9 719.8,641.9z"/>
+    <path android:fillColor="@color/colorTitleText" android:pathData="M617.2,333.5a0.8,0.8 0,1 0,112.7 0,0.8 0.8,0 1,0 -112.7,0Z"/>
+    <path android:fillColor="@color/colorTitleText" android:pathData="M512,7.5c-280.2,0 -507.7,227.3 -507.7,507.7 0,280.4 227.5,507.7 507.7,507.7 280.5,0 507.8,-227.3 507.8,-507.7C1019.8,234.9 792.5,7.5 512,7.5zM720.3,796.6c-55.3,0 -100.2,-44.4 -100.2,-99.1 0,-5.2 0.4,-10.4 1.2,-15.5l-235.6,-92.6C367,615.3 336.3,631.3 303.7,631.3c-55.3,0 -100.2,-44.5 -100.2,-99.1 0,-54.7 44.9,-99.2 100.2,-99.2 28.9,0 56.8,12.6 75.6,34.1l198.6,-106C575.2,352 573.9,342.7 573.9,333.1c0,-54.6 44.9,-99.2 100.3,-99.2 55.3,0 100.2,44.5 100.2,99.2 0,54.7 -44.9,99.1 -100.2,99.1 -29.1,0 -55.9,-12.1 -75,-33.3L400.3,505.2c2.4,8.8 3.8,17.8 3.8,27 0,5.7 -0.6,11.3 -1.5,17l235,92.4C656.2,614.7 687.2,598.3 720.3,598.3c55.4,0 100.3,44.5 100.3,99.1C820.5,752.1 775.6,796.6 720.3,796.6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_top.xml b/app/src/main/res/drawable/ic_top.xml
@@ -1,5 +1,4 @@
-<vector android:height="32dp" android:viewportHeight="1024.0"
-    android:viewportWidth="1024.0" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/colorTitleText" android:pathData="M730.4,305.6c0,10.4 -8.4,18.8 -18.8,18.8H340.8a18.8,18.8 0,0 1,0 -37.5h370.9c10.4,0 18.8,8.4 18.8,18.8zM694.6,527L540,372.3a18.7,18.7 0,0 0,-13.5 -5.5h-0.5a18.7,18.7 0,0 0,-13.5 5.5l-154.7,154.7a18.7,18.7 0,1 0,26.5 26.5l123.1,-123.1v298.6a18.8,18.8 0,0 0,37.5 0V430.4l123.1,123.1a18.7,18.7 0,0 0,26.5 0,18.7 18.7,0 0,0 0,-26.5z"/>
-    <path android:fillColor="@color/colorTitleText" android:pathData="M512,1024C229.7,1024 0,794.3 0,512S229.7,0 512,0c282.3,0 512,229.7 512,512S794.3,1024 512,1024zM512,26.9c-267.5,0 -485.1,217.6 -485.1,485.1 0,267.5 217.6,485.1 485.1,485.1 267.5,0 485.1,-217.6 485.1,-485.1S779.5,26.9 512,26.9z"/>
+<vector android:height="42dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="42dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/colorTitleText" android:pathData="M508.8,61c-247.3,0 -447.7,200.5 -447.7,447.7s200.5,447.7 447.7,447.7 447.7,-200.5 447.7,-447.7S756,61 508.8,61zM683.8,560.6 L522.9,399.9l0,380.6 -28.2,0 0,-379.6L333.7,561.5 313.7,541.6l195.6,-195 194.4,194L683.8,560.6zM711.8,318.4l-406.1,0 0,-28.2 406.1,0L711.8,318.4z"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
@@ -32,7 +32,6 @@
             app:sLeftBottomTextString="简书:"
             app:sLeftIconHeight="75dp"
             app:sLeftIconMarginLeft="16dp"
-            app:sLeftViewMarginLeft="16dp"
             app:sLeftIconRes="@drawable/fast_shape_placeholder_circle"
             app:sLeftIconWidth="75dp"
             app:sLeftMaxEms="2000"
@@ -43,6 +42,7 @@
             app:sLeftTopTextSize="20dp"
             app:sLeftTopTextString="AriesHoo"
             app:sLeftViewGravity="left_center"
+            app:sLeftViewMarginLeft="16dp"
             app:sShapeCornersRadius="@dimen/dp_radius"
             app:sUseShape="true">
 
@@ -51,17 +51,30 @@
         <com.allen.library.SuperTextView
             android:id="@+id/stv_setting"
             style="@style/SupperTextStyleItem"
+            app:sLeftIconRes="@drawable/ic_setting"
             app:sLeftTextString="@string/setting"/>
 
         <com.allen.library.SuperTextView
             android:id="@+id/stv_libraryMine"
             style="@style/SupperTextStyleItem"
             app:sDividerLineType="none"
+            app:sLeftIconRes="@drawable/ic_github"
             app:sLeftTextString="@string/library_address"/>
 
         <com.allen.library.SuperTextView
-            android:id="@+id/stv_thirdLib"
+            android:id="@+id/stv_thirdLibMine"
             style="@style/SupperTextStyleItem"
+            app:sLeftIconRes="@drawable/ic_project"
             app:sLeftTextString="@string/third_part"/>
+
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_shareMine"
+            style="@style/SupperTextStyleItem"
+            android:layout_marginTop="@dimen/dp_margin_item"
+            app:sLeftIconHeight="22dp"
+            app:sLeftIconMarginLeft="13dp"
+            app:sLeftIconRes="@drawable/ic_share"
+            app:sLeftIconWidth="22dp"
+            app:sLeftTextString="@string/share"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,6 +8,8 @@
     <string name="setting">设置</string>
     <string name="find">发现</string>
     <string name="third_part">第三方库</string>
+    <string name="share">分享</string>
+    <string name="share_content">分享给你一个超给力的Android快速开发库FastLib;Demo下载链接:	http://fir.im/hju8 项目地址:https://github.com/AriesHoo/FastLib</string>
     <string name="activity_tab_sliding">活动页滑动Tab</string>
     <string name="activity_tab_segment">活动页分段Tab</string>
     <string name="library_address">项目地址</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -25,7 +25,10 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">45dp</item>
-        <item name="com.aries.library.fast.demo:sLeftTextSize">16dp</item>
+        <item name="com.aries.library.fast.demo:sLeftViewMarginLeft">6dp</item>
+        <item name="com.aries.library.fast.demo:sLeftIconHeight">24dp</item>
+        <item name="com.aries.library.fast.demo:sLeftIconWidth">24dp</item>
+        <item name="com.aries.library.fast.demo:sLeftTextSize">15dp</item>
         <item name="com.aries.library.fast.demo:sDividerLineColor">@color/colorLineGray</item>
         <item name="com.aries.library.fast.demo:sDividerLineType">both</item>
         <item name="com.aries.library.fast.demo:sLeftTextColor">@color/colorTextBlack</item>
diff --git a/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java b/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java
@@ -1,9 +1,6 @@
 package com.aries.library.fast.module.activity;
 
 import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -145,9 +142,7 @@ public void onClick(int i) {
                                     mAgentWeb.getLoader().reload();
                                     break;
                                 case 1:
-                                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                                    // 将文本内容放到系统剪贴板里。
-                                    cm.setPrimaryClip(ClipData.newPlainText("粘贴板", mCurrentUrl));
+                                    FastUtil.copyToClipboard(mContext, mCurrentUrl);
                                     ToastUtil.show(R.string.fast_copy_success);
                                     break;
                                 case 2:
@@ -158,7 +153,7 @@ public void onClick(int i) {
                     })
                     .setItemsTextColorResource(R.color.colorTitleText)
                     .setCancelColorResource(R.color.colorTitleText)
-                    .setCancelMessage(R.string.cancel)
+                    .setCancelMessage(R.string.fast_cancel)
                     .setCancelMessageTextSize(TypedValue.COMPLEX_UNIT_DIP, 16)
                     .setItemsTextSize(TypedValue.COMPLEX_UNIT_DIP, 16)
                     .setBackgroundResource(android.R.color.darker_gray);
diff --git a/library/src/main/java/com/aries/library/fast/util/FastUtil.java b/library/src/main/java/com/aries/library/fast/util/FastUtil.java
@@ -2,6 +2,8 @@
 
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -205,4 +207,16 @@ public static void startShareText(Activity mActivity, String url, CharSequence t
         //设置分享列表的标题，并且每次都显示分享列表
         mActivity.startActivity(Intent.createChooser(shareIntent, title));
     }
+
+    /**
+     * 拷贝到粘贴板
+     *
+     * @param context
+     * @param str
+     */
+    public static void copyToClipboard(Context context, String str) {
+        ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        // 将文本内容放到系统剪贴板里。
+        cm.setPrimaryClip(ClipData.newPlainText("粘贴板", str));
+    }
 }
diff --git a/library/src/main/res/values-zh/strings.xml b/library/src/main/res/values-zh/strings.xml
@@ -22,6 +22,5 @@
     <string name="fast_exception_class_cast">类型转换错误</string>
     <string name="fast_exception_other_error">其它错误</string>
     <string name="fast_loading">加载中...</string>
-    <string name="cancel">取消</string>
-    <string name="ensure">确定</string>
+    <string name="fast_cancel">取消</string>
 </resources>
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
@@ -22,6 +22,5 @@
     <string name="fast_exception_class_cast">Class Cast Exception</string>
     <string name="fast_exception_other_error">Other Exception</string>
     <string name="fast_loading">Loading...</string>
-    <string name="cancel">Cancel</string>
-    <string name="ensure">Ensure</string>
+    <string name="fast_cancel">Cancel</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package com.aries.library.fast.demo.module.activity;`
`2`	`2`
`3`	`3`	`import android.os.Bundle;`
`4`		`-import android.support.v4.view.ViewCompat;`
`5`	`4`	`import android.support.v7.widget.LinearLayoutManager;`
`6`	`5`	`import android.support.v7.widget.RecyclerView;`
`7`	`6`	`import android.view.View;`
`@@ -113,7 +112,6 @@ public void onClick(View v) {`
`113`	`112`	`});`
`114`	`113`	`}`
`115`	`114`	`imageViewTop.setVisibility(enable ? View.VISIBLE : View.GONE);`
`116`		`- ViewCompat.setElevation(imageViewTop,20);`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`@Override`