Browse Source

解决部分机型安装闪退

raomeng 8 years ago
parent
commit
ffd3c09624

+ 4 - 0
WeiChat/build.gradle

@@ -33,6 +33,10 @@ android {
         // 默认是umeng的渠道
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
+
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+        }
     }
 
     useLibrary 'org.apache.http.legacy'

+ 13 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryListActivity.java

@@ -495,6 +495,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     if (mHistoricalRecordAdapter.getObjects().size() > 0) {
                         if (mFuzzyWholeLl.getVisibility() == View.GONE) {
                             mFuzzyHistoryLl.startAnimation(mInAnimation);
+                            mHistoryDataLv.setEnabled(true);
                             mFuzzyWholeLl.setVisibility(View.VISIBLE);
                         }
                     }
@@ -503,6 +504,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
                     if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
                         mFuzzyWholeLl.setVisibility(View.GONE);
+                        mHistoryDataLv.setEnabled(false);
                     }
 
                 }
@@ -512,14 +514,17 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mFuzzyViewBg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mFuzzyHistoryLl.startAnimation(mOutAnimation);
+                if (mFuzzyWholeLl.getVisibility() == View.VISIBLE){
+                    mFuzzyHistoryLl.startAnimation(mOutAnimation);
+                }
             }
         });
 
         mExactViewBg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mExactOptionLl.startAnimation(mOutAnimation);
+                if (mExactWholeLl.getVisibility() == View.VISIBLE)
+                    mExactOptionLl.startAnimation(mOutAnimation);
             }
         });
 
@@ -534,6 +539,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 mSearchEditText.clearFocus();
                 mExactWholeLl.setVisibility(View.GONE);
                 mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
                 CommonUtil.closeKeybord(mSearchEditText, DataInquiryListActivity.this);
             }
 
@@ -546,6 +552,9 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mHistoryDataLv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
+                mSearchEditText.clearFocus();
                 HistoricalRecordBean historicalRecordBean = mHistoricalRecordAdapter.getObjects().get(position);
                 mSearchEditText.setText(historicalRecordBean.getSearchField());
                 mSearchField = historicalRecordBean.getSearchField();
@@ -563,8 +572,6 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                     Log.d("fuzzyCondition", mCondition);
 
                     mPageIndex = 1;
-                    mSearchEditText.clearFocus();
-                    mFuzzyWholeLl.setVisibility(View.GONE);
                     progressDialog.show();
                     getSchemeData();
                 }
@@ -579,6 +586,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
 //                CommonUtil.closeKeybord(mSearchEditText, this);
                 if (mFuzzyWholeLl.getVisibility() == View.VISIBLE) {
                     mFuzzyWholeLl.setVisibility(View.GONE);
+                    mHistoryDataLv.setEnabled(false);
                 }
                 mSearchEditText.clearFocus();
                 mSearchField = "";
@@ -734,6 +742,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
             mSearchField = searchField;
             mSearchEditText.clearFocus();
             mFuzzyWholeLl.setVisibility(View.GONE);
+            mHistoryDataLv.setEnabled(false);
             progressDialog.show();
             getSchemeData();
             return true;

+ 6 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquirySchemeConditionAdapter.java

@@ -65,6 +65,12 @@ public class DataInquirySchemeConditionAdapter extends BaseAdapter {
 
     private void initializeViews(final SchemeConditionBean object, final ViewHolder holder) {
         holder.captionTv.setText(object.getCaption());
+        holder.captionTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
 
         switch (object.getType()) {
 

+ 6 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/ReportQueryConditionAdapter.java

@@ -65,6 +65,12 @@ public class ReportQueryConditionAdapter extends BaseAdapter {
 
     private void initializeViews(final ReportConditionBean object, final ViewHolder holder) {
         holder.captionTv.setText(object.getTitle());
+        holder.captionTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
 
         switch (object.getType()) {
 

+ 5 - 10
WeiChat/src/main/res/layout/activity_data_inquiry_list.xml

@@ -87,26 +87,21 @@
                 android:layout_height="0dp"
                 android:layout_weight="1">
 
-                <LinearLayout
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/data_inquiry_list_option_lv"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <com.xzjmyk.pm.activity.view.MyListView
-                        android:id="@+id/data_inquiry_list_option_lv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                </LinearLayout>
+                    android:layout_height="wrap_content"/>
             </ScrollView>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/background"
                 android:orientation="horizontal"
                 android:paddingBottom="20dp"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:paddingTop="10dp"
-                android:background="@color/background">
+                android:paddingTop="10dp">
 
                 <TextView
                     android:id="@+id/data_inquiry_list_option_cancel_tv"

+ 4 - 4
android-pdf-viewer/build.gradle

@@ -25,12 +25,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode 1
         versionName "2.7.0-beta.1"
     }