xiongxiaohe лет назад: 8
Родитель
Сommit
53af052ab0

+ 6 - 3
app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppThemes">
 
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -193,12 +193,15 @@
 
         <!--2.0-->
         <activity android:name="com.sheep.gamegroup.view.activity.LoginAct"
+            android:theme="@style/FullScreenTheme"
             android:screenOrientation="portrait">
 
             </activity>
 
         <activity android:name="com.sheep.gamegroup.view.activity.SplashAct"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/FullScreenTheme"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -254,7 +257,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
+            android:theme="@style/ACTMAIN"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <category android:name="android.intent.category.DEFAULT" />
             <intent-filter>

+ 10 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -121,13 +121,20 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("微信授权失败");
                 hideProgress();
+                String  str=t.getMessage();
+                if(str.indexOf("2008")>0) {
+                    showToast("微信授权失败,请先安装微信客户端 在登录吧!");
+
+                }else{
+                    showToast("微信授权失败  请检查网络是否正常");
+
+                }
+
             }
 
             @Override
             public void onCancel(SHARE_MEDIA platform, int action) {
-
                 showToast("微信授权取消");
                 hideProgress();
             }
@@ -152,7 +159,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
 
             @Override
             public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                showToast("QQ授权失败");
+                showToast("QQ授权失败  请检查网络是否正常");
                 hideProgress();
             }
 

