CNLive Android Team / ExternalSharing · Commits

Commit 8f2807ff55e939b335bbdb3710a2440689501619

Authored by 袁思汶
1 parent 023fc79c

seventh-2

Inline Side-by-side
Showing 4 changed files with 4 additions and 3 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
  View file @8f2807f
@@ -94,7 +94,7 @@ public class ShareIMActivity extends AppCompatActivity { @@ -94,7 +94,7 @@ public class ShareIMActivity extends AppCompatActivity {
94 protected void onCreate(@Nullable Bundle savedInstanceState) { 94 protected void onCreate(@Nullable Bundle savedInstanceState) {
95 super.onCreate(savedInstanceState); 95 super.onCreate(savedInstanceState);
96 setContentView(R.layout.sharemoment); 96 setContentView(R.layout.sharemoment);
97 - StatusBarUtil2.setColor(this, getResources().getColor(R.color.shareOut), 0); 97 + StatusBarUtil2.setColor(this, getResources().getColor(R.color.share), 0);
98 timer = new Timer(); 98 timer = new Timer();
99 photoTimer = new Timer(); 99 photoTimer = new Timer();
100 type = getIntent().getStringExtra("type"); 100 type = getIntent().getStringExtra("type");
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareMomentActivity.java
  View file @8f2807f
@@ -84,7 +84,7 @@ public class ShareMomentActivity extends AppCompatActivity { @@ -84,7 +84,7 @@ public class ShareMomentActivity extends AppCompatActivity {
84 protected void onCreate(@Nullable Bundle savedInstanceState) { 84 protected void onCreate(@Nullable Bundle savedInstanceState) {
85 super.onCreate(savedInstanceState); 85 super.onCreate(savedInstanceState);
86 setContentView(R.layout.sharemoment); 86 setContentView(R.layout.sharemoment);
87 - StatusBarUtil2.setColor(this, getResources().getColor(R.color.shareOut), 0); 87 + StatusBarUtil2.setColor(this, getResources().getColor(R.color.share), 0);
88 ImageView imageview = findViewById(R.id.im); 88 ImageView imageview = findViewById(R.id.im);
89 rotateAnimation = new RotateAnimation(0, 360, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); 89 rotateAnimation = new RotateAnimation(0, 360, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
90 rotateAnimation.setFillAfter(true); 90 rotateAnimation.setFillAfter(true);
OutSide_Share/src/main/res/values/colors.xml
  View file @8f2807f
@@ -6,6 +6,6 @@ @@ -6,6 +6,6 @@
6 <color name="color_watching_info_top_bg">#aa66bdc9</color> 6 <color name="color_watching_info_top_bg">#aa66bdc9</color>
7 <color name="black">#000000</color> 7 <color name="black">#000000</color>
8 <color name="share_bg">#b2000000</color> 8 <color name="share_bg">#b2000000</color>
9 - <color name="shareOut">#767676</color> 9 + <color name="share">#767676</color>
10 10
11 </resources> 11 </resources>
app/build.gradle
  View file @8f2807f
@@ -10,6 +10,7 @@ android { @@ -10,6 +10,7 @@ android {
10 targetSdkVersion 29 10 targetSdkVersion 29
11 versionCode 1 11 versionCode 1
12 versionName "1.0" 12 versionName "1.0"
  13 + multiDexEnabled true
13 javaCompileOptions {buildToolsVersion 14 javaCompileOptions {buildToolsVersion
14 annotationProcessorOptions { 15 annotationProcessorOptions {
15 arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"] 16 arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"]