2 Commits 882a7788b8 ... 7c39dec127

Autor SHA1 Mensagem Data
  liujiangyao 7c39dec127 Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop 7 anos atrás
  liujiangyao 3879c958ba webview 为null 修改,发现咨询关闭硬件加速 7 anos atrás

+ 1 - 2
app/src/main/AndroidManifest.xml

@@ -602,8 +602,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActFindInformation"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:hardwareAccelerated="true" />
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActReservation"
             android:screenOrientation="portrait" />

+ 5 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java

@@ -97,9 +97,11 @@ public class ActCreditCardWeb extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mWebView.setVisibility(View.GONE);
-        mWebView.removeAllViews();
-        mWebView.destroy();
+        if (mWebView != null) {
+            mWebView.setVisibility(View.GONE);
+            mWebView.removeAllViews();
+            mWebView.destroy();
+        }
     }
 
     private void loadUrl() {

+ 5 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideDeblocked.java

@@ -70,9 +70,11 @@ public class ActGuideDeblocked extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mWebView.setVisibility(View.GONE);
-        mWebView.removeAllViews();
-        mWebView.destroy();
+        if(mWebView != null){
+            mWebView.setVisibility(View.GONE);
+            mWebView.removeAllViews();
+            mWebView.destroy();
+        }
     }
 
     private void loadUrl() {

+ 5 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideOnHook.java

@@ -66,9 +66,11 @@ public class ActGuideOnHook extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mWebView.setVisibility(View.GONE);
-        mWebView.removeAllViews();
-        mWebView.destroy();
+        if(mWebView != null){
+            mWebView.setVisibility(View.GONE);
+            mWebView.removeAllViews();
+            mWebView.destroy();
+        }
     }
 
     private void loadUrl() {

+ 4 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/ActMiDong.java

@@ -150,13 +150,15 @@ public class ActMiDong extends BaseActivity {
         super.onCreate(savedInstanceState);
         // TODO: add setContentView(...) invocation
         ButterKnife.bind(this);
-        EventBus.getDefault().register(this);
+        if(!EventBus.getDefault().isRegistered(this))
+             EventBus.getDefault().register(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        EventBus.getDefault().unregister(this);
+        if(EventBus.getDefault().isRegistered(this))
+            EventBus.getDefault().unregister(this);
     }
 
     @Subscribe

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/WebviewAct.java

@@ -154,7 +154,9 @@ public class WebviewAct extends BaseActivity {
 
     @Override
     protected void onDestroy() {
-        activityWebview.destroy();
+        if(activityWebview != null){
+            activityWebview.destroy();
+        }
         super.onDestroy();
     }
 }

+ 1 - 2
app/src/main/res/layout/adp_homelist_gridview_new.xml

@@ -19,8 +19,7 @@
             android:id="@+id/gridview_item_icon_iv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:src="@mipmap/home_try_play_circle_bg"/>
+            android:adjustViewBounds="true"/>
 
         <TextView
             android:id="@+id/gridview_item_name_tv"

+ 1 - 1
app/src/main/res/layout/adp_midong_item.xml

@@ -149,7 +149,7 @@
 
         <TextView
             android:id="@+id/task_type_tv"
-            style="@style/style_button_find"
+            style="@style/style_button_find_midong"
             android:layout_width="wrap_content"
             android:minWidth="@dimen/find_bt_with"
             android:text="安 装"

+ 2 - 2
app/src/main/res/values/dd_styles.xml

@@ -53,8 +53,8 @@
         <item name="android:gravity">center</item>
         <item name="android:paddingBottom">4dp</item>
         <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingLeft">2dp</item>
-        <item name="android:paddingRight">2dp</item>
+        <item name="android:paddingLeft">11dp</item>
+        <item name="android:paddingRight">11dp</item>
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_12</item>
     </style>