Skip to content

Commit

Permalink
this.add(baiduMapSDK集成,databinding数据捆绑,so集成)
Browse files Browse the repository at this point in the history
  • Loading branch information
hechao committed Mar 29, 2016
1 parent 6ec2376 commit 8e73357
Show file tree
Hide file tree
Showing 63 changed files with 323 additions and 77 deletions.
16 changes: 0 additions & 16 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,26 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="bugly_crash_release__2.0" level="project" />
<orderEntry type="library" exported="" name="baidumapapi_base_v3_7_3" level="project" />
<orderEntry type="library" exported="" name="commons-codec-1.6" level="project" />
<orderEntry type="library" exported="" name="design-23.1.0" level="project" />
<orderEntry type="library" exported="" name="baidumapapi_radar_v3_7_3" level="project" />
<orderEntry type="library" exported="" name="baidumapapi_search_v3_7_3" level="project" />
<orderEntry type="library" exported="" name="android-async-http-1.4.9" level="project" />
<orderEntry type="library" exported="" name="jpush-android-2.1.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="httpclient-4.3.5" level="project" />
<orderEntry type="library" exported="" name="httpcore-4.3.2" level="project" />
<orderEntry type="library" exported="" name="httpclient-4.3.6" level="project" />
<orderEntry type="library" exported="" name="httpclient-4.3.5" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="httpclient-4.3.6" level="project" />
<orderEntry type="library" exported="" name="butterknife-5.1.1" level="project" />
<orderEntry type="library" exported="" name="baidumapapi_cloud_v3_7_3" level="project" />
<orderEntry type="library" exported="" name="juhe_sdk_v_2_7" level="project" />
<orderEntry type="library" exported="" name="baidumapapi_map_v3_7_3" level="project" />
<orderEntry type="library" exported="" name="commons-logging-1.1.3" level="project" />
<orderEntry type="library" exported="" name="baidumapapi_util_v3_7_3" level="project" />
<orderEntry type="module" module-name="IMKit" exported="" />
</component>
</module>
Expand Down
83 changes: 54 additions & 29 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,45 +1,70 @@
apply plugin: 'com.android.application'
//apply plugin: 'com.android.databinding'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"



sourceSets {
main {
jniLibs.srcDir 'libs'
}

}


defaultConfig {
applicationId "com.hechao.chat"
minSdkVersion 21
targetSdkVersion 23
versionCode 1
versionName "1.0"
}

packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
}
ndk {
abiFilters 'armeabi'
}



buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile files('libs/android-async-http-1.4.9.jar')
compile project(':IMKit')
compile 'cz.msebera.android:httpclient:4.3.6'
compile files('libs/commons-codec-1.6.jar')
compile files('libs/commons-logging-1.1.3.jar')
compile files('libs/httpclient-4.3.5.jar')
compile files('libs/httpcore-4.3.2.jar')
compile 'com.android.support:appcompat-v7:23.1.0'
compile 'com.android.support:design:23.1.0'
compile 'com.android.support:support-v4:23.1.1'
compile files('libs/jpush-android-2.1.0.jar')
compile 'com.jakewharton:butterknife:5.1.1'
compile files('libs/bugly_crash_release__2.0.jar')
compile files('libs/juhe_sdk_v_2_7.jar')
compile files('libs/baidumapapi_base_v3_7_3.jar')
compile files('libs/baidumapapi_cloud_v3_7_3.jar')
compile files('libs/baidumapapi_map_v3_7_3.jar')
compile files('libs/baidumapapi_radar_v3_7_3.jar')
compile files('libs/baidumapapi_search_v3_7_3.jar')
compile files('libs/baidumapapi_util_v3_7_3.jar')
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile files('libs/android-async-http-1.4.9.jar')
compile project(':IMKit')
compile 'cz.msebera.android:httpclient:4.3.6'
compile files('libs/commons-codec-1.6.jar')
compile files('libs/commons-logging-1.1.3.jar')
compile files('libs/httpclient-4.3.5.jar')
compile files('libs/httpcore-4.3.2.jar')
compile 'com.android.support:appcompat-v7:23.1.0'
compile 'com.android.support:design:23.1.0'
compile 'com.android.support:support-v4:23.1.1'
compile files('libs/jpush-android-2.1.0.jar')
compile 'com.jakewharton:butterknife:5.1.1'
}
}
Binary file added app/libs/arm64-v8a/libBaiduMapSDK_base_v3_7_3.so
Binary file not shown.
Binary file added app/libs/arm64-v8a/libBaiduMapSDK_cloud_v3_7_3.so
Binary file not shown.
Binary file added app/libs/arm64-v8a/libBaiduMapSDK_map_v3_7_3.so
Binary file not shown.
Binary file added app/libs/arm64-v8a/libBaiduMapSDK_radar_v3_7_3.so
Binary file not shown.
Binary file not shown.
Binary file added app/libs/arm64-v8a/libBaiduMapSDK_util_v3_7_3.so
Binary file not shown.
Binary file added app/libs/arm64-v8a/libBugly.so
Binary file not shown.
Binary file added app/libs/arm64-v8a/liblocSDK6a.so
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added app/libs/armeabi-v7a/libBugly.so
Binary file not shown.
Binary file added app/libs/armeabi-v7a/liblocSDK6a.so
Binary file not shown.
Binary file added app/libs/armeabi/libBaiduMapSDK_base_v3_7_3.so
Binary file not shown.
Binary file added app/libs/armeabi/libBaiduMapSDK_cloud_v3_7_3.so
Binary file not shown.
Binary file added app/libs/armeabi/libBaiduMapSDK_map_v3_7_3.so
Binary file not shown.
Binary file added app/libs/armeabi/libBaiduMapSDK_radar_v3_7_3.so
Binary file not shown.
Binary file added app/libs/armeabi/libBaiduMapSDK_search_v3_7_3.so
Binary file not shown.
Binary file added app/libs/armeabi/libBaiduMapSDK_util_v3_7_3.so
Binary file not shown.
Binary file added app/libs/armeabi/libBugly.so
Binary file not shown.
Binary file added app/libs/armeabi/libJuheSDK_v_1_2.so
Binary file not shown.
Binary file added app/libs/armeabi/liblocSDK6a.so
Binary file not shown.
Binary file added app/libs/baidumapapi_base_v3_7_3.jar
Binary file not shown.
Binary file added app/libs/baidumapapi_cloud_v3_7_3.jar
Binary file not shown.
Binary file added app/libs/baidumapapi_map_v3_7_3.jar
Binary file not shown.
Binary file added app/libs/baidumapapi_radar_v3_7_3.jar
Binary file not shown.
Binary file added app/libs/baidumapapi_search_v3_7_3.jar
Binary file not shown.
Binary file added app/libs/baidumapapi_util_v3_7_3.jar
Binary file not shown.
Binary file added app/libs/bugly_crash_release__2.0.jar
Binary file not shown.
Binary file added app/libs/juhe_sdk_v_2_7.jar
Binary file not shown.
Binary file added app/libs/x86/libBaiduMapSDK_base_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86/libBaiduMapSDK_cloud_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86/libBaiduMapSDK_map_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86/libBaiduMapSDK_radar_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86/libBaiduMapSDK_search_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86/libBaiduMapSDK_util_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86/libBugly.so
Binary file not shown.
Binary file added app/libs/x86/liblocSDK6a.so
Binary file not shown.
Binary file added app/libs/x86_64/libBaiduMapSDK_base_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86_64/libBaiduMapSDK_cloud_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86_64/libBaiduMapSDK_map_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86_64/libBaiduMapSDK_radar_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86_64/libBaiduMapSDK_search_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86_64/libBaiduMapSDK_util_v3_7_3.so
Binary file not shown.
Binary file added app/libs/x86_64/libBugly.so
Binary file not shown.
Binary file added app/libs/x86_64/liblocSDK6a.so
Binary file not shown.
8 changes: 8 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

#bugly混淆设置
-keep public class com.tencent.bugly.**{*;}

#百度map混淆设置
-keep class com.baidu.** {*;}
-keep class vi.com.** {*;}
-dontwarn com.baidu.**
23 changes: 22 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_LOGS" />


<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />


<!-- 应用 -->
<application
Expand All @@ -19,6 +29,18 @@
android:label="@string/app_name"
android:theme="@style/AppTheme">


<!--聚合openid-->
<meta-data
android:name="com.thinkland.juheapi.openid"
android:value="JH118022b1118eae05e616a68b0d7354c3" />

<!--百度地图appkey-->
<meta-data
android:name="com.baidu.lbsapi.API_KEY"
android:value="3a0vVIWyrZC2CQSdrvvObnM7123OugOG" />


<!-- 主界面 -->
<activity
android:name=".MainActivity"
Expand Down Expand Up @@ -85,7 +107,6 @@
</activity>



<activity android:name=".UploadPicActivity"></activity>


Expand Down
17 changes: 12 additions & 5 deletions app/src/main/java/com/hechao/chat/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,32 @@

import android.app.Application;

import com.baidu.mapapi.SDKInitializer;
import com.tencent.bugly.crashreport.CrashReport;

import io.rong.imkit.RongIM;

/**
* Created by Administrator on 2016/3/25.
*/
public class App extends Application {

public static String token=null;
public static String username=null;
public static boolean isLogin=false;
public static String token = null;
public static String username = null;
public static boolean isLogin = false;

@Override
public void onCreate() {
super.onCreate();

// 融云sdk初始化
RongIM.init(this);

// 百度地图sdk初始化
SDKInitializer.initialize(this);


RongIM.init(this);
// 聚合数据sdk初始化
// com.thinkland.sdk.android.JuheSDKInitializer.initialize(this);

}

Expand Down
19 changes: 19 additions & 0 deletions app/src/main/java/com/hechao/chat/BaiduMapActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.hechao.chat;

import android.app.Activity;
import android.os.Bundle;

import com.baidu.mapapi.SDKInitializer;

/**
* Created by Administrator on 2016/3/29.
*/
public class BaiduMapActivity extends Activity{

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// SDKInitializer.initialize(getApplicationContext());
setContentView(R.layout.baidumap);
}
}
Loading

0 comments on commit 8e73357

Please sign in to comment.