update to 1.1.3

caining0 · Dec 1, 2015 · be12cec · be12cec
1 parent 3340f61
commit be12cec
Show file tree

Hide file tree

Showing 19 changed files with 392 additions and 299 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,10 @@ proguard/
 .idea/
 
 .DS_Store
+
+
+gen/com/litesuits/common/BuildConfig.java
+
+lint.xml
+
+project.properties
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.litesuits.common"
-          android:versionCode="11"
-          android:versionName="1.1.1">
-    <uses-sdk android:minSdkVersion="1"/>
+          android:versionCode="13"
+          android:versionName="1.1.3">
+
+    <uses-sdk android:minSdkVersion="7"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <application>
-        <service android:name=".service.NotificationService"
-                 android:label="@string/app_name"
-                 android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+        <service
+                android:name=".service.NotificationService"
+                android:label="@string/app_name"
+                android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
+                <action android:name="android.service.notification.NotificationListenerService"/>
             </intent-filter>
         </service>
     </application>
-    <!-- <application android:icon="@android:drawable/ic_media_play" android:label="LiteCommon">
-         <activity android:name="com.litesuits.android.SamplesActivity" android:screenOrientation="portrait">
-             <intent-filter>
-                 <action android:name="android.intent.action.MAIN"/>
-                 <category android:name="android.intent.category.LAUNCHER"/>
-             </intent-filter>
-         </activity>
-     </application>-->
 </manifest>
diff --git a/README.md b/README.md
@@ -78,7 +78,10 @@ service包：通用服务
 
 我的开源站点 ：[http://litesuits.com](http://litesuits.com/)
 
-点击加入QQ群: [47357508](http://jq.qq.com/?_wv=1027&k=Z7l0Av)
+点击加入QQ群: 
+[42960650](http://jq.qq.com/?_wv=1027&k=cxjcDa)
+
+[47357508](http://jq.qq.com/?_wv=1027&k=Z7l0Av)
 
 我的论坛帖子
 -----

diff --git a/gen/com/litesuits/common/BuildConfig.java b/gen/com/litesuits/common/BuildConfig.java
diff --git a/jars/lite-common-1.1.3.jar b/jars/lite-common-1.1.3.jar
diff --git a/lint.xml b/lint.xml
diff --git a/project.properties b/project.properties
diff --git a/res/layout/act_sample.xml b/res/layout/act_sample.xml
diff --git a/src/com/litesuits/android/SamplesActivity.java b/src/com/litesuits/android/SamplesActivity.java
diff --git a/...om/litesuits/common/assist/LogReader.java → src/com/litesuits/android/log/LogReader.java b/...om/litesuits/common/assist/LogReader.java → src/com/litesuits/android/log/LogReader.java
@@ -1,6 +1,4 @@
-package com.litesuits.common.assist;
-
-import com.litesuits.android.log.Log;
+package com.litesuits.android.log;
 
 import java.io.*;
 import java.text.DecimalFormat;

diff --git a/src/com/litesuits/android/view/TipsView.java b/src/com/litesuits/android/view/TipsView.java
@@ -1,8 +1,6 @@
 package com.litesuits.android.view;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -26,24 +24,19 @@ public TipsView(Context context) {
     }
 
     public TipsView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0, null, null);
-    }
-
-    public TipsView(Context context, AttributeSet attrs, int defStyle) {
-        this(context, attrs, defStyle, null, null);
+        this(context, attrs, null, null);
     }
 
     public TipsView(Context context, View realView, View tipView) {
-        this(context, null, 0, realView, tipView);
+        this(context, null, realView, tipView);
     }
 
     public TipsView(Context context, View realView) {
-        this(context, null, 0, realView, null);
+        this(context, null, realView, null);
     }
 
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public TipsView(Context context, AttributeSet attrs, int defStyle, View realView, View tipView) {
-        super(context, attrs, defStyle);
+    public TipsView(Context context, AttributeSet attrs, View realView, View tipView) {
+        super(context, attrs);
         this.context = context;
         initSelf();
         setRealView(realView);
@@ -77,6 +70,7 @@ public View getRealView() {
 
     public TipsView setRealView(View realView) {
         if (realView != null) {
+            showRealView();
             this.realView = realView;
             parentView = (ViewGroup) realView.getParent();
             setLayoutParams(realView.getLayoutParams());
@@ -86,7 +80,7 @@ public TipsView setRealView(View realView) {
 
 
     public void showRealView() {
-        if (realView != null) {
+        if (realView != null && parentView != null) {
             if (isThisInLayout) {
                 for (int i = 0, size = parentView.getChildCount(); i < size; i++) {
                     if (parentView.getChildAt(i) == this) {
@@ -99,13 +93,11 @@ public void showRealView() {
                     }
                 }
             }
-        } else {
-            this.setVisibility(GONE);
         }
     }
 
     public void showTipsView() {
-        if (realView != null) {
+        if (realView != null && parentView != null) {
             if (!isThisInLayout) {
                 for (int i = 0, size = parentView.getChildCount(); i < size; i++) {
                     if (parentView.getChildAt(i) == realView) {
@@ -118,8 +110,6 @@ public void showTipsView() {
                     }
                 }
             }
-        } else {
-            this.setVisibility(VISIBLE);
         }
     }