Merge branch 'master' of https://github.com/reactnativecomponent/react-native-imui

guangyao · guangyao · commit ee9dbad0c0e5 · 2017-10-26T17:59:15.000+08:00
diff --git a/android/build.gradle b/android/build.gradle
@@ -33,6 +33,9 @@ dependencies {
     compile 'com.facebook.react:react-native:+'
     compile 'com.google.code.gson:gson:2.3.1'
 
+    compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
+    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
+    //compile 'com.dinuscxj:recyclerrefreshlayout:2.0.5'
     compile 'com.google.zxing:core:3.3.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     testCompile 'junit:junit:4.12'
diff --git a/android/chatinput/android-release-aar.gradle b/android/chatinput/android-release-aar.gradle
@@ -0,0 +1,57 @@
+// ./gradlew clean build generateRelease
+apply plugin: 'maven'
+
+def groupId = project.PUBLISH_GROUP_ID
+def artifactId = project.PUBLISH_ARTIFACT_ID
+def version = project.PUBLISH_VERSION
+
+def localReleaseDest = "${buildDir}/release/${version}"
+
+task androidJavadocs(type: Javadoc) {
+    failOnError = false
+    source = android.sourceSets.main.java.srcDirs
+    ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+    classpath += files(ext.androidJar)
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+uploadArchives {
+    repositories.mavenDeployer {
+        pom.groupId = groupId
+        pom.artifactId = artifactId
+        pom.version = version
+        // Add other pom properties here if you want (developer details / licenses)
+        repository(url: "file://${localReleaseDest}")
+    }
+}
+
+task zipRelease(type: Zip) {
+    from localReleaseDest
+    destinationDir buildDir
+    archiveName "release-${version}.zip"
+}
+
+task generateRelease {
+    doLast {
+        println "Release ${version} can be found at ${localReleaseDest}/"
+        println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
+    }
+}
+
+generateRelease.dependsOn(uploadArchives)
+generateRelease.dependsOn(zipRelease)
+
+
+artifacts {
+    archives androidSourcesJar
+    archives androidJavadocsJar
+}
diff --git a/android/chatinput/build.gradle b/android/chatinput/build.gradle
@@ -44,4 +44,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
 }
 
-apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
+apply from: 'android-release-aar.gradle'
+//apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
diff --git a/android/messagelist/android-release-aar.gradle b/android/messagelist/android-release-aar.gradle
@@ -0,0 +1,57 @@
+// ./gradlew clean build generateRelease
+apply plugin: 'maven'
+
+def groupId = project.PUBLISH_GROUP_ID
+def artifactId = project.PUBLISH_ARTIFACT_ID
+def version = project.PUBLISH_VERSION
+
+def localReleaseDest = "${buildDir}/release/${version}"
+
+task androidJavadocs(type: Javadoc) {
+    failOnError = false
+    source = android.sourceSets.main.java.srcDirs
+    ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+    classpath += files(ext.androidJar)
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+uploadArchives {
+    repositories.mavenDeployer {
+        pom.groupId = groupId
+        pom.artifactId = artifactId
+        pom.version = version
+        // Add other pom properties here if you want (developer details / licenses)
+        repository(url: "file://${localReleaseDest}")
+    }
+}
+
+task zipRelease(type: Zip) {
+    from localReleaseDest
+    destinationDir buildDir
+    archiveName "release-${version}.zip"
+}
+
+task generateRelease {
+    doLast {
+        println "Release ${version} can be found at ${localReleaseDest}/"
+        println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
+    }
+}
+
+generateRelease.dependsOn(uploadArchives)
+generateRelease.dependsOn(zipRelease)
+
+
+artifacts {
+    archives androidSourcesJar
+    archives androidJavadocsJar
+}
diff --git a/android/messagelist/build.gradle b/android/messagelist/build.gradle
@@ -37,4 +37,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
 }
 
-apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
+apply from: 'android-release-aar.gradle'
+//apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
diff --git a/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CardViewHolder.java b/android/messagelist/src/main/java/cn/jiguang/imui/messages/viewholder/CardViewHolder.java
@@ -2,10 +2,12 @@
 
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import cn.jiguang.imui.BuildConfig;
 import cn.jiguang.imui.R;
 import cn.jiguang.imui.commons.models.ICard;
 import cn.jiguang.imui.commons.models.IMessage;
@@ -21,6 +23,7 @@ public class CardViewHolder<MESSAGE extends IMessage> extends AvatarViewHolder<M
     private TextView name;
     private TextView cardType;
     private TextView sessionId;
+    private View layoutTop;
 
     public CardViewHolder(RecyclerView.Adapter adapter, View itemView, boolean isSender) {
         super(adapter, itemView, isSender);
@@ -29,6 +32,7 @@ public CardViewHolder(RecyclerView.Adapter adapter, View itemView, boolean isSen
         name = (TextView) itemView.findViewById(R.id.card_name);
         cardType = (TextView) itemView.findViewById(R.id.card_type);
         sessionId = (TextView) itemView.findViewById(R.id.card_id);
+        layoutTop = itemView.findViewById(R.id.layout_top);
     }
 
     @Override
@@ -41,9 +45,29 @@ public void onBind(final MESSAGE message) {
             }
             name.setText(card.getName());
             cardType.setText(card.getCardType());
-            sessionId.setText(card.getSessionId());
+//            sessionId.setText(card.getSessionId());
         }
-
+        layoutTop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mMsgClickListener != null) {
+                    mMsgClickListener.onMessageClick(message);
+                }
+            }
+        });
+        layoutTop.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (mMsgLongClickListener != null) {
+                    mMsgLongClickListener.onMessageLongClick(message);
+                } else {
+                    if (BuildConfig.DEBUG) {
+                        Log.w("MsgListAdapter", "Didn't set long click listener! Drop event.");
+                    }
+                }
+                return true;
+            }
+        });
     }
 
     @Override
