优化了查看高清大图的细节

wenmingvs · Sep 6, 2016 · 9da0bbe · 9da0bbe
1 parent 5c4e6d3
commit 9da0bbe
Show file tree

Hide file tree

Showing 13 changed files with 192 additions and 261 deletions.
diff --git a/weiSwift/src/main/AndroidManifest.xml b/weiSwift/src/main/AndroidManifest.xml
@@ -24,13 +24,21 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:screenOrientation="user"
-        android:theme="@style/WeiBoHoloWindowTranslucent"
+        android:theme="@style/AppTheme"
         android:windowSoftInputMode="adjustResize">
 
-        <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" android:value="true"/>
-        <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstance.enable" android:value="true"/>
-        <meta-data android:name="com.sec.android.multiwindow.STYLE" android:value="fixedRatio"/>
-        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true"/>
+        <meta-data
+            android:name="com.samsung.android.sdk.multiwindow.enable"
+            android:value="true" />
+        <meta-data
+            android:name="com.samsung.android.sdk.multiwindow.multiinstance.enable"
+            android:value="true" />
+        <meta-data
+            android:name="com.sec.android.multiwindow.STYLE"
+            android:value="fixedRatio" />
+        <meta-data
+            android:name="com.sec.android.support.multiwindow"
+            android:value="true" />
 
         <activity
             android:name=".ui.welcome.WelcomeActivity"
@@ -44,49 +52,30 @@
 
         <activity android:name=".ui.unlogin.activity.UnLoginActivity" />
 
-        <activity
-            android:name=".ui.login.activity.MainActivity"
-            android:theme="@style/WeiBoHoloNoWindowTranslucent" />
-
-
+        <activity android:name=".ui.login.activity.MainActivity" />
+
         <activity android:name=".ui.login.fragment.profile.setting.SettingActivity" />
 
 
         <activity android:name=".ui.login.fragment.home.imagedetaillist.ImageDetailsActivity" />
 
-        <activity
-            android:name=".ui.login.fragment.home.weiboitemdetail.activity.OriginPicTextCommentDetailActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
-
-        <activity
-            android:name=".ui.login.fragment.home.weiboitemdetail.activity.RetweetPicTextCommentDetailActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.home.weiboitemdetail.activity.OriginPicTextCommentDetailActivity" />
 
-        <activity android:name=".ui.login.fragment.message.mention.MentionActivity"
+        <activity android:name=".ui.login.fragment.home.weiboitemdetail.activity.RetweetPicTextCommentDetailActivity" />
 
-            />
+        <activity android:name=".ui.login.fragment.message.mention.MentionActivity" />
 
         <activity android:name=".ui.login.fragment.message.comment.CommentActivity" />
 
-        <activity
-            android:name=".ui.login.fragment.profile.myweibo.MyWeiBoActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.profile.myweibo.MyWeiBoActivity" />
 
-        <activity
-            android:name=".ui.login.fragment.discovery.hotweibo.HotWeiBoActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.discovery.hotweibo.HotWeiBoActivity" />
 
-        <activity
-            android:name=".ui.login.fragment.profile.followers.FollowerActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.profile.followers.FollowerActivity" />
 
-        <activity
-            android:name=".ui.login.fragment.profile.friends.FriendsActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.profile.friends.FriendsActivity" />
 
-        <activity
-            android:name=".ui.login.fragment.home.userdetail.UserActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.home.userdetail.UserActivity" />
 
         <activity android:name=".ui.login.fragment.post.PostActivity" />
 
@@ -95,17 +84,19 @@
             android:windowSoftInputMode="adjustResize" />
 
 
-        <activity
-            android:name=".ui.login.fragment.post.picselect.activity.AlbumActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+        <activity android:name=".ui.login.fragment.post.picselect.activity.AlbumActivity" />
+
+        <activity android:name=".ui.unlogin.activity.WebViewActivity" />
+        <activity android:name=".ui.login.fragment.profile.setting.accoutlist.AccoutActivity" />
+        <activity android:name=".ui.login.fragment.profile.favorites.FavoritiesActivity" />
+        <activity android:name=".ui.login.fragment.profile.myphoto.MyPhotoActivity" />
 
         <service android:name=".ui.login.fragment.post.PostService" />
 
         <!-- 登录web界面-->
         <activity
             android:name="com.sina.weibo.sdk.component.WeiboSdkBrowser"
-            android:configChanges="keyboardHidden|orientation"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
+            android:configChanges="keyboardHidden|orientation" />
 
         <!-- 手机短信注册页面 -->
         <activity
@@ -117,21 +108,9 @@
             android:name="com.sina.weibo.sdk.register.mobile.SelectCountryActivity"
             android:configChanges="keyboardHidden|orientation" />
 
-        <activity android:name=".ui.unlogin.activity.WebViewActivity" />
-        <activity
-            android:name=".ui.login.fragment.profile.setting.accoutlist.AccoutActivity"
-
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
-        <activity
-            android:name=".ui.login.fragment.profile.favorites.FavoritiesActivity"
-
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
-        <activity
-            android:name=".ui.login.fragment.profile.myphoto.MyPhotoActivity"
-            android:theme="@style/WeiBoHoloWindowTranslucent" />
         <activity
             android:name=".ui.login.activity.BackgroundActivity"
-            android:theme="@style/noAnimationTheme"/>
+            android:theme="@style/noAnimationTheme" />
 
     </application>
 

diff --git a/weiSwift/src/main/java/com/wenming/weiswift/ui/common/BaseActivity.java b/weiSwift/src/main/java/com/wenming/weiswift/ui/common/BaseActivity.java
@@ -1,7 +1,5 @@
 package com.wenming.weiswift.ui.common;
 
-import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Bundle;
 
 import com.wenming.swipebacklayout.SwipeBackLayout;

diff --git a/...ava/com/wenming/weiswift/ui/login/fragment/home/imagedetaillist/ImageDetailsActivity.java b/...ava/com/wenming/weiswift/ui/login/fragment/home/imagedetaillist/ImageDetailsActivity.java
@@ -10,7 +10,6 @@
 
 import com.wenming.weiswift.R;
 import com.wenming.weiswift.ui.common.StatusBarUtils;
-import com.wenming.weiswift.ui.login.fragment.home.imagedetaillist.animation.RotateDownPageTransformer;
 import com.wenming.weiswift.ui.login.fragment.home.imagedetaillist.animation.ZoomOutPageTransformer;
 
 import java.util.ArrayList;
@@ -60,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mAdapter = new ViewPagerAdapter(mDatas, this);
         mAdapter.setOnSingleTagListener(this);
         mViewPager.setAdapter(mAdapter);
-        mViewPager.setPageTransformer(true,new ZoomOutPageTransformer());
+        mViewPager.setPageTransformer(true, new ZoomOutPageTransformer());
         if (mImgNum == 1) {
             mImageDetailTopBar.setPageNumVisible(View.GONE);
         } else {
@@ -92,11 +91,15 @@ public void onClick(View view) {
             }
         });
 
+        //只有小米，或者魅族手机，或者6.0的手机，才适配状态栏
+        if (Build.MANUFACTURER.equalsIgnoreCase("xiaomi") || Build.MANUFACTURER.equalsIgnoreCase("meizu") || Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+            StatusBarUtils.from(this)
+                    .setTransparentStatusbar(true)
+                    .setStatusBarColor(getResources().getColor(R.color.black))
+                    .process(this);
+        }
+
 
-        StatusBarUtils.from(this)
-                .setTransparentStatusbar(true)
-                .setStatusBarColor(getResources().getColor(R.color.black))
-                .process(this);
     }