+ 22 - 14
app/src/main/java/com/sheep/gamegroup/view/activity/PersionInfoAct.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -14,7 +15,6 @@ import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
-
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
@@ -27,8 +27,9 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
-
+import de.hdodenhof.circleimageview.CircleImageView;
 
 
 /**
@@ -48,10 +49,12 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     ImageView tvQr;
     @BindView(R.id.rl_qr)
     RelativeLayout rlQr;
-    @BindView(R.id.iv_head_right)
-    ImageView ivHeadRight;
+
     @BindView(R.id.rl_head)
     RelativeLayout rl_head;
+    @BindView(R.id.iv_head_right)
+    CircleImageView ivHeadRight;
+
 
     @Override
     protected int getLayoutId() {
@@ -76,7 +79,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         Intent i = getIntent();
         if (i != null && i.hasExtra("info")) {
             mEntity = (UserInfoEntity) i.getSerializableExtra("info");
-            if(mEntity!=null) {
+            if (mEntity != null) {
                 tvNike.setText(mEntity.getNickname());
                 tvSheepId.setText(mEntity.getInvitation_code());
                 Bitmap mBitmap = CodeUtils.createImage(mEntity.getShare_link(), 30, 30, null);
@@ -96,15 +99,14 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(UserNameChange done) {
-        UserInfoEntity user=mEntity;
+        UserInfoEntity user = mEntity;
         user.setNickname(done.getNikeName());
-        mEntity=user;
+        mEntity = user;
         tvNike.setText(mEntity.getNickname());
 
     }
 
 
-
     private void showQR() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
@@ -134,8 +136,8 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         ImageView iv = view.findViewById(R.id.iv_close);
         ImageView iv_qr = view.findViewById(R.id.iv_qr);
         ViewGroup.LayoutParams params = iv_qr.getLayoutParams();
-        params.height=G.WIDTH - 60;
-        params.width =G.HEIGHT / 2-20;
+        params.height = G.WIDTH - 60;
+        params.width = G.HEIGHT / 2 - 20;
         iv_qr.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
         iv_qr.setLayoutParams(params);
         Glide.with(PersionInfoAct.this)
@@ -154,13 +156,12 @@ public class PersionInfoAct extends AbsChooseImageActivity {
     }
 
 
-
     @OnClick({R.id.iv_head_right, R.id.tv_nike, R.id.rl_qr, R.id.rl_head})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.tv_nike:
-                Intent i=new Intent(PersionInfoAct.this,ReNameActivity.class);
-                i.putExtra("name",mEntity.getNickname());
+                Intent i = new Intent(PersionInfoAct.this, ReNameActivity.class);
+                i.putExtra("name", mEntity.getNickname());
                 startActivity(i);
                 break;
             case R.id.rl_qr:
@@ -184,7 +185,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
 
     @Override
     protected void onGetNetImageUrl(String url) {
-        ImageHeadChange  imageHeadChange=new ImageHeadChange();
+        ImageHeadChange imageHeadChange = new ImageHeadChange();
         imageHeadChange.setAvatar(url);
         EventBus.getDefault().post(imageHeadChange);
 
@@ -195,4 +196,11 @@ public class PersionInfoAct extends AbsChooseImageActivity {
         super.onDestroy();
         EventBus.getDefault().unregister(this);
     }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
 }

+ 6 - 8
app/src/main/res/layout/xpersion_info_act_layout.xml

@@ -39,18 +39,16 @@
             android:id="@+id/tv_more"
             />
 
-        <ImageView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_head_right"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
             android:background="@null"
-            android:src="@mipmap/x_ic_def_head"
-            android:scaleType="centerInside"
             android:layout_toLeftOf="@id/tv_more"
             android:layout_centerVertical="true"
-
-
-            />
+            android:scaleType="centerInside"
+            android:src="@mipmap/x_ic_def_head"/>
 
     </RelativeLayout>
 

+ 28 - 27
app/src/main/res/values-v23/style_theme.xml

@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">@color/black</item>
-
-        <item name="main_color">@color/theme_app_main</item>
-        <item name="main_color_dark">@color/theme_app_dark</item>
-        <item name="main_color_mid">@color/theme_app_mid</item>
-        <item name="main_color_accent">@color/theme_app_highlight</item>
-        <item name="main_color_light">@color/theme_app_highlight_more</item>
-        <item name="star_unselect">@drawable/xina</item>
-        <item name="star_select">@drawable/xinb</item>
-        <!--下面的属性全是为了兼容安卓4.0!多了好多文件啊-->
-        <item name="line_short">@drawable/sp_line_vertical</item>
-        <item name="star_style">@style/ratingbar_main</item>
-        <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/selector_button_full_main</item>
-        <item name="full.button">@style/full.button_main</item>
-        <item name="small.button">@style/small.button_main</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
-        <item name="btn_color">@color/btn_color_main</item>
-    </style>
+    <!--<style name="AppTheme" parent="Theme.AppCompat.Light">-->
+        <!--<item name="android:windowContentOverlay">@null</item>-->
+        <!--<item name="android:windowLightStatusBar">true</item>-->
+        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+        <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
+        <!--<item name="colorAccent">@color/colorAccent</item>-->
+        <!--<item name="colorControlHighlight">@color/black</item>-->
+        <!--<item name="main_color">@color/theme_app_main</item>-->
+        <!--<item name="main_color_dark">@color/theme_app_dark</item>-->
+        <!--<item name="main_color_mid">@color/theme_app_mid</item>-->
+        <!--<item name="main_color_accent">@color/theme_app_highlight</item>-->
+        <!--<item name="main_color_light">@color/theme_app_highlight_more</item>-->
+        <!--<item name="star_unselect">@drawable/xina</item>-->
+        <!--<item name="star_select">@drawable/xinb</item>-->
+        <!--<item name="windowActionBar">false</item>-->
+        <!--<item name="windowNoTitle">true</item>-->
+        <!--&lt;!&ndash;下面的属性全是为了兼容安卓4.0!多了好多文件啊&ndash;&gt;-->
+        <!--<item name="line_short">@drawable/sp_line_vertical</item>-->
+        <!--<item name="star_style">@style/ratingbar_main</item>-->
+        <!--<item name="radio_btn">@drawable/sel_circle_dot</item>-->
+        <!--<item name="button_full_normal">@drawable/selector_button_full_main</item>-->
+        <!--<item name="full.button">@style/full.button_main</item>-->
+        <!--<item name="small.button">@style/small.button_main</item>-->
+        <!--<item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>-->
+        <!--<item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>-->
+        <!--<item name="sp_search_edt">@drawable/sp_search_edt_main</item>-->
+        <!--<item name="btn_color">@color/btn_color_main</item>-->
+    <!--</style>-->
 </resources>

+ 29 - 26
app/src/main/res/values/style_theme.xml

@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">@color/theme_app_highlight_more</item>
-
-        <item name="main_color">@color/theme_app_main</item>
-        <item name="main_color_dark">@color/theme_app_dark</item>
-        <item name="main_color_mid">@color/theme_app_mid</item>
-        <item name="main_color_accent">@color/theme_app_highlight</item>
-        <item name="main_color_light">@color/theme_app_highlight_more</item>
-        <item name="star_unselect">@drawable/xina</item>
-        <item name="star_select">@drawable/xinb</item>
-        <!--下面的属性全是为了兼容安卓4.0!多了好多文件啊-->
-        <item name="line_short">@drawable/sp_line_vertical</item>
-        <item name="star_style">@style/ratingbar_main</item>
-        <item name="radio_btn">@drawable/sel_circle_dot</item>
-        <item name="button_full_normal">@drawable/selector_button_full_main</item>
-        <item name="full.button">@style/full.button_main</item>
-        <item name="small.button">@style/small.button_main</item>
-        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
-        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
-        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
-        <item name="btn_color">@color/btn_color_main</item>
-    </style>
+    <!--<style name="AppTheme" parent="Theme.AppCompat.Light">-->
+        <!--<item name="android:windowContentOverlay">@null</item>-->
+        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+        <!--<item name="colorPrimaryDark">@color/theme_app_main</item>-->
+        <!--<item name="colorAccent">@color/colorAccent</item>-->
+        <!--<item name="colorControlHighlight">@color/theme_app_highlight_more</item>-->
+        <!--<item name="windowActionBar">false</item>-->
+        <!--<item name="windowNoTitle">true</item>-->
+        <!--<item name="android:windowBackground">@color/theme_app_main</item>-->
+        <!--<item name="android:windowIsTranslucent">true</item>-->
+        <!--<item name="main_color">@color/theme_app_main</item>-->
+        <!--<item name="main_color_dark">@color/theme_app_dark</item>-->
+        <!--<item name="main_color_mid">@color/theme_app_mid</item>-->
+        <!--<item name="main_color_accent">@color/theme_app_highlight</item>-->
+        <!--<item name="main_color_light">@color/theme_app_highlight_more</item>-->
+        <!--<item name="star_unselect">@drawable/xina</item>-->
+        <!--<item name="star_select">@drawable/xinb</item>-->
+        <!--&lt;!&ndash;下面的属性全是为了兼容安卓4.0!多了好多文件啊&ndash;&gt;-->
+        <!--<item name="line_short">@drawable/sp_line_vertical</item>-->
+        <!--<item name="star_style">@style/ratingbar_main</item>-->
+        <!--<item name="radio_btn">@drawable/sel_circle_dot</item>-->
+        <!--<item name="button_full_normal">@drawable/selector_button_full_main</item>-->
+        <!--<item name="full.button">@style/full.button_main</item>-->
+        <!--<item name="small.button">@style/small.button_main</item>-->
+        <!--<item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>-->
+        <!--<item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>-->
+        <!--<item name="sp_search_edt">@drawable/sp_search_edt_main</item>-->
+        <!--<item name="btn_color">@color/btn_color_main</item>-->
+    <!--</style>-->
 
 
     <attr name="sp_search_edt" format="reference" />

+ 31 - 1
app/src/main/res/values/styles.xml

@@ -20,11 +20,41 @@
     <!--透明,有任务栏电量时间等-->
     <style name="NoTitleTranslucentTheme" parent="Trans">
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/translate</item>
+        <item name="android:windowBackground">@color/theme_app_main</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
 
+    <style name="aaa" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/translate</item>
+        <item name="colorPrimaryDark">@color/translate</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <!--下面的属性全是为了兼容安卓4.0!多了好多文件啊-->
+        <item name="line_short">@drawable/sp_line_vertical</item>
+        <item name="star_style">@style/ratingbar_main</item>
+        <item name="radio_btn">@drawable/sel_circle_dot</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
+        <item name="full.button">@style/full.button_main</item>
+        <item name="small.button">@style/small.button_main</item>
+        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
+        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
+        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
+        <item name="btn_color">@color/btn_color_main</item>
+    </style>
+    <style name="AppThemes" parent="@style/aaa">
+        <item name="android:windowBackground">@color/white_light</item>
+    </style>
+
+    <style name="ACTMAIN" parent="@style/aaa">
+        <item name="android:windowBackground">@color/theme_app_highlight_transparent</item>
+    </style>
+
+
+
+
     <!-- Base application theme. -->
     <style name="XMYTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->

+ 1 - 1
small_sheep_android.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>