diff --git a/android/messagelist/src/main/res/layout/item_receive_card.xml b/android/messagelist/src/main/res/layout/item_receive_card.xml
@@ -25,7 +25,6 @@
         <LinearLayout
             android:layout_marginTop="@dimen/aurora_message_padding_top"
             android:id="@+id/item_layout"
-            android:clickable="false"
             android:layout_marginLeft="@dimen/aurora_avatar_padding"
             android:layout_marginRight="@dimen/aurora_width_msg_avatar"
             android:layout_centerVertical="true"
@@ -52,19 +51,19 @@
                     android:id="@+id/card_name"
                     android:layout_toRightOf="@+id/card_icon"
                     android:layout_marginTop="@dimen/red_packet_top"
+                    android:layout_centerVertical="true"
                     android:textSize="@dimen/red_packet_comments_size"
-                    android:text="恭喜发财,大吉大利"
                     android:lines="1"
                     android:ellipsize="end"
                     android:textColor="@color/black"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
                 <TextView
+                    android:visibility="gone"
                     android:id="@+id/card_id"
                     android:layout_marginTop="3dp"
                     android:layout_toRightOf="@+id/card_icon"
                     android:layout_below="@+id/card_name"
-                    android:text="领取红包"
                     android:textColor="@color/black"
                     android:textSize="@dimen/red_packet_text_size"
                     android:layout_width="match_parent"
diff --git a/android/messagelist/src/main/res/layout/item_send_card.xml b/android/messagelist/src/main/res/layout/item_send_card.xml
@@ -40,7 +40,6 @@
 
         <LinearLayout
             android:id="@+id/item_layout"
-            android:clickable="false"
             android:layout_marginRight="@dimen/aurora_avatar_padding"
             android:layout_centerVertical="true"
             android:layout_below="@id/aurora_tv_msgitem_display_name"
@@ -66,10 +65,10 @@
                     android:id="@+id/card_name"
                     android:layout_toRightOf="@+id/card_icon"
                     android:layout_marginTop="@dimen/red_packet_top"
+                    android:layout_centerVertical="true"
                     android:textSize="@dimen/red_packet_comments_size"
                     android:lines="1"
                     android:ellipsize="end"
-                    android:text="恭喜发财,大吉大利"
                     android:textColor="@color/black"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -78,8 +77,8 @@
                     android:layout_marginTop="6dp"
                     android:layout_toRightOf="@+id/card_icon"
                     android:layout_below="@+id/card_name"
-                    android:text="领取红包"
                     android:textColor="@color/black"
+                    android:visibility="gone"
                     android:textSize="@dimen/red_packet_text_size"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
diff --git a/android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java b/android/src/main/java/cn/jiguang/imui/messagelist/ReactMsgListManager.java

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,5 @@ dependencies {`
`44`	`44`	`testCompile 'junit:junit:4.12'`
`45`	`45`	`}`
`46`	`46`
`47`		`-apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'`
	`47`	`+apply from: 'android-release-aar.gradle'`
	`48`	`+//apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,5 @@ dependencies {`
`37`	`37`	`testCompile 'junit:junit:4.12'`
`38`	`38`	`}`
`39`	`39`
`40`		`-apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'`
	`40`	`+apply from: 'android-release-aar.gradle'`
	`41`	`+//apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'`