马甲包

app/src/main/AndroidManifest.xml

@@ -128,32 +128,13 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <!-- -->
+        <!--android:theme="@style/MySplashTheme"-->
-
         <activity
             android:name="com.shayu.phonelive.activity.LauncherActivity"
             android:exported="true"
-            >
-           <!-- <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+            android:screenOrientation="portrait"
-            </intent-filter>-->
+            tools:ignore="LockedOrientationActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-
-                <data android:scheme="um.64e40ee55488fe7b3afa2c96" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="com.shayu.phonelive.activity.TestActivity"
-            android:exported="true"
-            android:theme="@style/MySplashTheme"
-            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -144,12 +144,10 @@ public class AppContext extends CommonAppContext {
 
     @Override
     public void onCreate() {
+        super.onCreate();
         if (!isMainProcess()) {
             return;
         }
-        super.onCreate();
-        long startTime = System.currentTimeMillis();
-        Log.d("AppStart AppContext", "App start time: " + startTime);
         CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis());
         //注册全局异常捕获
         registerError();

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -119,9 +119,9 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_launcher);
         EventBus.getDefault().register(this);
-//        setStatusBar();
+        setStatusBar();
+        setContentView(R.layout.activity_launcher);
         mContext = this;
         mRoot = findViewById(R.id.root);
         mCover = findViewById(R.id.cover);
@@ -131,6 +131,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         mBtnSkipVideo = findViewById(R.id.btn_skip_video);
         mBtnSkipImage.setOnClickListener(this);
         mBtnSkipVideo.setOnClickListener(this);
+//        ImgLoader.display(mContext, R.drawable.screen, mCover);
         mHandler = new Handler() {
             @Override
             public void handleMessage(Message msg) {
@@ -144,7 +145,6 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                 }
             }
         };
-
         mHandler.sendEmptyMessageDelayed(WHAT_GET_CONFIG, 1000);
         try {
             LogUtil.uploadErrorLog(AppContext.sInstance);
@@ -188,11 +188,9 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
      * 获取Config信息
      */
     private void getConfig() {
-        // TODO 这里花了1.5s
         CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
             @Override
             public void callback(ConfigBean bean) {
-
                 if (bean != null) {
                     L.e(TAG, "----------> getPaster360Url：" + bean.getBeautyKey() + " " + bean.getPaster360Url());
                     CommonAppConfig.getInstance().setBeautySdkType(bean.getSproutType());
@@ -222,7 +220,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                                 final String uid = uidAndToken[0];
                                 final String token = uidAndToken[1];
                                 if (!TextUtils.isEmpty(uid) && !TextUtils.isEmpty(token)) {
-//                                    playAD(obj.getIntValue("type") == 0);
+                                    playAD(obj.getIntValue("type") == 0);
                                 } else {
                                     releaseVideo();
                                     LauncherActivity.this.startActivity(new Intent(LauncherActivity.this, EntryActivity.class));
@@ -237,7 +235,6 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     } else {
                         checkUidAndToken();
                     }
-
                 } else {
                     ToastUtil.show(getString(R.string.net_error));
                 }
@@ -426,7 +423,6 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     ImageView imageView = new ImageView(mContext);
                     imageView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
                     imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-//                    imageView.setScaleType(ImageView.ScaleType.FIT_XY);
                     imageView.setBackgroundColor(0xffffffff);
                     imageView.setTransitionName("ad_img_" + i);
                     mImageViewList.add(imageView);

app/src/main/java/com/shayu/phonelive/activity/TestActivity.java

@@ -1,43 +0,0 @@
-package com.shayu.phonelive.activity;
-
-import android.annotation.SuppressLint;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewTreeObserver;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
-
-import myname.pdlive.shayu.R;
-
-
-public class TestActivity extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_test);
-        ConstraintLayout constraintLayout = findViewById(R.id.root_view);
-
-        View decorView = getWindow().getDecorView();
-        decorView.setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_FULLSCREEN |
-                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        );
-
-        ViewTreeObserver vto = constraintLayout.getViewTreeObserver();
-        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                // 移除监听器，避免重复调用
-                constraintLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                int width = constraintLayout.getWidth();
-                int height = constraintLayout.getHeight();
-                Log.d("TestActivity", "Width: " + width + ", Height: " + height);
-            }
-        });
-    }
-}

app/src/main/res/drawable/test.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@android:color/white"/>
-        </shape>
-    </item>
-    <item
-        android:gravity="center"> <!-- 使用gravity属性来居中图像 -->
-        <bitmap
-            android:src="@mipmap/logo_middle"
-        android:gravity="center"/> <!-- 尽管在<bitmap>中通常不需要这个，但在某些情况下可能有助于明确意图 -->
-    </item>
-</layer-list>

app/src/main/res/layout/activity_launcher.xml

@@ -2,8 +2,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
-    android:background="@color/red"
-    android:padding="1dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -54,13 +52,13 @@
         android:text="@string/recommend_skip"
         android:textColor="@color/white"
         android:textSize="11sp"
-        android:visibility="invisible"
+        android:visibility="invisible" />
-         />
 
     <ImageView
         android:id="@+id/cover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clickable="true"
         android:src="@drawable/screen"
         android:scaleType="centerCrop" />
 

app/src/main/res/layout/activity_test.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:background="@color/white"
-    android:id="@+id/root_view"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/cover"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/logo_middle"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-         />
-</androidx.constraintlayout.widget.ConstraintLayout>
-

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

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="MySplashTheme" parent="Theme.AppCompat.Light.NoActionBar">">
+    <style name="MySplashTheme" parent="AppTheme">
         <!--正常-->
-        <item name="android:windowBackground">@drawable/test</item>
+        <item name="android:windowBackground">@drawable/screen</item>
-        <item name="android:windowFullscreen">true</item>全屏
+        <!--        <item name="android:windowBackground">@drawable/bg_splash</item>-->
+        <item name="android:windowFullscreen">true</item>
+
     </style>
+
 </resources>

common/src/main/java/com/yunbao/common/custom/TabButton.java

@@ -89,7 +89,7 @@ public class TabButton extends LinearLayout {
                 }
             }
         });
-        mAnimator.setDuration(800);
+        mAnimator.setDuration(1200);
         mAnimator.setInterpolator(new LinearInterpolator());
     }
 

common/src/main/res/values/style.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--Base.Theme.NoActionBar  Theme.AppCompat.Light.NoActionBar-->
+    <style name="AppTheme" parent="Base.Theme.NoActionBar">
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -228,8 +228,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
         getWindow().setSharedElementEnterTransition(new FullAdToBannerTransition(1, 0.4f, new DecelerateInterpolator()));
 
-        long startTime = System.currentTimeMillis();
-        Log.d("AppStart MainActivity", "App start time: " + startTime);
     }
 
     @Override
@@ -314,7 +312,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                 }
             });
         } else if (getIntent().getStringExtra("type") != null && getIntent().getStringExtra("type").equals("2")) {
-            //TODO 跳转消息列表
+            //跳转消息列表
             if (mViewPager != null) {
                 mViewPager.setCurrentItem(2);
                 mTabButtonGroup.setCurPosition(2);
@@ -1046,11 +1044,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     @Override
     protected void onResume() {
         super.onResume();
-
-        long startTime = System.currentTimeMillis();
-        Log.d("AppStart MainActivity onResume", "App start time: " + startTime);
-
-
         if (binder != null) {
             if (binder.isDownloadOK()) {
                 binder.install();
@@ -1133,7 +1126,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                 if (code == 0 && info.length > 0) {
                     ArrayList<String> list = new ArrayList<String>(Arrays.asList(info));
                     String url1;
-                    // TODO 优化这个循环
+
                     for (int j = 0; j < list.size(); j++) {
                         String[] arr = list.get(j).split("/");
 

main/src/main/res/layout/activity_entry.xml

@@ -298,22 +298,7 @@
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/lt_customer"
-                android:layout_marginBottom="20dp"
-                android:layout_width="match_parent"
-                android:visibility="gone"
-                android:layout_height="30dp"
-                android:gravity="center">
 
-                <TextView
-                    android:id="@+id/tv_customer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/customer_service2"
-                    android:textColor="#FF999999"
-                    android:textSize="11sp" />
-            </LinearLayout>
 
         </LinearLayout>
     </LinearLayout>