diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981032aa01b060f5a568641d7a8840cc90dc..ba7052b8197ddf8ba8756022d905d03055c7ad60 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/JQ_ELOVE/build.gradle b/JQ_ELOVE/build.gradle index da217f74f6146d4ac00f9ecda1877462c4135a1e..1825c56b76634639ee835558b3f8f78d94899315 100644 --- a/JQ_ELOVE/build.gradle +++ b/JQ_ELOVE/build.gradle @@ -16,12 +16,12 @@ android { } aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.jiuqi.elove" minSdkVersion 17 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 34 versionName "3.2.1" // // dex突破65535的限制 @@ -31,6 +31,8 @@ android { ndk { abiFilters "armeabi" } + flavorDimensions "versionCode" + javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } } } productFlavors { xiaomi {} @@ -56,14 +58,19 @@ android { zipAlignEnabled true // 移除无用的resource文件 shrinkResources false - applicationVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.apk')) { - // 输出apk名称为elove_v1.0_2015-01-15_wandoujia.apk - def fileName = "elove_v${defaultConfig.versionName}_${releaseTime()}_${variant.productFlavors[0].name}.apk" - output.outputFile = new File(outputFile.parent, fileName) - } +// applicationVariants.all { variant -> +// variant.outputs.each { output -> +// def outputFile = output.outputFile +// if (outputFile != null && outputFile.name.endsWith('.apk')) { +// // 输出apk名称为elove_v1.0_2015-01-15_wandoujia.apk +// def fileName = "elove_v${defaultConfig.versionName}_${releaseTime()}_${variant.productFlavors[0].name}.apk" +// output.outputFile = new File(outputFile.parent, fileName) +// } +// } +// } + android.applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "elove_v${defaultConfig.versionName}_${releaseTime()}_${variant.productFlavors[0].name}.apk" } } } @@ -100,42 +107,45 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile project(path: ':easeui') - compile files('libs/jpush-android-2.1.7.jar') - compile files('libs/alipaySdk-20160825.jar') - compile project(':Qupaisdk-release') - compile(name: 'newsagent', ext: 'aar') - compile(name: 'adagent', ext: 'aar') - // compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:cardview-v7:25.3.1' - compile 'com.android.support:multidex:1.0.1' - compile 'com.google.code.gson:gson:2.7' - compile 'com.baoyz.actionsheet:library:1.1.5' - compile 'com.umeng.analytics:analytics:latest.integration' - compile 'com.fasterxml.jackson.core:jackson-databind:2.6.4' - compile 'com.google.dagger:dagger-compiler:2.0.1' - compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' - compile 'com.google.code.findbugs:jsr305:3.0.0' - compile 'com.github.PhilJay:MPAndroidChart:v2.1.6' - compile 'com.huxq17.android:SwipeCardsView:1.3.4' - compile 'com.jakewharton:butterknife:8.6.0' - compile 'com.gyf.barlibrary:barlibrary:2.3.0' - compile 'com.squareup.okhttp3:logging-interceptor:3.8.1' - compile 'de.hdodenhof:circleimageview:2.1.0' - compile 'com.squareup.okhttp3:okhttp:3.9.0' - compile 'com.squareup.okhttp:okhttp:2.4.0' - compile 'org.greenrobot:eventbus:3.0.0' - compile 'com.contrarywind:Android-PickerView:3.2.5' - compile 'com.github.pinguo-zhouwei:MZBannerView:v2.0.0' - compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar' - compile 'io.reactivex:rxjava:1.0.14' - compile 'com.google.android:flexbox:0.2.6' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - testCompile 'junit:junit:4.12' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation project(path: ':easeui') + implementation files('libs/jpush-android-2.1.7.jar') + implementation files('libs/alipaySdk-20160825.jar') + implementation project(':Qupaisdk-release') + implementation(name: 'newsagent', ext: 'aar') + implementation(name: 'adagent', ext: 'aar') + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:support-v4:26.1.0' + implementation 'com.android.support:recyclerview-v7:26.1.0' + implementation 'com.android.support:design:26.1.0' + implementation 'com.android.support:cardview-v7:26.1.0' + implementation 'com.android.support:multidex:1.0.3' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'com.baoyz.actionsheet:library:1.1.7' + implementation 'com.umeng.analytics:analytics:6.1.4' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.7.2' + implementation 'com.google.dagger:dagger-compiler:2.0.2' + implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' + implementation 'com.google.code.findbugs:jsr305:3.0.1' + implementation 'com.github.PhilJay:MPAndroidChart:v2.1.6' + implementation 'com.huxq17.android:SwipeCardsView:1.3.4' + implementation 'com.jakewharton:butterknife:8.6.0' + implementation 'com.gyf.barlibrary:barlibrary:2.3.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1' + implementation 'de.hdodenhof:circleimageview:2.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' + implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0@aar'//添加这一条则glide采用的是okhttp + implementation 'com.squareup.okhttp:okhttp:2.5.0' + implementation 'org.greenrobot:eventbus:3.0.0' + implementation 'com.contrarywind:Android-PickerView:3.2.7' + implementation 'com.github.pinguo-zhouwei:MZBannerView:v2.0.0' + implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar' + implementation 'io.reactivex:rxjava:1.3.0' + implementation 'com.google.android:flexbox:0.2.6' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' +// implementation 'jp.wasabeef:glide-transformations:3.1.1' +// // If you want to use the GPU Filters +// implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1' + testImplementation 'junit:junit:4.12' annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0' } diff --git a/JQ_ELOVE/src/main/AndroidManifest.xml b/JQ_ELOVE/src/main/AndroidManifest.xml index c5bfbceb3a01c9449937d7a9b0c6f95be15535d9..4141ceecd0adfb3ba4fc9b5e7cf1f881f14c4218 100644 --- a/JQ_ELOVE/src/main/AndroidManifest.xml +++ b/JQ_ELOVE/src/main/AndroidManifest.xml @@ -694,10 +694,6 @@ android:name=".activity.OrderDetailActivity254" android:launchMode="singleTop" android:screenOrientation="portrait" /> - - + android:windowSoftInputMode="adjustResize" /> \ No newline at end of file diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/ABaseActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/ABaseActivity.java index da3bf82a5430c711e1433a4253b6ba1f04c781df..98ba6d2148334d5d4c7cb9b95e59f8cf894f25b4 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/ABaseActivity.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/ABaseActivity.java @@ -497,7 +497,6 @@ public class ABaseActivity extends AppCompatActivity implements Toolbar.OnMenuIt return true; } } - return false; } } diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/LocateSettingActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/LocateSettingActivity.java index 3538870cb8cc3096819760199bbcbbfb9c45352c..9a811d2bbc6f57c978f475d6e11da53b634229da 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/LocateSettingActivity.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/LocateSettingActivity.java @@ -8,8 +8,10 @@ import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; +import com.alibaba.fastjson.JSONObject; import com.baidu.location.BDLocation; import com.baidu.mapapi.map.BaiduMap; import com.baidu.mapapi.map.MapStatus; @@ -24,10 +26,15 @@ import com.baidu.mapapi.search.geocode.GeoCoder; import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener; import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption; import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult; +import com.baoyz.actionsheet.ActionSheet; import com.jiuqi.elove.R; +import com.jiuqi.elove.common.Constant; +import com.jiuqi.elove.common.Interface; import com.jiuqi.elove.common.PermissionListener; import com.jiuqi.elove.util.BdLocationHelper; import com.jiuqi.elove.util.CommonUtil; +import com.jiuqi.elove.util.OkHttpUtil; +import com.jiuqi.elove.util.SpUtils; import com.jiuqi.elove.widget.ClearEditText; import java.util.List; @@ -35,7 +42,7 @@ import java.util.List; import butterknife.BindView; import butterknife.OnClick; -public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCoderResultListener{ +public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCoderResultListener,ActionSheet.ActionSheetListener{ private BaiduMap baiduMap; private BdLocationHelper helper;//百度地图工具 @@ -45,33 +52,50 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode private MapStatus mMapStatus; private GeoCoder mSearch = null; private String city; + private String userid; + private String flag; /** * 组件 */ - @BindView(R.id.et_search) + @BindView(R.id.et_search)//搜索输入框 ClearEditText et_search; - @BindView(R.id.map) + @BindView(R.id.map)//地图控件 MapView map; - @BindView(R.id.tv_city) + @BindView(R.id.tv_city)//定位到的城市 TextView tv_city; @BindView(R.id.tv_addr_simple)//地址名 TextView tv_addr_simple; @BindView(R.id.tv_addr_detail)//详细地址 TextView tv_addr_detail; + @BindView(R.id.rl_right) + RelativeLayout rl_right; + @BindView(R.id.iv_right) + ImageView iv_right; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_locate_setting,"设置位置",-1,MODE_BACK,HEIGHT_REDBG_WHITEFONT); + getDataFromSpAndPre(); initView(); initLocation(); setSearchListener(); } + /** + * 从缓存中获取数据 + */ + private void getDataFromSpAndPre() { + userid = SpUtils.getString(Constant.USER_ID); + flag = getIntent().getStringExtra("flag"); + } + /** * 初始化view */ private void initView() { + iv_right.setImageResource(R.drawable.icon_setting); + rl_right.setVisibility(View.VISIBLE); baiduMap = map.getMap(); baiduMap.setMapType(BaiduMap.MAP_TYPE_NORMAL); map.showZoomControls(false); @@ -112,7 +136,6 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode if(lat!=null&&lng!=null){ latlng = new LatLng(lat,lng); mSearch.reverseGeoCode(new ReverseGeoCodeOption().location(latlng)); - Point point = new Point(map.getWidth() / 2, map.getHeight() /2); MapViewLayoutParams params = new MapViewLayoutParams.Builder() .layoutMode(MapViewLayoutParams.ELayoutMode.absoluteMode) @@ -152,7 +175,7 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode @Override public void onMapStatusChangeFinish(MapStatus mapStatus) { - LatLng center = mapStatus.target; + LatLng center = mapStatus.target; mSearch.reverseGeoCode(new ReverseGeoCodeOption().location(center)); } }); @@ -161,15 +184,100 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode /** * 点击事件 */ - @OnClick({R.id.tv_cancel}) + @OnClick({R.id.tv_cancel,R.id.tv_sure,R.id.rl_right}) public void onClick(View view){ switch (view.getId()){ case R.id.tv_cancel: +// handleCancel(); + break; + case R.id.tv_sure: + putLocation2Server(); + break; + case R.id.rl_right: + clearLocationDialog(); + break; + } + } + /** + * 提交地址到服务器端 + */ + private void putLocation2Server() { + if(lat==null||lng==null) { + showToast("请选择地点后进行设置"); + return; + } + String upAddressUrl = Constant.COMMON_URL + Interface.LOCATION_PUT; + JSONObject obj = new JSONObject(); + obj.put("userid",userid); + obj.put("positionType",flag); + obj.put("position",tv_addr_detail.getText().toString().trim()); + obj.put("lng",String.valueOf(lng)); + obj.put("lat",String.valueOf(lat)); + obj.put("version",Constant.VERSION); + String param = obj.toJSONString(); + okHttpUtil.sendJsonStrByPostAsync(this, false, upAddressUrl, param, new OkHttpUtil.OnGetJsonObject() { + @Override + public void onResponse(JSONObject jsonObject) { + String rsCode = jsonObject.getString("retcode"); + String msg = jsonObject.getString("message"); + if(Constant.SUCCESS_CODE.equals(rsCode)){ + finish(); + }else{ + showToast(msg); + } + } + },null); + } + + /** + * 清除地理位置 + */ + private void clearLocationDialog() { + setTheme(R.style.ActionSheetStyleiOS7); + ActionSheet.createBuilder(this, getSupportFragmentManager()) + .setCancelButtonTitle(getString(R.string.cancel)) + .setOtherButtonTitles("清除位置") + .setCancelableOnTouchOutside(true).setListener(this).show(); + } + + @Override + public void onOtherButtonClick(ActionSheet actionSheet, int index) { + switch (index){ + case 0: + clearLocation(); + break; + default: break; } } + @Override + public void onDismiss(ActionSheet actionSheet, boolean isCancel) { + + } + + private void clearLocation() { + String locationClearUrl = Constant.COMMON_URL + Interface.LOCATION_CLEAR; + JSONObject obj = new JSONObject(); + obj.put("userid",userid); + obj.put("positionType",flag); + obj.put("version",Constant.VERSION); + String param = obj.toJSONString(); + okHttpUtil.sendJsonStrByPostAsync(this, false, locationClearUrl, param, new OkHttpUtil.OnGetJsonObject() { + @Override + public void onResponse(JSONObject jsonObject) { + String rsCode = jsonObject.getString("retcode"); + String msg = jsonObject.getString("explanation"); + showToast(msg); + } + },null); + } + +// private void handleCancel() { +// if(TextUtils.isEmpty(et_search.getText().toString().trim())) +// } + /** * 设置输入位置搜索监听事件 */ @@ -180,10 +288,14 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEARCH) { String address = et_search.getText().toString().trim(); - if(city!=null&&!TextUtils.isEmpty(address)) + if(city!=null&&!TextUtils.isEmpty(address)) { mSearch.geocode(new GeoCodeOption().city(city).address(et_search.getText().toString().trim())); - else + }else{ + tv_addr_simple.setText(""); + tv_addr_detail.setText(""); showToast("搜索错误，请稍后搜索"); + } + } return false; } @@ -193,6 +305,9 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode @Override public void onGetGeoCodeResult(GeoCodeResult result) { if(result!=null&&result.getLocation()!=null){ + LatLng location = result.getLocation(); + lat = location.latitude; + lng = location.longitude; MapStatusUpdate status = MapStatusUpdateFactory.newLatLng(result.getLocation()); baiduMap.animateMapStatus(status); mSearch.reverseGeoCode(new ReverseGeoCodeOption().location(result.getLocation())); @@ -204,9 +319,23 @@ public class LocateSettingActivity extends ABaseActivity implements OnGetGeoCode @Override public void onGetReverseGeoCodeResult(ReverseGeoCodeResult result) { if (result != null) { - result.getAddressDetail(); - tv_addr_simple.setText(result.getAddress()); -// tv_addr_detail.setText(result.getAdd()); + LatLng location = result.getLocation(); + lat = location.latitude; + lng = location.longitude; + tv_addr_simple.setText(result.getSematicDescription()); + tv_addr_detail.setText(result.getAddress()); + }else{ + tv_addr_simple.setText(""); + tv_addr_detail.setText(""); + showToast("搜索错误，请稍后搜索"); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if(helper!=null){ + helper.recycleLocate(); } } } diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MainActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MainActivity.java index f42bed17e838a59eba4706dba6603e00c5980c1f..f391518b7510e06282d74373481558a4cb9fd898 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MainActivity.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MainActivity.java @@ -1,5 +1,6 @@ package com.jiuqi.elove.activity; +import android.Manifest; import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.Context; @@ -33,6 +34,7 @@ import android.widget.Toast; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baidu.location.BDLocation; import com.gyf.barlibrary.ImmersionBar; import com.hyphenate.EMMessageListener; import com.hyphenate.chat.EMClient; @@ -44,6 +46,7 @@ import com.hyphenate.util.EMLog; import com.jiuqi.elove.adapter.AccountChooseAdapter; import com.jiuqi.elove.common.Constant; import com.jiuqi.elove.common.Interface; +import com.jiuqi.elove.common.PermissionListener; import com.jiuqi.elove.common.Share; import com.jiuqi.elove.dao.InviteMessgeDao; import com.jiuqi.elove.dao.UserDao; @@ -58,6 +61,7 @@ import com.jiuqi.elove.fragment.MyInfoCenterFragment; import com.jiuqi.elove.R; import com.jiuqi.elove.updateapk.CheckApkUpdate; +import com.jiuqi.elove.util.BdLocationHelper; import com.jiuqi.elove.util.EaseHxHelper; import com.jiuqi.elove.util.JpushUtil; import com.jiuqi.elove.util.JqStrUtil; @@ -73,6 +77,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import butterknife.BindView; +import butterknife.OnClick; import cn.jpush.android.api.JPushInterface; import cn.jpush.android.api.TagAliasCallback; @@ -84,67 +90,59 @@ import cn.jpush.android.api.TagAliasCallback; public class MainActivity extends ABaseActivity implements View.OnClickListener{ private static final String TAG = "MainActivity"; - /** - * 底部tab布局（用于设置点击事件） - */ - public static MainActivity instance;//主页面实例，在ondestroy中赋值为空了；主要用于退出登录时将此页面finish掉。 - private LinearLayout ll_footer; - private RelativeLayout mllfellfor;//首页 -// private RelativeLayout mllconveylove;//消息 - private LinearLayout mllact;//活动 - private LinearLayout mllsaylove; - private LinearLayout mllmore;//我的 - // textview for unread message count -// private TextView unreadLabel;//2.0.2版本消息未读提示 - //imageview for unread message prompt - private ImageView unread_msg_number;//2.0.2版本消息未读提示 - private InviteMessgeDao inviteMessgeDao; - private Dialog dialog; - private UserDao userDao; - private boolean isConflictDialogShow; - private android.app.AlertDialog.Builder conflictBuilder; - // user logged into another device - public boolean isConflict = false; - private BroadcastReceiver broadcastReceiver; - private LocalBroadcastManager broadcastManager; - private List recentList; - private int currentTabIndex; private long exitTime = 0;//退出程序点击时间监听 + private String isPost = "MainActivity"; + public static MainActivity instance;//主页面实例，在ondestroy中赋值为空了；主要用于退出登录时将此页面finish掉。 /** - * 底部tab中的图片（用于点击之后的更改） - */ - private ImageView iv_fellfor; -// private ImageView iv_conveylove; - private ImageView iv_act; - private ImageView iv_saylove; - private ImageView iv_more; - /** - * 底部tab中文字（用于点击之后的更改） + * 组件 */ - private TextView tv_fellfor; -// private TextView tv_conveylove; - private TextView tv_act; - private TextView tv_saylove; - private TextView tv_more; + private android.app.AlertDialog.Builder conflictBuilder;//登录冲突弹框 + @BindView(R.id.ll_fellfor)//首页 + RelativeLayout mllfellfor; + @BindView(R.id.ll_act)//活动 + LinearLayout mllact; + @BindView(R.id.ll_saylove)//发现 + LinearLayout mllsaylove; + @BindView(R.id.ll_more)//我的 + LinearLayout mllmore; + @BindView(R.id.unread_msg_label)//消息未读提示 + ImageView unread_msg_number; + @BindView(R.id.iv_tabfellfor) + ImageView iv_fellfor; + @BindView(R.id.iv_tabact) + ImageView iv_act; + @BindView(R.id.iv_tabsaylove) + ImageView iv_saylove; + @BindView(R.id.iv_tabmore) + ImageView iv_more; + @BindView(R.id.tv_tabfellfor) + TextView tv_fellfor; + @BindView(R.id.tv_tabact) + TextView tv_act; + @BindView(R.id.tv_tabsaylove) + TextView tv_saylove; + @BindView(R.id.tv_tabmore) + TextView tv_more; /** * 各个tab对应的fragment */ private HomePageFragment mHomePageFragment; - private MessageFragment2_6 messageFragment2_6; private ActFragment2_0_3 mActFragment2_0_3; -// private FindFragment findFragment; private FindFragment201801 findFragment; -// private SayloveFragment mSayloveFragment; -// private SayloveFragment255 mSayloveFragment255; -// private FriendCircleFragment friendCircleFragment; private MyInfoCenterFragment mMyInfoCenterFragment; - - private static final int MSG_SET_ALIAS = 1001; + /** + * 变量 + */ + private BdLocationHelper helper; + private double latitude;//纬度 + private double longitude;//经度 + private boolean isConflictDialogShow; + public boolean isConflict = false; + private BroadcastReceiver broadcastReceiver; + private LocalBroadcastManager broadcastManager; private String userid; private int ifup; private int serviceUnreadMsgCount; - private String nikeName; - private String avatar; private List mSysList;//企缘通知，用于在messageFragment中关闭通知栏消息 private List mActList; private List mArticleList; @@ -152,9 +150,6 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ private List mCompanyList; private CompanyInfoModel companyModel; - private String isPost = "MainActivity"; - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -163,15 +158,18 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ setContentView(R.layout.activity_main,"",-1,MODE_NONE,HEIGHT_NONE_LIGHT); initData();//初始化数据 initView();//初始化控件 - initEvents();//注册事件 setSelect(0);//设置默认ui显示 hxMessage(savedInstanceState);//2.0.2版本加入环信单点登录,以及消息接收广播 - setAlias();//设置极光推送的alias + JpushUtil.setAlias(userid,"");//设置极光推送 initZhiTongNews(); new CheckApkUpdate(MainActivity.this,isPost).updateApk(); enterpriseInfoExplore(); + initLocation();//定位，每次定位将用户的位置信息上传至服务器 } + /** + * 初始化智通资讯 + */ private void initZhiTongNews() { // 初始化黑牛 NewsAgent.init(this); @@ -181,11 +179,6 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ NewsAgent.SetUserImpForSDK(null,LoginActivity.class); } -// @Override -// public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) { -// -// } - private void initMsgPushList() { model = new NotifyModel(); mSysList = new ArrayList<>(); @@ -197,12 +190,8 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ * 初始化数据 */ private void initData(){ - inviteMessgeDao = new InviteMessgeDao(this);//环信用 - userDao = new UserDao(this);//环信用 ifup = SpUtils.getInt(Constant.IF_UP); userid = SpUtils.getString(Constant.USER_ID); - nikeName = SpUtils.getString(Constant.NIKE_NAME); - avatar = SpUtils.getString(Constant.AVATAR); } /** @@ -232,100 +221,10 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ registerBroadcastReceiver(); } - // 这是来自 JPush Example 的设置别名的 Activity 里的代码。一般 App 的设置的调用入口，在任何方便的地方调用都可以。 - private void setAlias() { - // 调用 Handler 来异步设置别名 - mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_ALIAS, userid)); - } - private final TagAliasCallback mAliasCallback = new TagAliasCallback() { - @Override - public void gotResult(int code, String alias, Set tags) { - String logs ; - switch (code) { - case 0: - logs = "Set tag and alias success"; - Log.i(TAG, logs); - // 建议这里往 SharePreference 里写一个成功设置的状态。成功设置一次后，以后不必再次设置了。 - SharedPreferences sp = getSharedPreferences("elove",MODE_PRIVATE); - SharedPreferences.Editor editor = sp.edit(); - editor.putString("isSave","3");//已经将该用户的alias保存到服务器，以后可以不保存了 - editor.apply(); - break; - case 6002: - logs = "Failed to set alias and tags due to timeout. Try again after 60s."; - Log.i(TAG, logs); - // 延迟 60 秒来调用 Handler 设置别名 - mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SET_ALIAS, alias), 1000 * 60); - break; - default: - logs = "Failed with errorCode = " + code; - Log.e(TAG, logs); - } - } - }; - - /** - * 极光推送handler - */ - private final Handler mHandler = new Handler() { - @Override - public void handleMessage(android.os.Message msg) { - super.handleMessage(msg); - switch (msg.what) { - case MSG_SET_ALIAS: - HashSet tagSet = new HashSet<>(); - tagSet.add(Constant.VERSION); - // 调用 JPush 接口来设置别名。 - JPushInterface.setAliasAndTags(getApplicationContext(), - (String) msg.obj, - tagSet, - mAliasCallback); - break; - default: - break; - } - } - }; - /** * 初始化控件 */ private void initView() { -// virtualkey_bg = (TextView) findViewById(R.id.virtualkey_bg); - mllfellfor = (RelativeLayout) findViewById(R.id.ll_fellfor); -// mllconveylove = (RelativeLayout) findViewById(R.id.ll_conveylove); - mllact = (LinearLayout) findViewById(R.id.ll_act); - mllsaylove = (LinearLayout) findViewById(R.id.ll_saylove); - mllmore = (LinearLayout) findViewById(R.id.ll_more); - ll_footer = (LinearLayout) findViewById(R.id.ll_footer); - iv_fellfor = (ImageView) findViewById(R.id.iv_tabfellfor); -// iv_conveylove = (ImageView) findViewById(R.id.iv_tabconveylove); - iv_act = (ImageView) findViewById(R.id.iv_tabact); - iv_saylove = (ImageView) findViewById(R.id.iv_tabsaylove); - iv_more = (ImageView) findViewById(R.id.iv_tabmore); - tv_fellfor = (TextView) findViewById(R.id.tv_tabfellfor); -// tv_conveylove = (TextView) findViewById(R.id.tv_tabconveylove); - tv_act = (TextView) findViewById(R.id.tv_tabact); - tv_saylove = (TextView) findViewById(R.id.tv_tabsaylove); - tv_more = (TextView) findViewById(R.id.tv_tabmore); -// unreadLabel = (TextView) findViewById(R.id.unread_msg_number);//2.0.2版本消息未读提示 - unread_msg_number = (ImageView) findViewById(R.id.unread_msg_label);//2.0.2版本消息未读提示 - final View mRoot = getWindow().getDecorView(); - mRoot.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - Rect rect = new Rect(); - mRoot.getWindowVisibleDisplayFrame(rect); - int rootInvisibleHeight = mRoot.getRootView().getHeight()-rect.bottom; - if(rootInvisibleHeight>200){ - //显示 - ll_footer.setVisibility(View.GONE); - }else{ - //隐藏 - ll_footer.setVisibility(View.VISIBLE); - } - } - }); if (ifup==2){ //对话框 CustomDialog.Builder builder = new CustomDialog.Builder(MainActivity.this); @@ -357,40 +256,20 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ } } - /** - * 设置事件 - */ - private void initEvents(){ - mllfellfor.setOnClickListener(this); -// mllconveylove.setOnClickListener(this); - mllact.setOnClickListener(this); - mllsaylove.setOnClickListener(this); - mllmore.setOnClickListener(this); - } - - @Override + @OnClick({R.id.ll_fellfor,R.id.ll_act,R.id.ll_saylove,R.id.ll_more}) public void onClick(View view) { resetBottomUi(); switch (view.getId()){ case R.id.ll_fellfor: - MobclickAgent.onEvent(this,"homepage4"); setSelect(0); break; -// case R.id.ll_conveylove: -// MobclickAgent.onEvent(this,"homepage5"); -// setSelect(1); -//// initRecentPersonInfo(); -// loginEase(); -// break; case R.id.ll_act: - MobclickAgent.onEvent(this,"homepage6"); setSelect(2); break; case R.id.ll_saylove: setSelect(3); break; case R.id.ll_more: - MobclickAgent.onEvent(this,"homepage7"); setSelect(4); break; default: @@ -398,39 +277,12 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ } } - /** - * 环信登录2rd（多次进行登录保证聊天时时登录状态） - */ -// private void loginEase() { -// String userid = sp.getString("userid",""); -// String emcUsername = userid.toLowerCase(); -// EMClient.getInstance().login(emcUsername,emcUsername,new EMCallBack() {//回调 -// @Override -// public void onSuccess() { -// EMClient.getInstance().groupManager().loadAllGroups(); -// EMClient.getInstance().chatManager().loadAllConversations(); -// Log.d("main", "登录聊天服务器成功！"); -// } -// -// @Override -// public void onProgress(int progress, String status) { -// -// } -// -// @Override -// public void onError(int code, String message) { -// Log.d("main", "登录聊天服务器失败！"); -// } -// }); -// } - private void setSelect(int i) { FragmentManager fm = getSupportFragmentManager(); FragmentTransaction transaction = fm.beginTransaction(); hideFragments(transaction); switch (i){ case 0: - currentTabIndex = 0;//2.0.2版本 if(mHomePageFragment ==null){ mHomePageFragment = new HomePageFragment(); model.setmSysList(mSysList); @@ -446,25 +298,7 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ iv_fellfor.setImageResource(R.drawable.homepage_selected); tv_fellfor.setTextColor(getResources().getColor(R.color.bottomtabtouched)); break; -// case 1: -// currentTabIndex = 1;//2.0.2版本 -// if(messageFragment2_6 ==null){ -// messageFragment2_6 = new MessageFragment2_6(); -// model.setmSysList(mSysList); -// model.setmActList(mActList); -// model.setmArticleList(mArticleList); -// Bundle args = new Bundle(); -// args.putSerializable("message",model); -// messageFragment2_6.setArguments(args); -// transaction.add(R.id.content, messageFragment2_6); -// }else{ -// transaction.show(messageFragment2_6); -// } -// iv_conveylove.setImageResource(R.drawable.message_selected); -// tv_conveylove.setTextColor(getResources().getColor(R.color.bottomtabtouched)); -// break; case 2: - currentTabIndex = 2;//2.0.2版本 if(mActFragment2_0_3==null){ mActFragment2_0_3 = new ActFragment2_0_3(); transaction.add(R.id.content,mActFragment2_0_3); @@ -481,23 +315,10 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ }else{ transaction.show(findFragment); } -// if(mSayloveFragment255==null){ -// mSayloveFragment255 = new SayloveFragment255(); -// transaction.add(R.id.content,mSayloveFragment255); -// }else{ -// transaction.show(mSayloveFragment255); -// } -// if(friendCircleFragment==null){ -// friendCircleFragment = new FriendCircleFragment(); -// transaction.add(R.id.content,friendCircleFragment); -// }else{ -// transaction.show(friendCircleFragment); -// } iv_saylove.setImageResource(R.drawable.community_select); tv_saylove.setTextColor(getResources().getColor(R.color.bottomtabtouched)); break; case 4: - currentTabIndex = 4;//2.0.2版本 if(mMyInfoCenterFragment ==null){ mMyInfoCenterFragment = new MyInfoCenterFragment(); transaction.add(R.id.content, mMyInfoCenterFragment); @@ -513,28 +334,20 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ transaction.commit(); } + /** + * 隐藏所有的fragment + * @param transaction + */ private void hideFragments(FragmentTransaction transaction) { if(mHomePageFragment !=null){ transaction.hide(mHomePageFragment); } -// if(mMessageFragment !=null){ -// transaction.hide(mMessageFragment); -// } - if(messageFragment2_6!=null){ - transaction.hide(messageFragment2_6); - } if(mActFragment2_0_3!=null){ transaction.hide(mActFragment2_0_3); } if(findFragment!=null){ transaction.hide(findFragment); } -// if(mSayloveFragment255!=null){ -// transaction.hide(mSayloveFragment255); -// } -// if(friendCircleFragment!=null){ -// transaction.hide(friendCircleFragment); -// } if(mMyInfoCenterFragment !=null){ transaction.hide(mMyInfoCenterFragment); } @@ -545,12 +358,10 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ */ private void resetBottomUi() { iv_fellfor.setImageResource(R.drawable.homepage_unselect); -// iv_conveylove.setImageResource(R.drawable.message_unselect); iv_act.setImageResource(R.drawable.activity_unselect); iv_saylove.setImageResource(R.drawable.community_unselect); iv_more.setImageResource(R.drawable.mine_unselect); tv_fellfor.setTextColor(getResources().getColor(R.color.bottomtabUntouched)); -// tv_conveylove.setTextColor(getResources().getColor(R.color.bottomtabUntouched)); tv_act.setTextColor(getResources().getColor(R.color.bottomtabUntouched)); tv_saylove.setTextColor(getResources().getColor(R.color.bottomtabUntouched)); tv_more.setTextColor(getResources().getColor(R.color.bottomtabUntouched)); @@ -672,62 +483,6 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ SpUtils.setString(Constant.VERSION_CODE,code); } -// /** -// * show the dialog when user logged into another device -// */ -// private void showConflictDialog() { -// isConflictDialogShow = true; -// EaseHxHelper.getInstance().logout(false,null); -// String st = getResources().getString(R.string.Logoff_notification); -// if (!MainActivity.this.isFinishing()) { -// // clear up global variables -// try { -// if (conflictBuilder == null) -// conflictBuilder = new android.app.AlertDialog.Builder(MainActivity.this); -// conflictBuilder.setTitle(st); -// conflictBuilder.setMessage(R.string.connect_conflict); -// conflictBuilder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { -// -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// conflictBuilder = null; -// /** -// * 退出清除账号信息 -// */ -// mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_ALIAS, ""));//关闭极光推送 -// SharedPreferences.Editor editor = sp.edit(); -// editor.clear(); -// editor.putBoolean("isFirst",false); -// editor.apply(); -// finish(); -// Intent intent = new Intent(MainActivity.this, LoginOrRegisterActivity.class); -// intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); -// startActivity(intent); -//// shutJpush();//关闭极光推送 -// EaseHxHelper.hxLogout();//环信退出 -// } -// }); -// conflictBuilder.setCancelable(false); -// conflictBuilder.create().show(); -// isConflict = true; -// } catch (Exception e) { -// EMLog.e(TAG, "---------color conflictBuilder error" + e.getMessage()); -// } -// -// } -// -// } - -// private void shutJpush(){ -// HashSet tagSet = new HashSet<>(); -// tagSet.add(Constant.VERSION); -// // 调用 JPush 接口来设置别名。 -// JPushInterface.setAliasAndTags(getApplicationContext(), -// "", -// tagSet, -// mAliasCallback); -// } private void registerBroadcastReceiver() { broadcastManager = LocalBroadcastManager.getInstance(this); IntentFilter intentFilter = new IntentFilter(); @@ -928,6 +683,9 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ protected void onDestroy() { super.onDestroy(); instance = null; + if(helper!=null){ + helper.recycleLocate(); + } if (conflictBuilder != null) { conflictBuilder.create().dismiss(); conflictBuilder = null; @@ -1016,4 +774,56 @@ public class MainActivity extends ABaseActivity implements View.OnClickListener{ } },null); } + + /** + * 百度地图初始初始化及定位 + */ + private void initLocation() { + helper = new BdLocationHelper(this,0); + helper.registerLocationListener(); + helper.setListener(new BdLocationHelper.onSuccessLocate() { + @Override + public void handle(BDLocation bdLocation) { + latitude = bdLocation.getLatitude(); + longitude = bdLocation.getLongitude(); + SpUtils.setString(Constant.LOCATE_LAT,String.valueOf(latitude)); + SpUtils.setString(Constant.LOCATE_LNG,String.valueOf(longitude)); + saveAddress(); + } + }); + requestRuntimePermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, new PermissionListener() { + @Override + public void onGranted() { + helper.startLocate(); + } + + @Override + public void onDenied(List deniedPermission) { + } + }); + } + + /** + * 保存地址 + */ + private void saveAddress() { + String saveAddressUrl = Constant.COMMON_URL + Interface.SAVE_ADDURL; + JSONObject obj = new JSONObject(); + obj.put("lng",longitude); + obj.put("lat",latitude); + obj.put("userID",userid); + obj.put("version",Constant.VERSION); + String param = obj.toJSONString(); + okHttpUtil.sendJsonStrByPostAsync(getApplicationContext(),false,saveAddressUrl, param, new OkHttpUtil.OnGetJsonObject() { + @Override + public void onResponse(JSONObject jsonObject) { + String rsCode = jsonObject.getString("retcode"); + if(Constant.SUCCESS_CODE.equals(rsCode)){ + SpUtils.setString(Constant.LOCATE_LNG,String.valueOf(longitude)); + SpUtils.setString(Constant.LOCATE_LAT,String.valueOf(latitude)); + helper.recycleLocate(); + } + } + },null); + } } diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MinaLongConnectActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MinaLongConnectActivity.java deleted file mode 100644 index 31cec573c61a2f1831eb9b26ab508f51a6a017a1..0000000000000000000000000000000000000000 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/MinaLongConnectActivity.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.jiuqi.elove.activity; - -import android.content.Context; -import android.content.SharedPreferences; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.util.Log; -import android.view.View; -import android.widget.GridView; -import android.widget.ImageView; -import android.widget.TextView; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.jiuqi.elove.R; -import com.jiuqi.elove.adapter.ActPersonAdapter; -import com.jiuqi.elove.common.Constant; -import com.jiuqi.elove.common.JqBaseActivity; -import com.jiuqi.elove.entity.ActUserModel; -import com.jiuqi.elove.util.CommonUtil; -import com.jiuqi.elove.util.JqStrUtil; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketTimeoutException; -import java.net.URLDecoder; -import java.util.List; - -public class MinaLongConnectActivity extends JqBaseActivity implements View.OnClickListener{ - - /** - * 控件 - */ - private TextView tvTitle; - private TextView tv_net_status; - private ImageView imgBack; - private GridView gv_act; - /** - * 数据 - */ - private String userid; - private String avatar; - private String sex; - private String username; - /** - * 工具 - */ - private final String SERVER_HOST = "10.40.0.20"; - private final int PORT = 10099; - private final int TIME_OUT = 5000; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_mina_long_connect); - getDataFromSp(); - initView(); - startSocketThread(); - setEvents(); - } - - @Override - protected void onResume() { - super.onResume(); - promptNetStatus(); - } - - private void promptNetStatus() { - ConnectivityManager conMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - // 获取管理器的活动网络信息对象 - NetworkInfo activeInfo = conMgr.getActiveNetworkInfo(); - if (activeInfo != null && activeInfo.isConnected()){ - // 查看网络连接类型 - boolean wifiConnected = activeInfo.getType() == ConnectivityManager.TYPE_WIFI; - boolean mobileConnected = activeInfo.getType() == ConnectivityManager.TYPE_MOBILE; - // wifi 连接 - if(wifiConnected){ - tv_net_status.setText("当前网络为wifi"); -// JqStrUtil.showToast(this,"当前网络为wifi"); - } else if(mobileConnected){ // 手机网络连接 -// JqStrUtil.showToast(this,"当前网络为2g/3g/4g"); - tv_net_status.setText("当前网络为2g/3g/4g"); - } -// else{ -// tv_net_status.setText("当前无网络"); -//// JqStrUtil.showToast(this,"当前无网络"); -// } - }else{ - tv_net_status.setText("当前无网络"); - } - } - - private void startSocketThread() { - new SocketThread().start(); - } - - private void getDataFromSp() { - SharedPreferences sp = getSharedPreferences("elove",MODE_PRIVATE); - userid = sp.getString(Constant.USER_ID,""); - avatar = sp.getString(Constant.AVATAR,""); - sex = sp.getString(Constant.SEX,""); - username = sp.getString(Constant.NIKE_NAME,""); - } - - private void setEvents() { - imgBack.setOnClickListener(this); - } - - private void initView() { - tvTitle = easyFind(R.id.tvTitle); - tv_net_status = easyFind(R.id.tv_net_status); - imgBack = easyFind(R.id.img_leftBtn); - gv_act = easyFind(R.id.gv_act); - tvTitle.setText("签到嘉宾"); - imgBack.setVisibility(View.VISIBLE); - } - - @Override - public void onClick(View view) { - switch (view.getId()){ - case R.id.img_leftBtn: - finish(); - break; - } - } - - - class SocketThread extends Thread{ - @Override - public void run() { - //定义消息 - Message msg = new Message(); - msg.what = 0x11; - Bundle bundle = new Bundle(); - bundle.clear(); - try { - //连接服务器,并设置连接超时为5秒 - Socket socket = new Socket(); - socket.connect(new InetSocketAddress(SERVER_HOST,PORT),TIME_OUT); - if(socket.isConnected()){ - JSONObject obj = new JSONObject(); - obj.put("userid",userid); - obj.put("username",username); - obj.put("userface",avatar); - obj.put("sex",sex); - obj.put("action","1"); - String param = obj.toJSONString(); - //获取输入输出流 -// OutputStream ou = socket.getOutputStream(); - PrintWriter pw = new PrintWriter(new OutputStreamWriter(socket.getOutputStream(),"utf-8"));//java服务器接受默认是gbk？ - BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream(),"utf-8")); - //向服务器发送信息 - pw.println(param); - pw.flush(); -// ou.write(param.getBytes()); -// ou.flush(); - socket.shutdownOutput(); - //读取发来服务器信息 - String line = null; - while ((line = in.readLine()) != null) { - String result = URLDecoder.decode(line,"utf-8"); - bundle.putString("msg", result); - msg.setData(bundle); - //发送消息 修改UI线程中的组件 - if(myHandler.obtainMessage(msg.what)!=null){ - Message message = new Message(); - message.what = msg.what; - message.setData(msg.getData()); - msg = message; - } - myHandler.sendMessage(msg); - } - //关闭各种输入输出流 - in.close(); -// ou.close(); - pw.close(); - socket.close(); - } - } catch (SocketTimeoutException se) { - Log.d("mina", "run: "+"timeout"); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - public Handler myHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - if (msg.what == 0x11) { - Bundle bundle = msg.getData(); - String result = bundle.getString("msg"); - List mList = JSONArray.parseArray(result,ActUserModel.class); - ActPersonAdapter adapter = new ActPersonAdapter(MinaLongConnectActivity.this,mList); - gv_act.setAdapter(adapter); - } - } - - }; -} diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearByListActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearByListActivity.java index 3c82a43c672954eeda3eec373f3a5abca16d13af..430c934ff0b58af8e428d7006d43283f829b1581 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearByListActivity.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearByListActivity.java @@ -8,21 +8,20 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.RelativeLayout; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hyphenate.easeui.EaseConstant; import com.jiuqi.elove.R; +import com.jiuqi.elove.adapter.NearbyUserListAdapter; import com.jiuqi.elove.adapter.SysRecommendAdapter; import com.jiuqi.elove.common.Constant; import com.jiuqi.elove.common.Interface; +import com.jiuqi.elove.entity.NearByUserModel; import com.jiuqi.elove.entity.SysRecommendModel; import com.jiuqi.elove.util.JqStrUtil; import com.jiuqi.elove.util.OkHttpUtil; import com.jiuqi.elove.util.SpUtils; import com.jiuqi.elove.widget.dialog.CustomDialog; -import com.jiuqi.elove.widget.pulltorefresh.PullToRefreshLayout; -import java.util.ArrayList; import java.util.List; import butterknife.BindView; @@ -40,14 +39,14 @@ public class NearByListActivity extends ABaseActivity{ /** * 数据 */ - private List mList; - private SysRecommendModel recommendModel; + private List mList; + private NearByUserModel.UserListBean recommendModel; private String title; private String userid; /** * 工具 */ - private SysRecommendAdapter adapter; + private NearbyUserListAdapter adapter; @Override protected void onCreate(Bundle savedInstanceState) { @@ -63,7 +62,7 @@ public class NearByListActivity extends ABaseActivity{ */ private void getDataFromSp() { userid = SpUtils.getString(Constant.USER_ID); - mList = (List) getIntent().getSerializableExtra("list"); + mList = (List) getIntent().getSerializableExtra("list"); title = "附近人" +"("+ mList.size()+")"; } @@ -71,19 +70,19 @@ public class NearByListActivity extends ABaseActivity{ * 初始化list,设置adapter */ private void setAdapter() { - adapter = new SysRecommendAdapter(this,R.layout.item_sys_recommend,"nearby"); + adapter = new NearbyUserListAdapter(this,R.layout.item_sys_recommend,"nearby"); rv.setLayoutManager(new LinearLayoutManager(this)); rv.setAdapter(adapter); //设置监听事件 - adapter.setListener(new SysRecommendAdapter.ItemClickListener() { + adapter.setListener(new NearbyUserListAdapter.ItemClickListener() { @Override - public void onItemClick(SysRecommendModel model,int position) { + public void onItemClick(NearByUserModel.UserListBean model,int position) { recommendModel = model; startDetailPage(model); } @Override - public void focus(SysRecommendModel model, SysRecommendAdapter.MyViewHolder holder) { + public void focus(NearByUserModel.UserListBean model, NearbyUserListAdapter.MyViewHolder holder) { if(Constant.ATTENTION_NOT.equals(model.getIfattention())){ addFocus(model,holder,Constant.ACTION_ADDFOCUS); }else{ @@ -92,7 +91,7 @@ public class NearByListActivity extends ABaseActivity{ } @Override - public void talk(SysRecommendModel model) { + public void talk(NearByUserModel.UserListBean model) { startSingleTalk(model); } }); @@ -101,10 +100,10 @@ public class NearByListActivity extends ABaseActivity{ /** * 聊天 */ - private void startSingleTalk(SysRecommendModel model) { + private void startSingleTalk(NearByUserModel.UserListBean model) { Intent intent = new Intent(this, ChatActivity.class); intent.putExtra("chatType", EaseConstant.CHATTYPE_SINGLE);//2.0.2版本加群聊之后做区分 - intent.putExtra("userId",model.getUserID().toLowerCase()); + intent.putExtra("userId",model.getOtherid().toLowerCase()); intent.putExtra("nikeName",model.getNickname()); intent.putExtra("avatar",model.getAvatar()); startActivity(intent); @@ -114,9 +113,9 @@ public class NearByListActivity extends ABaseActivity{ * 进入他人中心 * @param model 他人实体对象 */ - private void startDetailPage(SysRecommendModel model){ + private void startDetailPage(NearByUserModel.UserListBean model){ Intent intent = new Intent(this,OtherPersonCenterActivity.class); - intent.putExtra("otherid",model.getUserID()); + intent.putExtra("otherid",model.getOtherid()); intent.putExtra("flag","fellfor"); startActivityForResult(intent,0x03); } @@ -139,9 +138,9 @@ public class NearByListActivity extends ABaseActivity{ * @param vh 一个item的示例 * @param action 判断是关注还是取消 */ - private void addFocus(final SysRecommendModel model, final SysRecommendAdapter.MyViewHolder vh, final String action) { + private void addFocus(final NearByUserModel.UserListBean model, final NearbyUserListAdapter.MyViewHolder vh, final String action) { String focusUrl = Constant.COMMON_URL + Interface.ADD_FOCUS; - String otherId = model.getUserID(); + String otherId = model.getOtherid(); JSONObject obj = new JSONObject(); obj.put("otherID",otherId); obj.put("userID",userid); @@ -172,7 +171,7 @@ public class NearByListActivity extends ABaseActivity{ },null); } - private void showSureDialog(final SysRecommendModel model, final SysRecommendAdapter.MyViewHolder vh, final String action) { + private void showSureDialog(final NearByUserModel.UserListBean model, final NearbyUserListAdapter.MyViewHolder vh, final String action) { CustomDialog.Builder builder = new CustomDialog.Builder(this); builder.setTitle(""); builder.setMessage("确定要取消关注吗?"); diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearbyMapActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearbyMapActivity.java index 3d39852c0133174feed29c001674b96d0d5db59f..1a6d699cb425ce845a8de0123a2c1e8d60213462 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearbyMapActivity.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/NearbyMapActivity.java @@ -1,9 +1,7 @@ package com.jiuqi.elove.activity; -import android.Manifest; import android.content.Intent; import android.graphics.Bitmap; -import android.graphics.Matrix; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -14,7 +12,6 @@ import android.widget.RelativeLayout; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baidu.location.BDLocation; import com.baidu.mapapi.clusterutil.MarkerManager; import com.baidu.mapapi.clusterutil.clustering.Cluster; import com.baidu.mapapi.clusterutil.clustering.ClusterItem; @@ -35,15 +32,14 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.jiuqi.elove.R; import com.jiuqi.elove.common.Constant; import com.jiuqi.elove.common.Interface; -import com.jiuqi.elove.common.PermissionListener; -import com.jiuqi.elove.entity.SysRecommendModel; -import com.jiuqi.elove.util.BdLocationHelper; +import com.jiuqi.elove.entity.NearByUserModel; import com.jiuqi.elove.util.BitmapUtils; import com.jiuqi.elove.util.JqStrUtil; import com.jiuqi.elove.util.OkHttpUtil; import com.jiuqi.elove.util.SpUtils; import java.io.Serializable; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -56,37 +52,28 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti /** * 工具 */ - public static final int HOME_LOCATE = 1; - public static final int COMPANY_LOCATE = 2; + public static final String HOME_LOCATE = "2"; + public static final String COMPANY_LOCATE = "1"; private BaiduMap baiduMap; private MyClusterManager manager; - private BdLocationHelper helper;//百度地图工具 private List mList = new ArrayList<>();//bitmap的list - + private MyHandler handler; /** * 数据 */ private Double lat; private Double lng; private String userid; - private List userList; + private List userList; private List items; private LatLng latlng; private MapStatus mMapStatus; - private float maxZoomLevel; + private String positionType; /** * 组件 */ @BindView(R.id.map) - MapView mapView; - @BindView(R.id.rl_ding) - RelativeLayout rl_ding; - @BindView(R.id.rl_locate) - RelativeLayout rl_locate; - @BindView(R.id.rl_del) - RelativeLayout rl_del; - @BindView(R.id.rl_add) - RelativeLayout rl_add; + MapView map; @BindView(R.id.rl_right) RelativeLayout rl_right; @BindView(R.id.iv_right) @@ -97,15 +84,24 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti super.onCreate(savedInstanceState); setContentView(R.layout.activity_nearby_map,"",-1,MODE_BACK,HEIGHT_REDBG_WHITEFONT); initView(); -// getDataFromSp(); -// if(!JqStrUtil.isLogin()){//未登錄 -// initLocation(); -// }else{//如果登陸了 -// initMap(); -// reqUserList(); -// } + initData(); + } + + @Override + protected void onResume() { + super.onResume(); + reqUserList();//首次加载 } + /** + * 初始化数据和工具 + */ + private void initData() { + userid = SpUtils.getString(Constant.USER_ID); + positionType = HOME_LOCATE; + handler = new MyHandler(this); + } +// /** * 初始化ui */ @@ -114,25 +110,14 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti rl_right.setVisibility(View.VISIBLE); } - private void getDataFromSp() { - String locateLng = SpUtils.getString(Constant.LOCATE_LNG); - String locatelat = SpUtils.getString(Constant.LOCATE_LAT); - userid = SpUtils.getString(Constant.USER_ID); - if(!TextUtils.isEmpty(locateLng)){ - lng = Double.valueOf(locateLng); - } - if(!TextUtils.isEmpty(locatelat)){ - lat = Double.valueOf(locatelat); - } - } /** * 初始化设置地图 */ private void initMap() { - baiduMap = mapView.getMap(); + baiduMap = map.getMap(); baiduMap.setMapType(BaiduMap.MAP_TYPE_NORMAL); - mapView.showZoomControls(false); + map.showZoomControls(false); if(lat!=null&&lng!=null){ latlng = new LatLng(lat,lng); mMapStatus = new MapStatus.Builder().target(latlng).zoom(19).build(); @@ -140,6 +125,9 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti } } + /** + * 将获取地址后的地图的新状态设置进去并更新 + */ private void setMapStatus() { //定义MapStatusUpdate对象，以便描述地图状态将要发生的变化 MapStatusUpdate mMapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mMapStatus); @@ -147,22 +135,37 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti baiduMap.animateMapStatus(mMapStatusUpdate); } - @OnClick({R.id.rl_right,R.id.rl_locate,R.id.rl_ding,R.id.rl_add,R.id.rl_del}) + /** + * 各种点击事件 + */ + @OnClick({R.id.rl_locate,R.id.rl_ding,R.id.rl_add,R.id.rl_del,R.id.rl_right,R.id.tv_home,R.id.tv_company}) public void OnClick(View view){ switch (view.getId()){ - case R.id.rl_right: + case R.id.rl_right://点击弹出设置家庭地址和公司地址的选择项 chooseSetLocateDialog(); break; case R.id.rl_locate: case R.id.rl_ding: setMapStatus(); break; - case R.id.rl_add://放大 + case R.id.rl_add: addMap(); break; - case R.id.rl_del://缩小 + case R.id.rl_del: delMap(); break; + case R.id.tv_home: + positionType = HOME_LOCATE; + baiduMap.clear(); + clearCache(); + reqUserList(); + break; + case R.id.tv_company: + positionType = COMPANY_LOCATE; + baiduMap.clear(); + clearCache(); + reqUserList(); + break; } } @@ -191,26 +194,32 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti } } + @Override + public void onDismiss(ActionSheet actionSheet, boolean isCancel) { + + } + /** * 跳转到设置位置页面 * flag判断是公司还是家庭地址 * @param flag */ - private void startLocateSetPage(int flag) { + private void startLocateSetPage(String flag) { Intent intent = new Intent(this,LocateSettingActivity.class); intent.putExtra("flag",flag); startActivity(intent); } - @Override - public void onDismiss(ActionSheet actionSheet, boolean isCancel) { - - } - + /** + * 缩小地图 + */ private void delMap() { baiduMap.setMapStatus(MapStatusUpdateFactory.zoomOut());//缩小 } + /** + * 放大地图 + */ private void addMap() { baiduMap.setMapStatus(MapStatusUpdateFactory.zoomIn());//放大 } @@ -219,13 +228,12 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti * 获取附近人数据 */ private void reqUserList() { - String nearbyUrl = Constant.COMMON_URL + Interface.NEARBY_NEW; + String nearbyUrl = Constant.COMMON_URL + Interface.NEARBY_USERS; JSONObject obj = new JSONObject(); - obj.put("lng",lng); - obj.put("lat",lat); - obj.put("page",1); - obj.put("pagesize",50); + obj.put("page","1"); + obj.put("pagesize","50"); obj.put("userid",userid); + obj.put("positionType",positionType); obj.put("version",Constant.VERSION); String param = obj.toJSONString(); okHttpUtil.sendJsonStrByPostAsync(this,false,nearbyUrl, param, new OkHttpUtil.OnGetJsonObject() { @@ -233,77 +241,18 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti public void onResponse(JSONObject jsonObject) { String rsCode = jsonObject.getString("retcode"); if(Constant.SUCCESS_CODE.equals(rsCode)){ - String jsonString = jsonObject.getString("message"); - userList = JSON.parseArray(jsonString,SysRecommendModel.class); + String result = jsonObject.getString("message"); + NearByUserModel model = JSON.parseObject(result,NearByUserModel.class); + userList = model.getUserList(); + lat = model.getLat(); + lng = model.getLng(); + initMap(); setUser2Map(); - setMakerClickListener(); } } },null); } - /** - * 百度地图初始初始化及定位 - */ - private void initLocation() { - helper = new BdLocationHelper(this,0); - helper.registerLocationListener(); - helper.setListener(new BdLocationHelper.onSuccessLocate() { - @Override - public void handle(BDLocation bdLocation) { - String address = bdLocation.getCity(); - lat = bdLocation.getLatitude(); - lng = bdLocation.getLongitude(); - SpUtils.setString(Constant.ADDRESS,address);//首页展示用 - initMap(); - reqUserList(); - } - }); - requestRuntimePermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, new PermissionListener() { - @Override - public void onGranted() { - helper.startLocate(); - } - - @Override - public void onDenied(List deniedPermission) { - - } - }); - } - - private Handler handler = new Handler(){ - @Override - public void handleMessage(Message msg) { - if(msg.what==0x01){ - if(items.size()==userList.size()){ - manager.addItems(items); - setMapClickListener(); - setMapStatus(); -// manager.addItems(items); -// // 设置地图监听，当地图状态发生改变时，进行点聚合运算 -// baiduMap.setOnMapStatusChangeListener(manager); - - // 设置maker点击时的响应 -// baiduMap.setOnMarkerClickListener(manager); -// manager.setOnClusterClickListener(new MyClusterManager.OnClusterClickListener() { -// @Override -// public boolean onClusterClick(Cluster cluster) { -// Collection collection = cluster.getItems(); -// List mModelList = new ArrayList<>(); -// for(MyItem item : collection){ -// mModelList.add(item.getModel()); -// } -// startNearByDetailPage(mModelList); -// return false; -// } -// }); - } - } - } - }; - - /** * 将数据放入到地图中显示 */ @@ -312,48 +261,58 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti // 向点聚合管理类中添加Marker实例 items = new ArrayList<>(); for(int i=0;i() { + Glide.with(this).load(model.getAvatar()).asBitmap().placeholder(R.drawable.img_yuanqueshengtouxiang).override(50, 50).into(new SimpleTarget() { @Override public void onResourceReady(Bitmap resource, GlideAnimation glideAnimation) { -// Bitmap avatar = createOptBitmap(resource,150,150); -// CircleImageView view = new CircleImageView(NearbyMapActivity.this); -// view.setImageBitmap(avatar); -// view.setImageAlpha(0); mList.add(resource); - LatLng point = new LatLng(model.getLat(),model.getLng()); - items.add(new MyItem(point,resource,model)); + LatLng point = new LatLng(model.getLat(), model.getLng()); + items.add(new MyItem(point, resource, model)); handler.sendEmptyMessage(0x01); -// BitmapDescriptor bitmap = BitmapDescriptorFactory.fromView(view); -// OverlayOptions option = new MarkerOptions().position(point).icon(bitmap); -// Marker marker = (Marker) baiduMap.addOverlay(option); -// //这种方法在marker中保存对象信息，不用集合的方式去展示了 -// Bundle bundle = new Bundle(); -// bundle.putSerializable("model", model); -// marker.setExtraInfo(bundle);//marker点击事件监听时，可以获取到此时设置的数据 } }); }else{ Bitmap temp = BitmapUtils.compressBySize(getResources(),R.drawable.img_yuanqueshengtouxiang,50,50); -// Bitmap avatar = createOptBitmap(temp,150,150); -// CircleImageView view = new CircleImageView(NearbyMapActivity.this); -// view.setImageBitmap(avatar); -// view.setImageAlpha(0); mList.add(temp); LatLng point = new LatLng(model.getLat(),model.getLng()); items.add(new MyItem(point,temp,model)); handler.sendEmptyMessage(0x01); } } -// manager.addItems(items); -// // 设置地图监听，当地图状态发生改变时，进行点聚合运算 -// baiduMap.setOnMapStatusChangeListener(manager); -// setMapStatus(); -// setMapClickListener(); + } + + /** + * 处理事件的handler + */ + private static class MyHandler extends Handler{ + WeakReference mActivity; + + MyHandler(NearbyMapActivity activity) { + mActivity = new WeakReference<>(activity); + } + + @Override + public void handleMessage(Message msg) { + if(mActivity.get()==null){ + return; + } + if(msg.what==0x01){ + mActivity.get().upData2ViewAndClick(); + } + } + } + + /** + * 更新ui以及监听事件 + */ + private void upData2ViewAndClick() { + if(items.size()==userList.size()){ + manager.addItems(items); + setMapClickListener(); + setMapStatus(); + } } /** @@ -367,16 +326,16 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti manager.setOnClusterClickListener(new MyClusterManager.OnClusterClickListener() { @Override public boolean onClusterClick(Cluster cluster) { - if(!JqStrUtil.isLogin()){ + if (!JqStrUtil.isLogin()) { startLoginPage(); return false; } Collection collection = cluster.getItems(); - if(collection.size()==1){ - startOtherMainPage(collection.iterator().next().getModel().getUserID()); - }else{ - List mModelList = new ArrayList<>(); - for(MyItem item : collection){ + if (collection.size() == 1) { + startOtherMainPage(collection.iterator().next().getModel().getOtherid()); + } else { + List mModelList = new ArrayList<>(); + for (MyItem item : collection) { mModelList.add(item.getModel()); } startNearByDetailPage(mModelList); @@ -386,46 +345,25 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti }); } + /** + * 跳转登录页 + */ private void startLoginPage() { Intent intent = new Intent(this,LoginActivity.class); startActivity(intent); } - private void startNearByDetailPage(List mList) { + /** + * 点击进入附近人详情页 + * @param mList + */ + private void startNearByDetailPage(List mList) { Intent intent = new Intent(this,NearByListActivity.class); intent.putExtra("title","附近人"); intent.putExtra("list",(Serializable)mList); startActivity(intent); } - /** - * 重新生成尺寸不同的bitmap - * @param resource 原bitmap - * @return - */ - private Bitmap createOptBitmap(Bitmap resource,int w,int h) { - int width = resource.getWidth(); - int height = resource.getHeight(); - float scaleWidth = ((float) w) / width; - float scaleHeight = ((float) h) / height; - Matrix matrix = new Matrix(); - matrix.postScale(scaleWidth, scaleHeight); - return Bitmap.createBitmap(resource, 0, 0, width, height, matrix, true); - } - - /** - * 点击事件 - */ - private void setMakerClickListener() { -// baiduMap.setOnMarkerClickListener(new BaiduMap.OnMarkerClickListener() { -// @Override -// public boolean onMarkerClick(Marker marker) { -// startOtherMainPage(marker); -// return false; -// } -// }); - } - /** * 点击marker进入目标主页 * @param id 点击目标id @@ -436,46 +374,22 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti startActivity(intent); } -// public static class MyItem implements ClusterItem { -// -// private final LatLng mPosition; -// private View avatar; -// private SysRecommendModel model; -// -// public MyItem(LatLng latLng,View view,SysRecommendModel model) { -// mPosition = latLng; -// avatar = view; -// this.model = model; -// } -// -// public SysRecommendModel getModel(){ -// return model; -// } -// -// @Override -// public LatLng getPosition() { -// return mPosition; -// } -// -// @Override -// public BitmapDescriptor getBitmapDescriptor() { -// return BitmapDescriptorFactory.fromView(avatar); -// } -// } - + /** + * 聚合点 + */ public static class MyItem implements ClusterItem { private final LatLng mPosition; - private SysRecommendModel model; + private NearByUserModel.UserListBean model; private Bitmap bitmap; - public MyItem(LatLng latLng,Bitmap view,SysRecommendModel model) { + public MyItem(LatLng latLng,Bitmap view,NearByUserModel.UserListBean model) { mPosition = latLng; this.model = model; bitmap = view; } - public SysRecommendModel getModel(){ + public NearByUserModel.UserListBean getModel(){ return model; } @@ -494,23 +408,6 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti } } - @Override - protected void onDestroy() { - super.onDestroy(); - // 退出时销毁定位 - if (helper != null) { - helper.stopLocate(); - helper = null; - } - clearCache();//释放内存，防止多次发生崩溃 - okHttpUtil.cancelTag(this); - } - - @Override - protected void onPause() { - super.onPause(); - } - /** * 消除内存消耗 */ @@ -521,4 +418,13 @@ public class NearbyMapActivity extends ABaseActivity implements ActionSheet.Acti mList.clear(); MyClusterRenderer.clearList(); } + + @Override + protected void onDestroy() { + super.onDestroy(); + clearCache();//释放内存，防止多次发生崩溃 + handler.removeCallbacksAndMessages(null);//避免handler内存泄漏 + } + + } diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/WelcomeActivity.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/WelcomeActivity.java index 2fda0d50877c23b9ea86b758a722d704647ce479..c2cd035973c6cc748384c7a47ae59c465d3deeb4 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/WelcomeActivity.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/activity/WelcomeActivity.java @@ -8,14 +8,12 @@ import android.text.TextUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baidu.location.BDLocation; import com.jiuqi.elove.R; import com.jiuqi.elove.common.Constant; import com.jiuqi.elove.common.Interface; import com.jiuqi.elove.common.PermissionListener; import com.jiuqi.elove.entity.ChatPersonModel; import com.jiuqi.elove.util.AppPhoneUtil; -import com.jiuqi.elove.util.BdLocationHelper; import com.jiuqi.elove.util.EaseHxHelper; import com.jiuqi.elove.util.OkHttpUtil; import com.jiuqi.elove.util.SpUtils; @@ -36,22 +34,14 @@ public class WelcomeActivity extends ABaseActivity { * 数据 */ private String userId;//用户id - private double latitude;//纬度 - private double longitude;//经度 private String versonCode; - /** - * 工具 - */ - private BdLocationHelper helper;//百度地图工具 - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_welcome,-1,-1,MODE_NONE,HEIGHT_NONE_DARK); getDataFromSp();//从缓存中获取数据 - initLocation();//初始化百度地图定位工具并且申请权限，待用户点击之后进行下一步 + requestPermit();//申请权限，待用户点击之后进行下一步 } /** @@ -147,7 +137,6 @@ public class WelcomeActivity extends ABaseActivity { String rsCode = jsonObject.getString("retcode"); if (Constant.SUCCESS_CODE.equals(rsCode)) { EaseHxHelper.hxLogin(userId);//环信登录 - saveAddress();//保存地址信息到服务器，用于附近人查询 String result = jsonObject.getString("message"); ChatPersonModel model = JSON.parseObject(result, ChatPersonModel.class); saveCurrentUserInfo2Sp(model); @@ -185,48 +174,13 @@ public class WelcomeActivity extends ABaseActivity { SpUtils.setInt(Constant.RED_BEAN,model.getBean()); SpUtils.setInt(Constant.AVATAR_TYPE,model.getAvatartype());//头像状态 } - - /** - * 保存地址 - */ - private void saveAddress() { - String saveAddressUrl = Constant.COMMON_URL + Interface.SAVE_ADDURL; - JSONObject obj = new JSONObject(); - obj.put("lng",longitude); - obj.put("lat",latitude); - obj.put("userID",userId); - obj.put("version",Constant.VERSION); - String param = obj.toJSONString(); - okHttpUtil.sendJsonStrByPostAsync(getApplicationContext(),false,saveAddressUrl, param, new OkHttpUtil.OnGetJsonObject() { - @Override - public void onResponse(JSONObject jsonObject) { - String rsCode = jsonObject.getString("retcode"); - if(Constant.SUCCESS_CODE.equals(rsCode)){ - SpUtils.setString(Constant.LOCATE_LNG,String.valueOf(longitude)); - SpUtils.setString(Constant.LOCATE_LAT,String.valueOf(latitude)); - helper.recycleLocate(); - } - } - },null); - } - /** * 百度地图初始初始化及定位 */ - private void initLocation() { - helper = new BdLocationHelper(this,1000); - helper.registerLocationListener(); - helper.setListener(new BdLocationHelper.onSuccessLocate() { - @Override - public void handle(BDLocation bdLocation) { - latitude = bdLocation.getLatitude(); - longitude = bdLocation.getLongitude(); - } - }); + private void requestPermit() { requestRuntimePermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.RECORD_AUDIO,Manifest.permission.WRITE_EXTERNAL_STORAGE}, new PermissionListener() { @Override public void onGranted() { - helper.startLocate(); init(); } @@ -236,17 +190,4 @@ public class WelcomeActivity extends ABaseActivity { } }); } - - /** - * 在生命周期结束时销毁定位对象 - */ - @Override - protected void onDestroy() { -// 退出时销毁定位 - if (helper != null) { - helper.stopLocate(); -// helper.recycleLocate(); - } - super.onDestroy(); - } } \ No newline at end of file diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/ActPersonAdapter.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/ActPersonAdapter.java deleted file mode 100644 index d38b1f5b95a300185645866ed250ac457d48572a..0000000000000000000000000000000000000000 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/ActPersonAdapter.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jiuqi.elove.adapter; - -import android.content.Context; -import android.content.Intent; -import android.graphics.Bitmap; -import android.support.v4.graphics.drawable.RoundedBitmapDrawable; -import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.BitmapImageViewTarget; -import com.jiuqi.elove.R; -import com.jiuqi.elove.activity.OtherPersonCenterActivity; -import com.jiuqi.elove.entity.ActUserModel; -import com.jiuqi.elove.util.EasyGlide; - -import java.util.ArrayList; -import java.util.List; - -/** - * - * Created by dl on 2017/4/26. - */ -public class ActPersonAdapter extends BaseAdapter{ - - private List mlist = new ArrayList<>(); - private Context context; - private LayoutInflater mInflater; - - public ActPersonAdapter(Context context,List mlist){ - this.mlist = mlist; - this.context = context; - mInflater = LayoutInflater.from(context); - } - @Override - public int getCount() { - return mlist.size(); - } - - @Override - public Object getItem(int position) { - return mlist.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertview, ViewGroup viewGroup) { - final ViewHolder vh; - if(null==convertview){ - vh = new ViewHolder(); - convertview = mInflater.inflate(R.layout.item_act_person,null); - vh.tv_network = (TextView) convertview.findViewById(R.id.tv_network); - vh.tv_nikename = (TextView) convertview.findViewById(R.id.tv_nikename); - vh.iv_avatar = (ImageView) convertview.findViewById(R.id.iv_avatar); - convertview.setTag(vh); - }else{ - vh = (ViewHolder) convertview.getTag(); - } - final ActUserModel model = mlist.get(position); - vh.tv_nikename.setText(model.getUsername()); - EasyGlide.getInstance().showImageCircle(model.getUserface(),vh.iv_avatar); - convertview.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(context, OtherPersonCenterActivity.class); - intent.putExtra("otherid",model.getUser()); - context.startActivity(intent); - } - }); - return convertview; - } - - class ViewHolder{ - TextView tv_network; - TextView tv_nikename; - ImageView iv_avatar; - } -} diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/NearbyUserListAdapter.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/NearbyUserListAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..d94d5dec853b5bc3f747a2c22f1cf36270090678 --- /dev/null +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/NearbyUserListAdapter.java @@ -0,0 +1,146 @@ +package com.jiuqi.elove.adapter; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.jiuqi.elove.R; +import com.jiuqi.elove.common.CommonDataUtil; +import com.jiuqi.elove.common.Constant; +import com.jiuqi.elove.entity.NearByUserModel; +import com.jiuqi.elove.entity.SysRecommendModel; +import com.jiuqi.elove.util.EasyGlide; +import com.jiuqi.elove.util.StrUtil; +import com.jiuqi.elove.util.SupportMultiScreenUtil; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by jq on 2018/3/7. + */ + +public class NearbyUserListAdapter extends RecyclerView.Adapter{ + private List mList; + private Context context; + private String flag; + private int resId; + private ItemClickListener mItemClickListener; + + public void setListener(ItemClickListener mItemClickListener){ + this.mItemClickListener = mItemClickListener; + } + + public interface ItemClickListener{ + + void onItemClick(NearByUserModel.UserListBean model,int position); + + void focus(NearByUserModel.UserListBean model,MyViewHolder holder); + + void talk(NearByUserModel.UserListBean model); + + } + + public NearbyUserListAdapter(Context context,int resId,String flag){ + this.context = context; + this.resId = resId; + this.flag = flag; + mList = new ArrayList<>(); + } + + public void updateListView(List list){ + mList.clear(); + mList.addAll(list); + notifyDataSetChanged(); + } + + + @Override + public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(context).inflate(resId,parent,false); + SupportMultiScreenUtil.scale(view); + return new MyViewHolder(view); + } + + @Override + public void onBindViewHolder(final MyViewHolder holder, final int position) { + final NearByUserModel.UserListBean model = mList.get(position); + EasyGlide.getInstance().showImageCircle(model.getAvatar(),holder.headPhoto); + holder.nikeName.setText(model.getNickname()); + holder.txt_address.setText(StrUtil.returnStr(model.getLocalPlace())); + holder.age_height_degree.setText(StrUtil.returnLinkStr("/",StrUtil.returnEmptyOrUnit(model.getAge(),"岁"), + StrUtil.returnEmptyOrUnit(model.getHeight(),"cm"), + StrUtil.returnStr(CommonDataUtil.degreeMap.get(model.getDegree()),"学历"))); + StrUtil.setContentUn(holder.album_num,model.getDistance()); + //加关注 + final String isLike = model.getIfattention(); + if(Constant.ATTENTION_NOT.equals(isLike)){ + holder.img_focus.setImageResource(R.drawable.icon_focus_gray); + }else{ + holder.img_focus.setImageResource(R.drawable.icon_focus_pink); + } + holder.rlay_focus.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(mItemClickListener!=null){ + mItemClickListener.focus(model,holder); + } + } + }); + holder.rlay_talk.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(mItemClickListener!=null){ + mItemClickListener.talk(model); + } + } + }); + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(mItemClickListener!=null){ + mItemClickListener.onItemClick(model,position); + } + } + }); + } + + @Override + public int getItemCount() { + return mList.isEmpty()?0:mList.size(); + } + + public class MyViewHolder extends RecyclerView.ViewHolder{ + + ImageView headPhoto; + TextView nikeName; + TextView album_num; + TextView age_height_degree; + TextView txt_address; + public TextView leaveMsg; + RelativeLayout rlay_focus; + RelativeLayout rlay_talk; + public ImageView img_focus; + View view; + + public MyViewHolder(View itemView) { + super(itemView); + view = itemView; + headPhoto = (ImageView) itemView.findViewById(R.id.img_avatar); + img_focus = (ImageView) itemView.findViewById(R.id.img_focus); + nikeName = (TextView) itemView.findViewById(R.id.txt_nickname); + album_num = (TextView) itemView.findViewById(R.id.album_num); + age_height_degree = (TextView) itemView.findViewById(R.id.age_height_degree); + txt_address = (TextView) itemView.findViewById(R.id.txt_address); + leaveMsg = (TextView) itemView.findViewById(R.id.txt_focus); + rlay_focus = (RelativeLayout) itemView.findViewById(R.id.rlay_focus); + rlay_talk = (RelativeLayout) itemView.findViewById(R.id.rlay_talk); + } + } + +} diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/RecommendItemAdapter.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/RecommendItemAdapter.java index f13abb3a92a61a966cfc18c065bbcad6d1fc70fc..b8c28f46249299a0be8da576835e531c1c336b16 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/RecommendItemAdapter.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/adapter/RecommendItemAdapter.java @@ -10,6 +10,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.jiuqi.elove.R; +import com.jiuqi.elove.entity.HomePageRecommendModel; import com.jiuqi.elove.entity.RecommendUserInfoModel; import com.jiuqi.elove.util.EasyGlide; import com.jiuqi.elove.util.MyLayoutManager; @@ -25,7 +26,7 @@ public class RecommendItemAdapter extends RecyclerView.Adapter mList; + private List mList; private OnItemClickListener mOnItemClickListener; public void setListener(OnItemClickListener mOnItemClickListener){ @@ -33,7 +34,7 @@ public class RecommendItemAdapter extends RecyclerView.Adapter mList){ + public RecommendItemAdapter(Context context,int layoutId,List mList){ this.context = context; this.layoutId = layoutId; this.mList = mList; @@ -47,7 +48,7 @@ public class RecommendItemAdapter extends RecyclerView.Adapter userList; + + public double getLng() { + return lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public List getUserList() { + return userList; + } + + public void setUserList(List userList) { + this.userList = userList; + } + + public static class UserListBean implements Serializable{ + private String otherid; + private String age; + private String avatar; + private String degree; + private String distance; + private String height; + private String ifattention; + private double lng; + private double lat; + private String localPlace; + private String nickname; + private String dis; + + public String getOtherid() { + return otherid; + } + + public void setOtherid(String otherid) { + this.otherid = otherid; + } + + public String getAge() { + return age; + } + + public void setAge(String age) { + this.age = age; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getDegree() { + return degree; + } + + public void setDegree(String degree) { + this.degree = degree; + } + + public String getDistance() { + return distance; + } + + public void setDistance(String distance) { + this.distance = distance; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getIfattention() { + return ifattention; + } + + public void setIfattention(String ifattention) { + this.ifattention = ifattention; + } + + public double getLng() { + return lng; + } + + public void setLng(double lng) { + this.lng = lng; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public String getLocalPlace() { + return localPlace; + } + + public void setLocalPlace(String localPlace) { + this.localPlace = localPlace; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getDis() { + return dis; + } + + public void setDis(String dis) { + this.dis = dis; + } + } +} diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/ABaseFragment.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/ABaseFragment.java index 44acda671a3ca22501eaadacea5921800d04ada4..bf8cc9b9da7cdf632c33ab5e7a99dc3e72451b74 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/ABaseFragment.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/ABaseFragment.java @@ -4,13 +4,16 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import com.jiuqi.elove.application.EloveApplication; +import com.jiuqi.elove.common.Constant; import com.jiuqi.elove.util.JqStrUtil; import com.jiuqi.elove.util.OkHttpUtil; +import com.jiuqi.elove.util.SpUtils; import com.jiuqi.elove.util.SupportMultiScreenUtil; import butterknife.ButterKnife; @@ -82,4 +85,8 @@ public abstract class ABaseFragment extends Fragment { unbinder.unbind();//解绑 okHttpUtil.cancelTag(getActivity()); } + + protected boolean isLogin(){ + return !TextUtils.isEmpty(SpUtils.getString(Constant.USER_ID)); + } } diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/HomePageFragment.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/HomePageFragment.java index 9704ae30575ef56fabd44abef408ab31269ec0d6..816e4d5ca91a6d0dafd656abf938c36418906a45 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/HomePageFragment.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/fragment/HomePageFragment.java @@ -5,15 +5,14 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -22,6 +21,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jiuqi.elove.R; import com.jiuqi.elove.activity.LoginActivity; @@ -32,6 +32,7 @@ import com.jiuqi.elove.adapter.RecommendItemAdapter; import com.jiuqi.elove.adapter.RvCardAdapter; import com.jiuqi.elove.common.Constant; import com.jiuqi.elove.common.Interface; +import com.jiuqi.elove.entity.HomePageRecommendModel; import com.jiuqi.elove.entity.NotifyModel; import com.jiuqi.elove.entity.RecommendUserInfoModel; import com.jiuqi.elove.util.BitmapUtils; @@ -114,9 +115,9 @@ public class HomePageFragment extends ABaseFragment implements DiscreteScrollVie private String pageNo = "0"; private String pageSize = "10"; private RvCardAdapter cardAdapter; - private OkHttpUtil okHttpUtil = OkHttpUtil.getInstance(); private Bundle fragmentArgs; private NotifyModel model; + private int refreshCount = 0; @Override protected void initView() { @@ -158,6 +159,10 @@ public class HomePageFragment extends ABaseFragment implements DiscreteScrollVie showSquare(); break; case R.id.tv_recommend://推荐页签 + if(!JqStrUtil.isLogin()){ + startLoginPage(); + return; + } showRecommend(); break; } @@ -187,123 +192,172 @@ public class HomePageFragment extends ABaseFragment implements DiscreteScrollVie * 获取匹配列表 */ private void getMatchList() { -// String matchUrl = Constant.COMMON_URL + Interface.RECOMMEND_QGPP; -// JSONObject obj = new JSONObject(); -// obj.put("userid",userId); -// obj.put("version",Constant.VERSION); -// String param = obj.toJSONString(); -// okHttpUtil.sendJsonStrByPostAsync(getActivity(), false, matchUrl, param, new OkHttpUtil.OnGetJsonObject() { -// @Override -// public void onResponse(JSONObject jsonObject) { -// // TODO: 2018/3/2 -// setMatchAdapter(); -// } -// },null); - setMatchAdapter(); + if(!isLogin()){ + setMatchNoDataUi(); + handler.sendEmptyMessage(0x01); + return; + } + String matchUrl = Constant.COMMON_URL + Interface.RECOMMEND_QGPP; + JSONObject obj = new JSONObject(); + obj.put("userid",userId); + obj.put("version",Constant.VERSION); + String param = obj.toJSONString(); + okHttpUtil.sendJsonStrByPostAsync(getActivity(), false, matchUrl, param, new OkHttpUtil.OnGetJsonObject() { + @Override + public void onResponse(JSONObject jsonObject) { + String rsCode = jsonObject.getString("retcode"); + if(Constant.SUCCESS_CODE.equals(rsCode)){ + String result = jsonObject.getString("message"); + List mList = JSONArray.parseArray(result,HomePageRecommendModel.class); + setMatchAdapter(mList); + handler.sendEmptyMessage(0x01); + } + } + },null); } /** * 设置匹配适配器 */ - private void setMatchAdapter() { - List mList = new ArrayList<>(); - for(int i=0;i<3;i++){ - RecommendUserInfoModel model = new RecommendUserInfoModel(); - model.setAvatar("http://img2.imgtn.bdimg.com/it/u=1383521392,1853827024&fm=11&gp=0.jpg"); - model.setNickname("fight2018"); - mList.add(model); + private void setMatchAdapter(List mList) { + if(!mList.isEmpty()){ + tv_no_data_match.setVisibility(View.GONE); + rv_match.setVisibility(View.VISIBLE); + RecommendItemAdapter adapter = new RecommendItemAdapter(getActivity(),R.layout.item_layout_recommend,mList); + rv_match.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.HORIZONTAL,false)); + rv_match.setAdapter(adapter); + adapter.setListener(new RecommendItemAdapter.OnItemClickListener() { + @Override + public void onItemClick(HomePageRecommendModel model) { + startRecommendOtherPage(model); + } + }); + }else{ + setMatchNoDataUi(); } - RecommendItemAdapter adapter = new RecommendItemAdapter(getActivity(),R.layout.item_layout_recommend,mList); - rv_match.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.HORIZONTAL,false)); - rv_match.setAdapter(adapter); - adapter.setListener(new RecommendItemAdapter.OnItemClickListener() { - @Override - public void onItemClick(RecommendUserInfoModel model) { - startOtherPage(model); - } - }); } - + /** + * 设置情感匹配列表为空 + */ + private void setMatchNoDataUi(){ + rv_match.setVisibility(View.GONE); + tv_no_data_match.setVisibility(View.VISIBLE); + } /** * 获取关注列表 */ private void getFocusList() { -// String focusUrl = Constant.COMMON_URL + Interface.RECOMMEND_MMGZ; -// JSONObject obj = new JSONObject(); -// obj.put("userid",userId); -// obj.put("version",Constant.VERSION); -// String param = obj.toJSONString(); -// okHttpUtil.sendJsonStrByPostAsync(getActivity(), false, focusUrl, param, new OkHttpUtil.OnGetJsonObject() { -// @Override -// public void onResponse(JSONObject jsonObject) { -// // TODO: 2018/3/2 -// setFocusAdapter(); -// } -// },null); - setFocusAdapter(); + if(!isLogin()){ + setFocusNoDataUi(); + handler.sendEmptyMessage(0x01); + return; + } + String focusUrl = Constant.COMMON_URL + Interface.RECOMMEND_MMGZ; + JSONObject obj = new JSONObject(); + obj.put("userid",userId); + obj.put("version",Constant.VERSION); + String param = obj.toJSONString(); + okHttpUtil.sendJsonStrByPostAsync(getActivity(), false, focusUrl, param, new OkHttpUtil.OnGetJsonObject() { + @Override + public void onResponse(JSONObject jsonObject) { + String rsCode = jsonObject.getString("retcode"); + String explanation = jsonObject.getString("explanation"); + if(Constant.SUCCESS_CODE.equals(rsCode)){ + String result = jsonObject.getString("message"); + List mList = JSONArray.parseArray(result,HomePageRecommendModel.class); + setFocusAdapter(mList); + handler.sendEmptyMessage(0x01); + }else if(Constant.FAIL_CODE.equals(rsCode)){ + setAddressNoDataUi(); + } + } + },null); } /** * 设置关注列表适配器 */ - private void setFocusAdapter() { - List mList = new ArrayList<>(); - for(int i=0;i<3;i++){ - RecommendUserInfoModel model = new RecommendUserInfoModel(); - model.setAvatar("https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2625236572,2291097099&fm=111&gp=0.jpg"); - model.setNickname("hello2018"); - mList.add(model); + private void setFocusAdapter(List mList) { + if(!mList.isEmpty()){ + rv_focus.setVisibility(View.VISIBLE); + tv_no_data_focus.setVisibility(View.GONE); + RecommendItemAdapter adapter = new RecommendItemAdapter(getActivity(),R.layout.item_layout_recommend,mList); + rv_focus.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.HORIZONTAL,false)); + rv_focus.setAdapter(adapter); + adapter.setListener(new RecommendItemAdapter.OnItemClickListener() { + @Override + public void onItemClick(HomePageRecommendModel model) { + startRecommendOtherPage(model); + } + }); + }else{ + setFocusNoDataUi(); } - RecommendItemAdapter adapter = new RecommendItemAdapter(getActivity(),R.layout.item_layout_recommend,mList); - rv_focus.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.HORIZONTAL,false)); - rv_focus.setAdapter(adapter); - adapter.setListener(new RecommendItemAdapter.OnItemClickListener() { - @Override - public void onItemClick(RecommendUserInfoModel model) { - startOtherPage(model); - } - }); + } + + /** + * 设置关注列表为空 + */ + private void setFocusNoDataUi(){ + rv_focus.setVisibility(View.GONE); + tv_no_data_focus.setVisibility(View.VISIBLE); } /** * 获取地理位置附近的 */ private void getAddressList() { -// String addressUrl = Constant.COMMON_URL + Interface.RECOMMEND_DLQY; -// JSONObject obj = new JSONObject(); -// obj.put("userid",userId); -// obj.put("version",Constant.VERSION); -// String param = obj.toJSONString(); -// okHttpUtil.sendJsonStrByPostAsync(getActivity(), false, addressUrl, param, new OkHttpUtil.OnGetJsonObject() { -// @Override -// public void onResponse(JSONObject jsonObject) { -// // TODO: 2018/3/2 -// setAddressAdapter(); -// } -// },null); - setAddressAdapter(); + if(!isLogin()){ + setAddressNoDataUi(); + handler.sendEmptyMessage(0x01); + return; + } + String addressUrl = Constant.COMMON_URL + Interface.RECOMMEND_DLQY; + JSONObject obj = new JSONObject(); + obj.put("userid",userId); + obj.put("version",Constant.VERSION); + String param = obj.toJSONString(); + okHttpUtil.sendJsonStrByPostAsync(getActivity(), false, addressUrl, param, new OkHttpUtil.OnGetJsonObject() { + @Override + public void onResponse(JSONObject jsonObject) { + String rsCode = jsonObject.getString("retcode"); + if(Constant.SUCCESS_CODE.equals(rsCode)) { + String result = jsonObject.getString("message"); + List mList = JSONArray.parseArray(result, HomePageRecommendModel.class); + setAddressAdapter(mList); + handler.sendEmptyMessage(0x01); + } + } + },null); } /** * 设置地域列表适配器 */ - private void setAddressAdapter() { - List mList = new ArrayList<>(); - for(int i=0;i<3;i++){ - RecommendUserInfoModel model = new RecommendUserInfoModel(); - model.setAvatar("https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1299578473,2006963114&fm=111&gp=0.jpg"); - model.setNickname("goodbye2017"); - mList.add(model); + private void setAddressAdapter(List mList) { + if(!mList.isEmpty()){ + rv_address.setVisibility(View.VISIBLE); + tv_no_data_address.setVisibility(View.GONE); + RecommendItemAdapter adapter = new RecommendItemAdapter(getActivity(),R.layout.item_layout_recommend,mList); + rv_address.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.HORIZONTAL,false)); + rv_address.setAdapter(adapter); + adapter.setListener(new RecommendItemAdapter.OnItemClickListener() { + @Override + public void onItemClick(HomePageRecommendModel model) { + startRecommendOtherPage(model); + } + }); + }else{ + setAddressNoDataUi(); } - RecommendItemAdapter adapter = new RecommendItemAdapter(getActivity(),R.layout.item_layout_recommend,mList); - rv_address.setLayoutManager(new LinearLayoutManager(getActivity(),LinearLayoutManager.HORIZONTAL,false)); - rv_address.setAdapter(adapter); - adapter.setListener(new RecommendItemAdapter.OnItemClickListener() { - @Override - public void onItemClick(RecommendUserInfoModel model) { - startOtherPage(model); - } - }); + } + + /** + * 设置地域列表为空 + */ + private void setAddressNoDataUi(){ + rv_address.setVisibility(View.GONE); + tv_no_data_address.setVisibility(View.VISIBLE); } /** @@ -416,6 +470,20 @@ public class HomePageFragment extends ABaseFragment implements DiscreteScrollVie startActivity(intent); } + /** + * 进入他人主页（广场中的卡片和推荐中的头像点击都可以调用进入他人中心） + * @param model + */ + private void startRecommendOtherPage(HomePageRecommendModel model) { + if(!JqStrUtil.isLogin()){ + startLoginPage(); + return; + } + Intent intent = new Intent(getActivity(), OtherPersonCenterActivity.class); + intent.putExtra("otherid", model.getOtherid()); + startActivity(intent); + } + /** * 从主页页面获取数据,用于判断是否应该展示红点提示有新消息 */ @@ -504,15 +572,24 @@ public class HomePageFragment extends ABaseFragment implements DiscreteScrollVie */ @Override public void onRefresh() { - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - refresh_layout.setRefreshing(false); - } - },5000); + refreshCount = 0; + getRecommendPageList(); } + private Handler handler = new Handler(){ + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + if(msg.what==0x01){ + ++refreshCount; + if(refreshCount==3){ + refresh_layout.setRefreshing(false); + } + } + } + }; + /** * 其他页面调用，主要是用于登录后和退出后 * 登录后根据当前用户性别会刷新出异性列表 @@ -523,5 +600,6 @@ public class HomePageFragment extends ABaseFragment implements DiscreteScrollVie setAdapter(); pageNo = "0"; getRecommendList(); + getRecommendPageList(); } } diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/BitmapUtils.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/BitmapUtils.java index 0c95cb0255d8556c08fa1e91bf5a04484e7a9ace..247419c45a9413439d529c26aac346bb3c0c52da 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/BitmapUtils.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/BitmapUtils.java @@ -3,6 +3,7 @@ package com.jiuqi.elove.util; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Matrix; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -114,6 +115,21 @@ public class BitmapUtils { return bitmap; } + /** + * 重新生成尺寸不同的bitmap + * @param resource 原bitmap + * @return + */ + public static Bitmap createOptBitmap(Bitmap resource,int w,int h) { + int width = resource.getWidth(); + int height = resource.getHeight(); + float scaleWidth = ((float) w) / width; + float scaleHeight = ((float) h) / height; + Matrix matrix = new Matrix(); + matrix.postScale(scaleWidth, scaleHeight); + return Bitmap.createBitmap(resource, 0, 0, width, height, matrix, true); + } + /** * Get bitmap from specified image path * diff --git a/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/EasyGlide.java b/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/EasyGlide.java index 5b2d7ebd56e4cce158f6c30e0265fbd837e4d9c9..30e88efe62cec1a79de4e389e2a7d53503b75953 100644 --- a/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/EasyGlide.java +++ b/JQ_ELOVE/src/main/java/com/jiuqi/elove/util/EasyGlide.java @@ -13,7 +13,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.BitmapImageViewTarget; import com.jiuqi.elove.R; -import com.jiuqi.elove.activity.MyInfoActivity; import com.jiuqi.elove.application.EloveApplication; /** diff --git a/JQ_ELOVE/src/main/res/layout/activity_locate_setting.xml b/JQ_ELOVE/src/main/res/layout/activity_locate_setting.xml index 0cfcf786a04f33b80f3b2cb12ba9439905b7b57c..382639593234939b96372621237cf1ce74a3c013 100644 --- a/JQ_ELOVE/src/main/res/layout/activity_locate_setting.xml +++ b/JQ_ELOVE/src/main/res/layout/activity_locate_setting.xml @@ -61,6 +61,7 @@ style="@style/text_black_medium"/> diff --git a/JQ_ELOVE/src/main/res/layout/activity_mina_long_connect.xml b/JQ_ELOVE/src/main/res/layout/activity_mina_long_connect.xml deleted file mode 100644 index 41b3993be0a59db8e964bc86e1a3f6a57213fa24..0000000000000000000000000000000000000000 --- a/JQ_ELOVE/src/main/res/layout/activity_mina_long_connect.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/JQ_ELOVE/src/main/res/layout/fragment_homepage_layout_new.xml b/JQ_ELOVE/src/main/res/layout/fragment_homepage_layout_new.xml index 0200d5f64ae57f1a860343af7b6ea96b88c11a3e..4d3d51ffb23b3d4cf40ebb5ad5cbc27c0fb74481 100644 --- a/JQ_ELOVE/src/main/res/layout/fragment_homepage_layout_new.xml +++ b/JQ_ELOVE/src/main/res/layout/fragment_homepage_layout_new.xml @@ -12,7 +12,7 @@ android:background="@android:color/transparent"/> @@ -36,8 +36,8 @@ android:layout_marginEnd="@dimen/dimen30"> + style="@style/text_theme_color_title_large" /> + style="@style/text_theme_color_title_large" /> - - - - - \ No newline at end of file diff --git a/JQ_ELOVE/src/main/res/values/styles.xml b/JQ_ELOVE/src/main/res/values/styles.xml index 7a04510b0e62ad8440a2d4dacc0004796cf7ffcf..a062735a96da9de47f3fe228978f057e40909df7 100644 --- a/JQ_ELOVE/src/main/res/values/styles.xml +++ b/JQ_ELOVE/src/main/res/values/styles.xml @@ -268,6 +268,11 @@ @color/colorAccent + + - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hi/values-hi.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hi/values-hi.xml deleted file mode 100644 index 89057c403b98f317f2341b60af6e8b01dab5e7ee..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hi/values-hi.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "मुख्यपृष्ठ पर नेविगेट करें" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "ऊपर नेविगेट करें" - "अधिक विकल्प" - "पूर्ण" - "सभी देखें" - "कोई एप्‍लिकेशन चुनें" - "बंद" - "चालू" - "खोजा जा रहा है…" - "क्‍वेरी साफ़ करें" - "खोज क्वेरी" - "खोजें" - "क्वेरी सबमिट करें" - "ध्वनि खोज" - "इसके द्वारा साझा करें" - "%s के साथ साझा करें" - "संक्षिप्त करें" - "खोज" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hr/values-hr.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hr/values-hr.xml deleted file mode 100644 index ca0de20661fee7f8fbdb1c94174edf3fc61dbb11..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hr/values-hr.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Idi na početnu" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Idi gore" - "Dodatne opcije" - "Gotovo" - "Prikaži sve" - "Odabir aplikacije" - "ISKLJUČENO" - "UKLJUČENO" - "Pretražite…" - "Izbriši upit" - "Upit za pretraživanje" - "Pretraživanje" - "Pošalji upit" - "Glasovno pretraživanje" - "Dijeljenje sa" - "Dijeljenje sa: %s" - "Sažmi" - "Pretraživanje" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hu/values-hu.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hu/values-hu.xml deleted file mode 100644 index b2ebff5076687bffd9210d7643c43f626101e489..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hu/values-hu.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Ugrás a főoldalra" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Felfelé mozgatás" - "További lehetőségek" - "Kész" - "Összes megtekintése" - "Válasszon ki egy alkalmazást" - "KI" - "BE" - "Keresés…" - "Lekérdezés törlése" - "Keresési lekérdezés" - "Keresés" - "Lekérdezés küldése" - "Hangalapú keresés" - "Megosztás a következővel:" - "Megosztás a következővel: %s" - "Összecsukás" - "Keresés" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hy-rAM/values-hy-rAM.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hy-rAM/values-hy-rAM.xml deleted file mode 100644 index ffaeec02c5c5a8e3a77247159ffacb8d8402d8c4..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-hy-rAM/values-hy-rAM.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Ուղղվել տուն" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Ուղղվել վերև" - "Այլ ընտրանքներ" - "Պատրաստ է" - "Տեսնել բոլորը" - "Ընտրել ծրագիր" - "ԱՆՋԱՏՎԱԾ" - "ՄԻԱՑՎԱԾ" - "Որոնում..." - "Մաքրել հարցումը" - "Որոնման հարցում" - "Որոնել" - "Ուղարկել հարցումը" - "Ձայնային որոնում" - "Կիսվել" - "Կիսվել %s-ի միջոցով" - "Թաքցնել" - "Որոնել" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-in/values-in.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-in/values-in.xml deleted file mode 100644 index 1d32fa19ffc32236f91003dfd7797d443557b52b..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-in/values-in.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Navigasi ke beranda" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Navigasi naik" - "Opsi lain" - "Selesai" - "Lihat semua" - "Pilih aplikasi" - "NONAKTIF" - "AKTIF" - "Telusuri..." - "Hapus kueri" - "Kueri penelusuran" - "Telusuri" - "Kirim kueri" - "Penelusuran suara" - "Bagikan dengan" - "Bagikan dengan %s" - "Ciutkan" - "Telusuri" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-is-rIS/values-is-rIS.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-is-rIS/values-is-rIS.xml deleted file mode 100644 index 6cd2b46626020a5efb0e08fedf29c57fc678415b..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-is-rIS/values-is-rIS.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Fara heim" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Fara upp" - "Fleiri valkostir" - "Lokið" - "Sjá allt" - "Veldu forrit" - "SLÖKKT" - "KVEIKT" - "Leita…" - "Hreinsa fyrirspurn" - "Leitarfyrirspurn" - "Leita" - "Senda fyrirspurn" - "Raddleit" - "Deila með" - "Deila með %s" - "Minnka" - "Leita" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-it/values-it.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-it/values-it.xml deleted file mode 100644 index 103f40d92199f596274d971c19f83af74ca64725..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-it/values-it.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Vai alla home page" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Vai in alto" - "Altre opzioni" - "Fine" - "Visualizza tutte" - "Scegli un\'applicazione" - "OFF" - "ON" - "Cerca…" - "Cancella query" - "Query di ricerca" - "Cerca" - "Invia query" - "Ricerca vocale" - "Condividi con" - "Condividi con %s" - "Comprimi" - "Ricerca" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-iw/values-iw.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-iw/values-iw.xml deleted file mode 100644 index 1ca9be604ace8d5b0aa034f8f0d41b055d1f1f8c..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-iw/values-iw.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "נווט לדף הבית" - "‏%1$s‏, %2$s" - "‏%1$s‏, %2$s‏, %3$s" - "נווט למעלה" - "עוד אפשרויות" - "בוצע" - "ראה הכל" - "בחר אפליקציה" - "כבוי" - "פועל" - "חפש…" - "מחק שאילתה" - "שאילתת חיפוש" - "חפש" - "שלח שאילתה" - "חיפוש קולי" - "שתף עם" - "‏שתף עם %s" - "כווץ" - "חפש" - "‎999+‎" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ja/values-ja.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ja/values-ja.xml deleted file mode 100644 index dc08b9f101e10ba1b44dccd8d5d87cf31e011e42..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ja/values-ja.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "ホームへ移動" - "%1$s、%2$s" - "%1$s、%2$s、%3$s" - "上へ移動" - "その他のオプション" - "完了" - "すべて表示" - "アプリの選択" - "OFF" - "ON" - "検索…" - "検索キーワードを削除" - "検索キーワード" - "検索" - "検索キーワードを送信" - "音声検索" - "共有" - "%sと共有" - "折りたたむ" - "検索" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ka-rGE/values-ka-rGE.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ka-rGE/values-ka-rGE.xml deleted file mode 100644 index 3f321189d390da4ecd9772ed9ccc36e5e7c531b4..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ka-rGE/values-ka-rGE.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "მთავარზე ნავიგაცია" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "ზემოთ ნავიგაცია" - "მეტი ვარიანტები" - "დასრულდა" - "ყველას ნახვა" - "აპის არჩევა" - "გამორთულია" - "ჩართულია" - "ძიება..." - "მოთხოვნის გასუფთავება" - "ძიების მოთხოვნა" - "ძიება" - "მოთხოვნის გადაგზავნა" - "ხმოვანი ძიება" - "გაზიარება:" - "%s-თან გაზიარება" - "აკეცვა" - "ძიება" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-kk-rKZ/values-kk-rKZ.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-kk-rKZ/values-kk-rKZ.xml deleted file mode 100644 index a00d111a3e5ec49e15a90784080a5b9c4ea226be..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-kk-rKZ/values-kk-rKZ.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Негізгі бетте қозғалу" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Жоғары қозғалу" - "Басқа опциялар" - "Дайын" - "Барлығын көру" - "Қолданбаны таңдау" - "ӨШІРУЛІ" - "ҚОСУЛЫ" - "Іздеу…" - "Сұрақты жою" - "Сұрақты іздеу" - "Іздеу" - "Сұрақты жіберу" - "Дауыс арқылы іздеу" - "Бөлісу" - "%s бөлісу" - "Тасалау" - "Іздеу" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-km-rKH/values-km-rKH.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-km-rKH/values-km-rKH.xml deleted file mode 100644 index a2dd37a14ed76793791b17c95a6073b130ed83b6..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-km-rKH/values-km-rKH.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "រកមើល​ទៅ​ដើម" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "រកមើល​ឡើងលើ" - "ជម្រើស​ច្រើន​ទៀត" - "រួចរាល់" - "មើល​ទាំងអស់" - "ជ្រើស​កម្មវិធី​​" - "បិទ" - "បើក" - "ស្វែងរក…" - "សម្អាត​សំណួរ" - "ស្វែងរក​សំណួរ" - "ស្វែងរក" - "ដាក់​​​ស្នើ​សំណួរ" - "ការស្វែងរក​សំឡេង" - "ចែករំលែក​ជាមួយ" - "ចែករំលែក​ជាមួយ %s" - "បង្រួម" - "ស្វែងរក" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-kn-rIN/values-kn-rIN.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-kn-rIN/values-kn-rIN.xml deleted file mode 100644 index 99cdffd61b6791f3bb08cc20800054576dc9603d..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-kn-rIN/values-kn-rIN.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ" - "ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು" - "ಮುಗಿದಿದೆ" - "ಎಲ್ಲವನ್ನೂ ನೋಡಿ" - "ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ" - "ಆಫ್" - "ಆನ್" - "ಹುಡುಕಿ…" - "ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು" - "ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ" - "ಹುಡುಕಿ" - "ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು" - "ಧ್ವನಿ ಹುಡುಕಾಟ" - "ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ" - "%s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ" - "ಸಂಕುಚಿಸು" - "ಹುಡುಕಿ" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ko/values-ko.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ko/values-ko.xml deleted file mode 100644 index ca986305861b720006c554b73a81c20aecea08bc..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ko/values-ko.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "홈 탐색" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "위로 탐색" - "옵션 더보기" - "완료" - "전체 보기" - "앱 선택" - "사용 안함" - "사용" - "검색..." - "검색어 삭제" - "검색어" - "검색" - "검색어 보내기" - "음성 검색" - "공유 대상" - "%s와(과) 공유" - "접기" - "검색" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ky-rKG/values-ky-rKG.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ky-rKG/values-ky-rKG.xml deleted file mode 100644 index 2493032a11c8d91bd39ca64d0d71a70c4b8a5277..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-ky-rKG/values-ky-rKG.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Үйгө багыттоо" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Жогору" - "Көбүрөөк мүмкүнчүлүктөр" - "Даяр" - "Бардыгын көрүү" - "Колдонмо тандоо" - "ӨЧҮК" - "КҮЙҮК" - "Издөө…" - "Талаптарды тазалоо" - "Издөө талаптары" - "Издөө" - "Талап жөнөтүү" - "Үн аркылуу издөө" - "Бөлүшүү" - "%s аркылуу бөлүшүү" - "Жыйнап коюу" - "Издөө" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-land/values-land.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-land/values-land.xml deleted file mode 100644 index b337bad0d9b2d4f98be3b375ee7051c0cc433bde..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-land/values-land.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 48dp - 32dp - 12dp - 14dp - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-large-v4/values-large-v4.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-large-v4/values-large-v4.xml deleted file mode 100644 index cc236ebd9c9bfc4d57f8e5eb3ce5f16c233569ec..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-large-v4/values-large-v4.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 440dp - 60% - 90% - 60% - 90% - 55% - 80% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v18/values-v18.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v18/values-v18.xml deleted file mode 100644 index 7dad77f9e2733e7725120ce7201d2728040504a2..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v18/values-v18.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 0px - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v21/values-v21.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v21/values-v21.xml deleted file mode 100644 index 20d055200bddc1e8323864c22373da95a7dfccb7..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v21/values-v21.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - @color/secondary_text_default_material_light - 0dp - 0dp - 12dp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v22/values-v22.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v22/values-v22.xml deleted file mode 100644 index d4a514a5fb6ac2cd17eeb996c4714307b1761750..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v22/values-v22.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v23/values-v23.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v23/values-v23.xml deleted file mode 100644 index d807aaeeb4544c07784154e6af50ffcb48fcfc77..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-v23/values-v23.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-vi/values-vi.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-vi/values-vi.xml deleted file mode 100644 index 5bf19364c828eeb8ceef41ed7b3358d4e0be0efd..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-vi/values-vi.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Điều hướng về trang chủ" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Điều hướng lên trên" - "Thêm tùy chọn" - "Xong" - "Xem tất cả" - "Chọn một ứng dụng" - "TẮT" - "BẬT" - "Tìm kiếm…" - "Xóa truy vấn" - "Tìm kiếm truy vấn" - "Tìm kiếm" - "Gửi truy vấn" - "Tìm kiếm bằng giọng nói" - "Chia sẻ với" - "Chia sẻ với %s" - "Thu gọn" - "Tìm kiếm" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-xlarge-v4/values-xlarge-v4.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-xlarge-v4/values-xlarge-v4.xml deleted file mode 100644 index b499d2cf3729a0b92b869da97322e3cb7fc544c2..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-xlarge-v4/values-xlarge-v4.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 60% - 90% - 50% - 70% - 45% - 72% - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rCN/values-zh-rCN.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index 3c76829365c38e3b01355f3db022d8e6432747c7..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "转到主屏幕" - "%1$s：%2$s" - "%1$s - %2$s：%3$s" - "转到上一层级" - "更多选项" - "完成" - "查看全部" - "选择应用" - "关闭" - "开启" - "搜索…" - "清除查询" - "搜索查询" - "搜索" - "提交查询" - "语音搜索" - "分享方式" - "通过%s分享" - "收起" - "搜索" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rHK/values-zh-rHK.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rHK/values-zh-rHK.xml deleted file mode 100644 index ce0a0d37c9dbeea7b48ee0bbffabafc28aa98f95..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rHK/values-zh-rHK.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "瀏覽主頁" - "%1$s：%2$s" - "%1$s (%2$s)：%3$s" - "向上瀏覽" - "更多選項" - "完成" - "顯示全部" - "選擇應用程式" - "關閉" - "開啟" - "搜尋…" - "清除查詢" - "搜尋查詢" - "搜尋" - "提交查詢" - "語音搜尋" - "分享對象" - "與「%s」分享" - "收合" - "搜尋" - "999 +" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rTW/values-zh-rTW.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 4d7b05bdd723c613b28abfb09c89c0ac1b81ae26..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "瀏覽首頁" - "%1$s：%2$s" - "%1$s - %2$s：%3$s" - "向上瀏覽" - "更多選項" - "完成" - "查看全部" - "選擇應用程式" - "關閉" - "開啟" - "搜尋…" - "清除查詢" - "搜尋查詢" - "搜尋" - "提交查詢" - "語音搜尋" - "選擇分享對象" - "與「%s」分享" - "收合" - "搜尋" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zu/values-zu.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zu/values-zu.xml deleted file mode 100644 index 679d22f5ece288edaad936f55a7be770a57e4818..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values-zu/values-zu.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - "Zulazulela ekhaya" - "%1$s, %2$s" - "%1$s, %2$s, %3$s" - "Zulazulela phezulu" - "Izinketho eziningi" - "Kwenziwe" - "Buka konke" - "Khetha uhlelo lokusebenza" - "VALIWE" - "VULIWE" - "Iyasesha..." - "Sula inkinga" - "Umbuzo wosesho" - "Sesha" - "Hambisa umbuzo" - "Ukusesha ngezwi" - "Yabelana no-" - "Yabelana no-%s" - "Goqa" - "Sesha" - "999+" - \ No newline at end of file diff --git a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values/values.xml b/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values/values.xml deleted file mode 100644 index 503dffdc79e8158888a636c186536f4c769c552b..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/res/values/values.xml +++ /dev/null @@ -1,1735 +0,0 @@ - - - - - - - true - true - true - true - false - @android:color/black - #7fa87f - @android:color/black - @android:color/black - @color/material_deep_teal_200 - @color/material_deep_teal_500 - @color/material_grey_800 - @android:color/white - @color/material_grey_850 - @color/material_grey_50 - #80ffffff - #80000000 - @color/bright_foreground_material_light - @color/bright_foreground_material_dark - @android:color/white - @android:color/black - #ff5a595b - #ffd6d7d7 - #80bebebe - #80323232 - #ffbebebe - #ff323232 - @android:color/white - @android:color/black - #6680cbc4 - #66009688 - #ff37474f - #ff263238 - #ff21272b - #ff80cbc4 - #ff009688 - #fff5f5f5 - #ffe0e0e0 - #fffafafa - #ff757575 - #ff424242 - #ff303030 - #ff212121 - #ffffffff - #ff9e9e9e - #ff424242 - @android:color/black - @color/material_grey_600 - @color/material_grey_900 - @color/material_grey_100 - #ffffffff - #de000000 - #4Dffffff - #39000000 - #33ffffff - #1f000000 - #b3ffffff - #8a000000 - #36ffffff - #24000000 - #ff616161 - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 16dp - 72dp - 56dp - 0dp - 0dp - 4dp - 16dp - 10dp - 6dp - 40dp - 48dp - 180dp - 5dp - -3dp - 48dp - 48dp - 36dp - 48dp - @dimen/abc_control_inset_material - 6dp - 8dp - @dimen/abc_control_padding_material - 720dp - 320dp - 2dp - 4dp - 4dp - 80% - 100% - 320dp - 320dp - 8dp - 8dp - 65% - 95% - 24dp - 18dp - 8dp - 0.30 - 0.26 - 32dip - 8dip - 8dip - 7dp - 4dp - 10dp - 16dp - @dimen/abc_action_bar_content_inset_material - 296dp - 4dp - 48dip - 320dip - 2dp - 2dp - 20dp - 3dp - 14sp - 14sp - 14sp - 12sp - 34sp - 45sp - 56sp - 112sp - 24sp - 22sp - 18sp - 14sp - 16sp - 14sp - 16sp - 16dp - 20sp - 20dp - 0.30 - 0.26 - 0.26 - 0.20 - 0.12 - 0.50 - 0.38 - 0.70 - 0.54 - 32dp - 13sp - 12dp - 8dp - 64dp - 64dp - 10dp - @dimen/notification_content_margin_start - 16dp - 2dp - 3dp - 24dp - 13sp - 10dp - 5dp - #3333B5E5 - #0cffffff - - - - - - - - - - 220 - 150 - 127 - 999 - Navigate home - %1$s, %2$s - %1$s, %2$s, %3$s - Navigate up - More options - Done - See all - Choose an app - OFF - ON - sans-serif - sans-serif-medium - sans-serif-medium - sans-serif - sans-serif - sans-serif - sans-serif - sans-serif-light - sans-serif - sans-serif - sans-serif - sans-serif-medium - Search… - Clear query - Search query - Search - Submit query - Voice search - Share with - Share with %s - Collapse - Search - 999+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #FF000000Failed to move to the blacklist, please check the network or try again laterThe call was refusedDelete conversation and messagesDeliveredRefreshing group listFailed to acceptCreating the groupRequest add buddy failure:#1AffffffAllow chatroom owner leaveOKFailed to join the groupCapture25dpChat roomClear all conversations？#b5b5b6Accepted your requestCan not find this group#0066FFCurrent versionDid not download:Group name[Voice]#46678d#bababaSaveChat settingsNickNameupdate nickname fail!Logoff notification#fcfcfcLogon failure: failed to retrieve contacts or groupsRecord videoCancel[Voice call]#4ebcd3[%1$s location]Group chatNo Support!#f7f8f8Failed to retrieve, please check the network or try again laterCreate new group16dpHold to talkVoice callThe request was sent and waiting for owner approvalNetwork is not available, please check the network!update photo#763cd3Refreshing contact list"Please set the current user's nickname \ n to ios offline push not userid but Nick, see comments"Clear all messages?Connection failed!#d33f3fApply to join the groupUpload the logNot setFailed to upload the logRegistering..Download the pictures:Shake#00acffRemove from blacklist#2D2F31Video call#161718Currently the video size greater than 10M is not supported!Password cannot be empty!AddDismiss groupRefusedTask PhotoFailed to exit the group:Hands freeLet me to be your friend!The peer is on the phone#000User already existed!Not connect to server, please try again later[Dynamic expression]Exit the group#F6EBE6Not connect to serverVersion number is wrong"SD card does not exist, can't take pictures"logining..LoginRemovingNot yet downloadedCancelDelete voiceSend failedaddedAdd public groupYou got a friend requestDeleteDownloading the voice message, click laterThe peer did not answerNew message notificationDelete the contactClearing messagesMove into the blacklistThe network is not available100dpSelect the contactFailed to delete Invite you to join this groupSearchupdate photo fail!Group IDThe group will be dismissed after exitingOnce this nick is set, this nick will be used in push notification (by default this is HuanXin ID ) when the receiver is using the IOS device.Send voice need sdcard supportDelete videoJoin public group"Can't find pictures"Remove group of shielding failure, please check the network or try again later#b5b5b6Emoticonupdate nickname success!Group chat#2dafa3#1e90ffAdd friendsRecording without permission#00acffReceive cmd message : action：Address book46dp16dpThe same account was loggedin in other deviceCopy messageupdate nicknameCopyLocal UploadLocationMove to the blacklist?MuteClear conversationInconsistent password, please enter again!#c0c0c010dpThe peer is not onlineMove into blacklist failureFinger release to cancel sendingRemove the notificationThe peer is busy now, please try laterGroup profileHang upConversationConfirm passwordDownloading the file, please try again laterLogout will never clear the chat history, this account can be used on next loginupdate photo success!The group messages will not be received after exiting the groupThe group ownerPublic groupSendRegistration failed, without permission!5dpFailed to load data, please check network or try again later#333333Modifying the group name..Robot chatCannot connect to serverConnecting to peer..The current network is not available, please check the network SettingsThe recording failure, please try again！Deleting..LogoutJoin the groupFinger up to cancel sendingChange group name#ffff4444Uploading the log - - - - CancelThe network connection is not available, please check the networkConfirm to forward to：%1$s ?User namecall duration[expression]1dpThe group does not existThe recording time is too shortcannot chat with yourselfIOS offline push nickIs publicSearchJoin the groupRelayClear conversation?Hanging up..Moving to blacklist..Exiting groupSearch public groupHave you removed from his buddy listFailed to download file:Create new groupAdd a button was clickedYou already were not in the groupCall was refusedAccepting#B6DA53#666667 - - - Downloading video, please try again later59dpFailed to create groupsOpen the equipment failure!Use speakerVoiceLogin failed:Failed to get group information:Be removingYou have been kicked off from the group#ff99cc00Black list#6FCD78Unable to connect to the serverThe peer did not answerIllegal user nameRefusedSettingsSelect the contactnick cannot be empty![Picture]#666667searchingBusiness card#88d8d8d8did not answerReceiving a new messageVideo"Can't add myself"The message content is not allowed to be sent!OKMoving to blacklistThis user has been removedCannot delete myselfSetting nicknamePromptNetwork errorMove into blacklist successRegistration failed:ResendAnswerInput a new nickPlease enter a usernameBlack listBlack listno more messageswaiting...#ffffffThe location information#68C270peoplekey validation error!Please on AndroidManifest.xml file check the key setForwardThe peer has ended the call#ffffffClear all messages?Upload PhotoBriefMaking sure your location..Apply to joinSettingsBlock messageSave new nicknameDownload the pictures: 0%Search failedAcceptedInvitation and notificationRemoved failYou were montioned#ffffffBackGroup of shielding failure, please check the network or try again laterSending the request..Please check the network or try again laterBlocking the group..Unable to get to your location information!FileFailed to change the group name, please check the network or try again laterThe current group has been dismissed[Video]#ffffbb33Already downloadedLog was uploaded successfullyAllow members to inviteDiagnose48dp5dp#00acff#DA5A4D#D9D9D9Registered successfully12dpAdd membersThe file is not greater than 10 mConfirm to resend？#80000000#FFA500Request was sent, waiting for the peer to accept#e8e8e8In the call..5dpDelete messageDirect10dpUser name cannot be empty!This user is already your friendDelete conversationAdd group members fail:Move this member to group blacklist?The delete button is clickedPasswordThe video to startSave#2d2f31[file]SearchUser ProfileSend the following pictures?148dp2dpГолосовой вызовНе скачано:Описание чата[Голосовой вызов][Изображение]АдминистраторСмайлыПоискЗагрузить эксплуатационный журналИнформация о местоположенииДобавитьПослатьИмя пользователяВы уверены, что Вы хотите переслать：%1$s ?СохранитьУдалить сообщениеИдет обновление контактовПереданныеВибрацияПожалуйста подождите, видео загружается...ГромкостьПарольСеть недоступнаИмя чатаИнформация о чатеПубличный чатВыйтиВы уверены, что хотите очистить все записи?УдерживайтеСоздать чатОтправить повторноОтветитьКопировать сообщениеНе получать сообщения при выходе из приложенияСделать фотоПровести вверх для отмены отправкиВыбрать контактное лицоУдалить голосовое сообщениеЧерный списокСохранитьРаспустить чат[Документ]Чат:Ошибка соединения, пожалуйста, проверьте Ваше соединение с интернетом.ДокументКопироватьДобавить контактыПрисоединиться к обсуждениюПереслатьРаспускать чат при выходе из приложенияЧат[Местоположение%1$][Видео]КонтактыЧерный списокИзображениеВы уверены, что хотите отправить сообщение еще раз?СогласенСоздать чатОписаниеНайтиНастройкиСделать его публичным?Выйти из чатаРегистрацияБлокировать сообщения чатаОтпустить палец для отмены отправкиЧерный списокПосылать уведомление при получении сообщенияУдалить видеоУдалитьОшибка соединения с серверомУведомление о новом сообщенииБесконтактное управлениеСохранять записи при выходе из приложения, для возвращения использовать ту же уч.записьПоискМестоположениеПрочитанныеИдет загрузкаБез звукаНастройки диалога[Мое местоположение]Очистить историю чатаСделать приглашение в чат свободнымДокумент загружается, пожалуйста подождите...ВыйтиВыйтиПожалуйста, введите имя пользователяДанный пользователь был удаленДиагностированиеОтправитьСделать видеоВойтиПодтвердить парольОшибка при передаче сообщения,Настройки не указаныСделать запись не удалось, пожалуйста, попробуйте еще раз!Очистить записиПожалуйста, проверьте соединение с интернетом либо попробуйте еще раз позжеВизитная карточкаИспользовать динамик при воспроизведении сообщенияЗаявки и уведомленияНастройкиДиалогОповещенияНазадОтменаПредыдущая версияЗавершитьВыбрать контактное лицоВ данный момент эта уч.запись используется другим устройством64dp2dp198dp不能和自己聊天聊天设置通话中...对方拒绝接受！...[文件]查找[我的位置]正在挂断..不能删除自己保存对方已拒绝正在解散群聊...下载图片: 0%对方不在线，请稍后再拨...此用户已是你的好友是否公开复制正在搜索..环信小助手删除联系人确认将此成员加入至此群黑名单?更新联系人列表已同意移入到黑名单选择联系人正在退出群聊...拍照上传正在移除...正在注册...添加上传日志中来自群组:更新联系人列表失败注册失败:挂断拍摄录像本地上传请求添加好友失败:删除会话和消息暂不支持！名片群聊资料取消录音时间太短正在移出...聊天室正在刷新联系人震动不能连接到服务器通讯录黑名单正在添加...是否发送？正在同意...添加成员[语音]更新头像失败!用户已存在！退出后，此群将被解散送达获取群聊信息失败:更新头像成功!按住说话退出群聊失败:您已被封禁设置发送以下图片？SD卡不存在，不能拍照[动态表情]更新昵称失败!正在下载文件请稍后加个好友呗修改群名称成功屏蔽群消息版本号错误群主[图片]正在修改群名称...群聊名称请求加入复制消息确认重发该信息？拍照正在登录...登录打开设备失败!文件不能大于10M尚未连接至服务器你发送了不合法的消息内容正在刷新群列表免提移入黑名单失败更新昵称正在下载视频请稍候退出后不会删除任何历史数据，下次登录依然可以使用本账号尚未连接至服务器，请稍后重试正在退出登录..两次输入的密码不一致，请重新输入!返回密码添加群成员失败:创建群组失败: 允许聊天室群主离开同意录音失败，请重试！表情注册失败，无权限！图片保存发送请求成功，等待群主同意声音删除视频key 验证出错! 请在 AndroidManifest.xml 文件中检查 key 设置通讯录请求加你为好友已同意你的好友请求删除上传头像同意失败:[语音通话]退出群聊是否清空所有聊天记录诊断正在创建群聊...发送移入黑名单成功对方未接听退出登录下载文件失败:设置确认密码搜索失败已取消保存注册删除消息黑名单列表连接不到聊天服务器将在后台获取好友和群聊列表...发送失败，请检测服务器是否连接删除失败:Relay[视频通话]加载数据失败，请检查网络或稍后重试确定转发到：%1$s ?已经和对方建立连接，等待对方接受...位置更新昵称成功!获取失败,请检查网络或稍后再试松开手指，取消发送发送语音需要sdcard支持位置信息通话时长找不到这个群组正在屏蔽群组...无法获取到您的位置信息!新建聊天下载图片:加入群聊成功退出网络不可用已拒绝[%1$s的位置]更新头像添加好友搜索公开群注册成功不能添加自己添加聊天室群ID用户名不合法视频通话没有更多的消息了Direct搜索添加公开群手指上滑，取消发送加入群聊失败:你已经不在此群了用户名确定[视频]当前版本转发更新黑名单失败退出登录登录失败: 获取好友或群聊失败找不到图片请检查网络或稍候重试删除会话简介[有人@我]已拒绝暂不支持大于10M的视频！选择联系人同意了你的群聊申请对方未接听此用户已被移除接听同一帐号已在其他设备登录使用扬声器播放语音移除通知确认密码不能为空!对方正在通话中移入黑名单失败,请检查网络或稍后重试已读正在确定你的位置...对方正在通话中，请稍后再拨重发对方不在线录像开始[表情]正在移入黑名单.../200人上传运行日志未下载:移出失败正在发送请求...静音黑名单发送消息失败,允许群成员邀请其他人是否清空所有聊天记录？个人资料搜群聊简介确定清空此群的聊天记录吗？网络出错更新群聊请等待...接收新消息通知解散群聊失败:确定解除群屏蔽失败，请检查网络或稍后重试群聊:删除语音当前群聊已被群创建者解散昵称不能为空！删除按钮被点击视频群组不存在录制视频退出后，将不再接收此群聊信息请输入用户名文件不存在正在移入至黑名单移入到黑名单？公开的群聊修改群名称正在下载语音，稍后点击未设置未接听对方已经挂断清空聊天记录解散群聊无录音权限新消息提醒用户名不能为空！已把你从他好友列表里移除连接建立失败！...昵称收到透传：action：会话日志上传成功正在解除屏蔽...添加按钮被点击设置此昵称以后，在与iOS客户端demo聊天过程中，iOS一侧会显示此昵称而不是环信ID，如果对方使用安卓客户端则此设置不生效log上传失败设置当前用户的昵称\n用于ios离线推送时显示用户昵称登录失败:新建群组改变群名称失败，请检查网络或稍后重试当前网络不可用，请检查网络设置未下载加入群聊已下载取消移出黑名单清空记录发送请求成功,等待对方验证群组名称不能为空正在连接对方...设置昵称从服务器下载群聊信息文件iOS离线推送昵称网络异常，请检查网络！下线通知正在删除...更新黑名单取消输入新昵称网络连接不可用，请检查网络搜申请加入群：群屏蔽失败，聊天服务器异常处理中，请稍后重试申请与通知语音电话你被群创建者从此群中移除密码不能为空！提示邀请你加入了群聊正在清空群消息...更新群聊失败 + 148dp2dpГолосовой вызовНе скачано:[Голосовой вызов]Описание чата[Изображение]СмайлыПоискАдминистраторЗагрузить эксплуатационный журналИнформация о местоположенииПослатьДобавитьИмя пользователяВы уверены, что Вы хотите переслать：%1$s ?СохранитьУдалить сообщениеИдет обновление контактовПереданныеВибрацияПожалуйста подождите, видео загружается...ГромкостьПарольСеть недоступнаИмя чатаИнформация о чатеВыйтиПубличный чатВы уверены, что хотите очистить все записи?УдерживайтеСоздать чатОтправить повторноКопировать сообщениеОтветитьНе получать сообщения при выходе из приложенияСделать фотоПровести вверх для отмены отправкиВыбрать контактное лицоУдалить голосовое сообщениеСохранитьЧерный список[Документ]Распустить чатОшибка соединения, пожалуйста, проверьте Ваше соединение с интернетом.Чат:ДокументКопироватьДобавить контактыПрисоединиться к обсуждениюПереслать[Местоположение%1$][Видео]Распускать чат при выходе из приложенияЧатЧерный списокКонтактыИзображениеВы уверены, что хотите отправить сообщение еще раз?СогласенСоздать чатНайтиНастройкиОписаниеСделать его публичным?РегистрацияВыйти из чатаОтпустить палец для отмены отправкиБлокировать сообщения чатаЧерный списокПосылать уведомление при получении сообщенияУдалить видеоУдалитьОшибка соединения с серверомУведомление о новом сообщенииБесконтактное управлениеСохранять записи при выходе из приложения, для возвращения использовать ту же уч.записьПоискМестоположениеПрочитанныеИдет загрузкаБез звука[Мое местоположение]Настройки диалогаОчистить историю чатаСделать приглашение в чат свободнымВыйтиДокумент загружается, пожалуйста подождите...ВыйтиПожалуйста, введите имя пользователяДанный пользователь был удаленДиагностированиеОтправитьСделать видеоВойтиОшибка при передаче сообщения,Подтвердить парольСделать запись не удалось, пожалуйста, попробуйте еще раз!Настройки не указаныОчистить записиПожалуйста, проверьте соединение с интернетом либо попробуйте еще раз позжеВизитная карточкаИспользовать динамик при воспроизведении сообщенияЗаявки и уведомленияНастройкиДиалогОповещенияНазадОтменаПредыдущая версияЗавершитьВыбрать контактное лицоВ данный момент эта уч.запись используется другим устройством148dp2dpПрочитанныеПереданныеНазадСохранитьУдерживайтеПослатьСмайлыИзображениеСделать фотоМестоположениеДокументГолосовой вызовВизитная карточкаПровести вверх для отмены отправкиОтпустить палец для отмены отправкиОшибка при передаче сообщения,Удалить сообщениеКопировать сообщениеУдалить голосовое сообщениеУдалить видеоУдалитьОтправить повторноВы уверены, что хотите отправить сообщение еще раз?Пожалуйста, проверьте соединение с интернетом либо попробуйте еще раз позжеОшибка соединения, пожалуйста, проверьте Ваше соединение с интернетом.КопироватьПереслатьВыйтиЗагрузить эксплуатационный журналОтменаОповещенияОчистить записиВы уверены, что хотите очистить все записи?[Местоположение%1$]Информация о местоположенииСделать видео[Мое местоположение][Изображение][Видео][Документ][Голосовой вызов]ОтправитьСохранитьНайтиДобавитьПоискСеть недоступнаСделать запись не удалось, пожалуйста, попробуйте еще раз!Выбрать контактное лицоВы уверены, что Вы хотите переслать：%1$s ?ВыйтиСохранять записи при выходе из приложения, для возвращения использовать ту же уч.записьНе получать сообщения при выходе из приложенияРаспускать чат при выходе из приложенияВыйтиВ данный момент эта уч.запись используется другим устройствомДанный пользователь был удаленНастройкиУведомление о новом сообщенииПосылать уведомление при получении сообщенияГромкостьВибрацияНастройки диалогаИспользовать динамик при воспроизведении сообщенияЧерный списокДиалогКонтактыНастройкиИдет обновление контактовЗаявки и уведомленияЧатДобавить контактыПоискЧерный списокДиагностированиеПредыдущая версияНастройки не указаныИдет загрузкаСоздать чатИмя чатаОписание чатаСделать его публичным?Сделать приглашение в чат свободнымПубличный чатЧерный списокОчистить историю чатаБлокировать сообщения чатаРаспустить чатВыбрать контактное лицоИнформация о чатеАдминистраторОписаниеПрисоединиться к обсуждениюВойтиИмя пользователяПарольРегистрацияПодтвердить парольДокумент загружается, пожалуйста подождите...Без звукаБесконтактное управлениеЗавершитьОтветитьОшибка соединения с серверомСоздать чатСогласенЧат:Не скачано:Пожалуйста, введите имя пользователяПожалуйста подождите, видео загружается...Выйти из чата64dp2dp198dp不能和自己聊天聊天设置[文件]通话中...对方拒绝接受！...[我的位置]查找不能删除自己正在挂断..保存对方已拒绝正在解散群聊...下载图片: 0%对方不在线，请稍后再拨...此用户已是你的好友是否公开复制正在搜索..环信小助手确认将此成员加入至此群黑名单?删除联系人更新联系人列表已同意移入到黑名单选择联系人正在退出群聊...拍照上传添加正在移除...正在注册...来自群组:上传日志中更新联系人列表失败挂断注册失败:拍摄录像本地上传请求添加好友失败:删除会话和消息暂不支持！名片群聊资料取消录音时间太短正在移出...正在刷新联系人聊天室震动不能连接到服务器通讯录黑名单正在添加...是否发送？正在同意...[语音]添加成员更新头像失败!用户已存在！退出后，此群将被解散送达获取群聊信息失败:更新头像成功!按住说话您已被封禁退出群聊失败:设置发送以下图片？SD卡不存在，不能拍照[动态表情]更新昵称失败!正在下载文件请稍后加个好友呗修改群名称成功屏蔽群消息版本号错误[图片]群主正在修改群名称...群聊名称复制消息请求加入确认重发该信息？拍照登录正在登录...文件不能大于10M打开设备失败!尚未连接至服务器你发送了不合法的消息内容正在刷新群列表免提退出后不会删除任何历史数据，下次登录依然可以使用本账号正在下载视频请稍候移入黑名单失败更新昵称尚未连接至服务器，请稍后重试正在退出登录..返回两次输入的密码不一致，请重新输入!密码添加群成员失败:创建群组失败: 允许聊天室群主离开同意录音失败，请重试！表情注册失败，无权限！图片保存声音发送请求成功，等待群主同意删除视频key 验证出错! 请在 AndroidManifest.xml 文件中检查 key 设置通讯录请求加你为好友已同意你的好友请求删除上传头像同意失败:[语音通话]诊断退出群聊是否清空所有聊天记录发送正在创建群聊...移入黑名单成功对方未接听退出登录设置下载文件失败:确认密码搜索失败已取消保存注册删除消息黑名单列表连接不到聊天服务器发送失败，请检测服务器是否连接将在后台获取好友和群聊列表...[视频通话]删除失败:Relay加载数据失败，请检查网络或稍后重试确定转发到：%1$s ?已经和对方建立连接，等待对方接受...位置更新昵称成功!松开手指，取消发送获取失败,请检查网络或稍后再试发送语音需要sdcard支持位置信息通话时长无法获取到您的位置信息!正在屏蔽群组...找不到这个群组新建聊天加入群聊成功下载图片:网络不可用退出已拒绝[%1$s的位置]更新头像添加好友搜索公开群不能添加自己注册成功添加聊天室群ID用户名不合法视频通话没有更多的消息了搜索Direct手指上滑，取消发送添加公开群加入群聊失败:用户名你已经不在此群了确定[视频]当前版本转发更新黑名单失败退出登录登录失败: 获取好友或群聊失败找不到图片请检查网络或稍候重试删除会话简介[有人@我]已拒绝暂不支持大于10M的视频！选择联系人同意了你的群聊申请此用户已被移除对方未接听同一帐号已在其他设备登录使用扬声器播放语音接听移除通知对方正在通话中确认密码不能为空!移入黑名单失败,请检查网络或稍后重试已读正在确定你的位置...重发对方正在通话中，请稍后再拨对方不在线录像开始[表情]正在移入黑名单.../200人上传运行日志未下载:移出失败正在发送请求...静音黑名单发送消息失败,允许群成员邀请其他人是否清空所有聊天记录？个人资料搜群聊简介确定清空此群的聊天记录吗？网络出错更新群聊请等待...接收新消息通知解散群聊失败:确定解除群屏蔽失败，请检查网络或稍后重试群聊:删除语音当前群聊已被群创建者解散昵称不能为空！删除按钮被点击视频录制视频群组不存在退出后，将不再接收此群聊信息请输入用户名文件不存在正在移入至黑名单移入到黑名单？公开的群聊修改群名称正在下载语音，稍后点击未设置未接听对方已经挂断清空聊天记录解散群聊新消息提醒无录音权限用户名不能为空！已把你从他好友列表里移除连接建立失败！...昵称收到透传：action：会话日志上传成功正在解除屏蔽...添加按钮被点击设置此昵称以后，在与iOS客户端demo聊天过程中，iOS一侧会显示此昵称而不是环信ID，如果对方使用安卓客户端则此设置不生效log上传失败设置当前用户的昵称\n用于ios离线推送时显示用户昵称登录失败:新建群组改变群名称失败，请检查网络或稍后重试当前网络不可用，请检查网络设置未下载加入群聊已下载取消移出黑名单清空记录发送请求成功,等待对方验证群组名称不能为空正在连接对方...设置昵称文件iOS离线推送昵称从服务器下载群聊信息网络异常，请检查网络！下线通知正在删除...更新黑名单网络连接不可用，请检查网络取消搜输入新昵称群屏蔽失败，聊天服务器异常处理中，请稍后重试申请加入群：语音电话申请与通知你被群创建者从此群中移除密码不能为空！提示正在清空群消息...邀请你加入了群聊更新群聊失败 + - - - - - - - - - - - - - - - - - - - - - - 148dp2dpГолосовой вызовНе скачано:[Голосовой вызов]Описание чата[Изображение]СмайлыПоискАдминистраторЗагрузить эксплуатационный журналИнформация о местоположенииПослатьДобавитьИмя пользователяВы уверены, что Вы хотите переслать：%1$s ?СохранитьУдалить сообщениеИдет обновление контактовПереданныеВибрацияПожалуйста подождите, видео загружается...ГромкостьПарольСеть недоступнаИмя чатаИнформация о чатеВыйтиПубличный чатВы уверены, что хотите очистить все записи?УдерживайтеСоздать чатОтправить повторноКопировать сообщениеОтветитьНе получать сообщения при выходе из приложенияСделать фотоПровести вверх для отмены отправкиВыбрать контактное лицоУдалить голосовое сообщениеСохранитьЧерный список[Документ]Распустить чатОшибка соединения, пожалуйста, проверьте Ваше соединение с интернетом.Чат:ДокументКопироватьДобавить контактыПрисоединиться к обсуждениюПереслать[Местоположение%1$][Видео]Распускать чат при выходе из приложенияЧатЧерный списокКонтактыИзображениеВы уверены, что хотите отправить сообщение еще раз?СогласенСоздать чатНайтиНастройкиОписаниеСделать его публичным?РегистрацияВыйти из чатаОтпустить палец для отмены отправкиБлокировать сообщения чатаЧерный списокПосылать уведомление при получении сообщенияУдалить видеоУдалитьОшибка соединения с серверомУведомление о новом сообщенииБесконтактное управлениеСохранять записи при выходе из приложения, для возвращения использовать ту же уч.записьПоискМестоположениеПрочитанныеИдет загрузкаБез звука[Мое местоположение]Настройки диалогаОчистить историю чатаСделать приглашение в чат свободнымВыйтиДокумент загружается, пожалуйста подождите...ВыйтиПожалуйста, введите имя пользователяДанный пользователь был удаленДиагностированиеОтправитьСделать видеоВойтиОшибка при передаче сообщения,Подтвердить парольСделать запись не удалось, пожалуйста, попробуйте еще раз!Настройки не указаныОчистить записиПожалуйста, проверьте соединение с интернетом либо попробуйте еще раз позжеВизитная карточкаИспользовать динамик при воспроизведении сообщенияЗаявки и уведомленияНастройкиДиалогОповещенияНазадОтменаПредыдущая версияЗавершитьВыбрать контактное лицоВ данный момент эта уч.запись используется другим устройством64dp2dp198dp不能和自己聊天聊天设置[文件]通话中...对方拒绝接受！...[我的位置]查找不能删除自己正在挂断..保存对方已拒绝正在解散群聊...下载图片: 0%对方不在线，请稍后再拨...此用户已是你的好友是否公开复制正在搜索..环信小助手确认将此成员加入至此群黑名单?删除联系人更新联系人列表已同意移入到黑名单选择联系人正在退出群聊...拍照上传添加正在移除...正在注册...来自群组:上传日志中更新联系人列表失败挂断注册失败:拍摄录像本地上传请求添加好友失败:删除会话和消息暂不支持！名片群聊资料取消录音时间太短正在移出...正在刷新联系人聊天室震动不能连接到服务器通讯录黑名单正在添加...是否发送？正在同意...[语音]添加成员更新头像失败!用户已存在！退出后，此群将被解散送达获取群聊信息失败:更新头像成功!按住说话您已被封禁退出群聊失败:设置发送以下图片？SD卡不存在，不能拍照[动态表情]更新昵称失败!正在下载文件请稍后加个好友呗修改群名称成功屏蔽群消息版本号错误[图片]群主正在修改群名称...群聊名称复制消息请求加入确认重发该信息？拍照登录正在登录...文件不能大于10M打开设备失败!尚未连接至服务器你发送了不合法的消息内容正在刷新群列表免提退出后不会删除任何历史数据，下次登录依然可以使用本账号正在下载视频请稍候移入黑名单失败更新昵称尚未连接至服务器，请稍后重试正在退出登录..返回两次输入的密码不一致，请重新输入!密码添加群成员失败:创建群组失败: 允许聊天室群主离开同意录音失败，请重试！表情注册失败，无权限！图片保存声音发送请求成功，等待群主同意删除视频key 验证出错! 请在 AndroidManifest.xml 文件中检查 key 设置通讯录请求加你为好友已同意你的好友请求删除上传头像同意失败:[语音通话]诊断退出群聊是否清空所有聊天记录发送正在创建群聊...移入黑名单成功对方未接听退出登录设置下载文件失败:确认密码搜索失败已取消保存注册删除消息黑名单列表连接不到聊天服务器发送失败，请检测服务器是否连接将在后台获取好友和群聊列表...[视频通话]删除失败:Relay加载数据失败，请检查网络或稍后重试确定转发到：%1$s ?已经和对方建立连接，等待对方接受...位置更新昵称成功!松开手指，取消发送获取失败,请检查网络或稍后再试发送语音需要sdcard支持位置信息通话时长无法获取到您的位置信息!正在屏蔽群组...找不到这个群组新建聊天加入群聊成功下载图片:网络不可用退出已拒绝[%1$s的位置]更新头像添加好友搜索公开群不能添加自己注册成功添加聊天室群ID用户名不合法视频通话没有更多的消息了搜索Direct手指上滑，取消发送添加公开群加入群聊失败:用户名你已经不在此群了确定[视频]当前版本转发更新黑名单失败退出登录登录失败: 获取好友或群聊失败找不到图片请检查网络或稍候重试删除会话简介[有人@我]已拒绝暂不支持大于10M的视频！选择联系人同意了你的群聊申请此用户已被移除对方未接听同一帐号已在其他设备登录使用扬声器播放语音接听移除通知对方正在通话中确认密码不能为空!移入黑名单失败,请检查网络或稍后重试已读正在确定你的位置...重发对方正在通话中，请稍后再拨对方不在线录像开始[表情]正在移入黑名单.../200人上传运行日志未下载:移出失败正在发送请求...静音黑名单发送消息失败,允许群成员邀请其他人是否清空所有聊天记录？个人资料搜群聊简介确定清空此群的聊天记录吗？网络出错更新群聊请等待...接收新消息通知解散群聊失败:确定解除群屏蔽失败，请检查网络或稍后重试群聊:删除语音当前群聊已被群创建者解散昵称不能为空！删除按钮被点击视频录制视频群组不存在退出后，将不再接收此群聊信息请输入用户名文件不存在正在移入至黑名单移入到黑名单？公开的群聊修改群名称正在下载语音，稍后点击未设置未接听对方已经挂断清空聊天记录解散群聊新消息提醒无录音权限用户名不能为空！已把你从他好友列表里移除连接建立失败！...昵称收到透传：action：会话日志上传成功正在解除屏蔽...添加按钮被点击设置此昵称以后，在与iOS客户端demo聊天过程中，iOS一侧会显示此昵称而不是环信ID，如果对方使用安卓客户端则此设置不生效log上传失败设置当前用户的昵称\n用于ios离线推送时显示用户昵称登录失败:新建群组改变群名称失败，请检查网络或稍后重试当前网络不可用，请检查网络设置未下载加入群聊已下载取消移出黑名单清空记录发送请求成功,等待对方验证群组名称不能为空正在连接对方...设置昵称文件iOS离线推送昵称从服务器下载群聊信息网络异常，请检查网络！下线通知正在删除...更新黑名单网络连接不可用，请检查网络取消搜输入新昵称群屏蔽失败，聊天服务器异常处理中，请稍后重试申请加入群：语音电话申请与通知你被群创建者从此群中移除密码不能为空！提示正在清空群消息...邀请你加入了群聊更新群聊失败 - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml b/easeui/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml index fd640b6bf3b051d2a69cc510ba30ba9fb3287c63..3b935e2fb716a131d1f3a30a202957d16b73cb25 100644 --- a/easeui/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml +++ b/easeui/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml @@ -4,7 +4,7 @@ + android:targetSdkVersion="26" /> - + diff --git a/easeui/build/intermediates/manifests/aapt/debug/AndroidManifest.xml b/easeui/build/intermediates/manifests/aapt/debug/AndroidManifest.xml index 6958838ab707893c29a0706fdbbb6e9b16b86b08..7614bcd481568ef7be347d2f6357c5e297facdd0 100644 --- a/easeui/build/intermediates/manifests/aapt/debug/AndroidManifest.xml +++ b/easeui/build/intermediates/manifests/aapt/debug/AndroidManifest.xml @@ -6,6 +6,6 @@ + android:targetSdkVersion="26" /> \ No newline at end of file diff --git a/easeui/build/intermediates/manifests/aapt/release/AndroidManifest.xml b/easeui/build/intermediates/manifests/aapt/release/AndroidManifest.xml deleted file mode 100644 index 6958838ab707893c29a0706fdbbb6e9b16b86b08..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/manifests/aapt/release/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/fade_in.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/fade_in.xml deleted file mode 100644 index 8452da4a5e53d3703d5e3f41a5c92775edd51bb9..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/fade_in.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/fade_out.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/fade_out.xml deleted file mode 100644 index 8861e8f08f4f36c0b1f8484c29b6eeaaeeb14490..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/fade_out.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/head_in.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/head_in.xml deleted file mode 100644 index 8a282610312a3243415bff728531bd4871634ba7..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/head_in.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/head_out.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/head_out.xml deleted file mode 100644 index ca74b97976e42e4e10763a5ba7ea41b4c58b32c6..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/head_out.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/hold.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/hold.xml deleted file mode 100644 index 82298ed4c46583c440830a8fd9ab51abe4107399..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/hold.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_bottom_in.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_bottom_in.xml deleted file mode 100644 index e497b2615e9faf2762acea705decd12813f067b7..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_bottom_in.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_bottom_out.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_bottom_out.xml deleted file mode 100644 index 3c1696e29db210a6ab6717a7d99d8e420e925aea..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_bottom_out.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_in.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_in.xml deleted file mode 100644 index b31390cf7a74f408041756e0cab09d616bf25f23..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_in.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_in2.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_in2.xml deleted file mode 100644 index 915935474b53153b2b7f4a2396641ae26c173241..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_in2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_out.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_out.xml deleted file mode 100644 index cf6cac270d10fc1841dfaa670ba9fae614f57fd1..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_out.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_out2.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_out2.xml deleted file mode 100644 index 7bae2690308a2e762ab8b55ce502c1bb8289d76e..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/push_top_out2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_in_from_left.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_in_from_left.xml deleted file mode 100644 index 2ac353ab44f0baecf6510a1799f6ff09b08b7b52..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_in_from_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_in_from_right.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_in_from_right.xml deleted file mode 100644 index 496790b06bca6806c9f49bcc45f9dda75a5eeeca..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_in_from_right.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_out_to_left.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_out_to_left.xml deleted file mode 100644 index f1c97bc7acc3ce7e0a4c0a0c15e4b5d2da27084f..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_out_to_left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_out_to_right.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_out_to_right.xml deleted file mode 100644 index eed5841a9eb6401b8b76bb26b7872288e3ebaa52..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/slide_out_to_right.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/voice_from_icon.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/voice_from_icon.xml deleted file mode 100644 index 5e39fbb355019a2275695e7457bb94ddd58376e5..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/voice_from_icon.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/anim/voice_to_icon.xml b/easeui/build/intermediates/res/merged/androidTest/debug/anim/voice_to_icon.xml deleted file mode 100644 index cd52d6481720f76ecdcd7b56170ff612c138521f..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/anim/voice_to_icon.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_app_panel_video_icon.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_app_panel_video_icon.9.png deleted file mode 100644 index 3546a6bf118de03a7dc331bd5ce9fb1f11ca8360..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_app_panel_video_icon.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_appitem_del_btn_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_appitem_del_btn_normal.png deleted file mode 100644 index 6be415587f37a92510c9c6c69e5c3a5e07789242..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_appitem_del_btn_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_appitem_del_btn_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_appitem_del_btn_pressed.png deleted file mode 100644 index 42f3464f82d4ee4170fa10e83fa258f8cde0ffbb..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_appitem_del_btn_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_face_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_face_normal.png deleted file mode 100644 index 12fae5913c1ca91be30072c70c25a8738a71802d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_face_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_face_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_face_pressed.png deleted file mode 100644 index 19f714e97ecd7d0c4500f0ab281b6f1834d018e6..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_face_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_video_mask_to.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_video_mask_to.9.png deleted file mode 100644 index a643d1527aff91be7c9da4bae5b93097b9cba31b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chat_video_mask_to.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_bg_focused.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_bg_focused.9.png deleted file mode 100644 index 5d1811fc0e75bae2251ce5396643a8e7535594b1..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_bg_focused.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_bg_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_bg_normal.9.png deleted file mode 100644 index 81641be7dd270a279670de36a4cee9af11f22a07..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_bg_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing.png deleted file mode 100644 index 7236a33dfff626b3b8a6b8887da6c3e5fad96437..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f1.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f1.png deleted file mode 100644 index 54bb634ca694bbfcf64a6c339af75e84f898cbd8..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f1.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f2.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f2.png deleted file mode 100644 index cd22bc7fb011c101397704f421568c06476c2902..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f2.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f3.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f3.png deleted file mode 100644 index d240a2d4787f4a282ee5711debbafbf0ef308509..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatfrom_voice_playing_f3.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_biaoqing_btn_enable.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_biaoqing_btn_enable.png deleted file mode 100644 index 5ab4f4fbb4715be4969dcc2cefdf0149a19d1ff4..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_biaoqing_btn_enable.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_biaoqing_btn_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_biaoqing_btn_normal.png deleted file mode 100644 index 42ec8d4a05aceebcb464a7e4d7253eea7c973f95..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_biaoqing_btn_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_keyboard_btn_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_keyboard_btn_normal.png deleted file mode 100644 index 6b0cbf83caf40eb0f9d601b5d4454aa5f730168c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_keyboard_btn_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_keyboard_btn_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_keyboard_btn_pressed.png deleted file mode 100644 index 1d6d00731f43b78ceef086fe3ebcf31fdc1e95a4..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_keyboard_btn_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_voice_btn_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_voice_btn_normal.png deleted file mode 100644 index baaa1acb95a91196468b5c16e382ee9c1bfe38c6..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_voice_btn_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_voice_btn_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_voice_btn_pressed.png deleted file mode 100644 index 3482beb2b632aafc34b012ee3e6167e8a7200e22..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatting_setmode_voice_btn_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_bg_focused.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_bg_focused.9.png deleted file mode 100644 index 1980ae94890dbd2c1339415f09e9067459e27d91..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_bg_focused.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_bg_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_bg_normal.9.png deleted file mode 100644 index e577574976094b84f229461d608060bc8c0d97f5..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_bg_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing.png deleted file mode 100644 index fec81063f5d8e921c2d1ea076c8b0ba47dd6358f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f1.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f1.png deleted file mode 100644 index 90ded735e0ca32443935040b21e8891b95885f3b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f1.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f2.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f2.png deleted file mode 100644 index dc37144d7b49fe846640834e9d0a948b57b291fc..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f2.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f3.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f3.png deleted file mode 100644 index 7bd3996c52bee781814424c9d0edfea97222be20..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_chatto_voice_playing_f3.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_contact_list_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_contact_list_normal.png deleted file mode 100644 index 73f12f3ca5096364e7f98af66595320b6b183104..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_contact_list_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_contact_list_selected.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_contact_list_selected.png deleted file mode 100644 index c60f290da9039dd0dd185b6f374f78af1351aee0..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_contact_list_selected.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_conversation_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_conversation_normal.png deleted file mode 100644 index c5c5c7715b237b2769a8ff14360e91bfee5d4c92..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_conversation_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_conversation_selected.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_conversation_selected.png deleted file mode 100644 index cfd372fced58d919f958ccf7baa7371bd50fc387..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_conversation_selected.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_default_avatar.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_default_avatar.png deleted file mode 100644 index f736c68b019f7bb66b699e194e485a0c5823309f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_default_avatar.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_default_image.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_default_image.png deleted file mode 100644 index 3c26190ed0e783ec122d93e35f5910ef2e5d0228..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_default_image.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_gray_on.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_gray_on.png deleted file mode 100644 index 4ca2123507d0b5c3d4f17376a1f0bf4319fc2304..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_gray_on.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_off.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_off.png deleted file mode 100644 index 9d785daaabe593978b30e750db12b3e33f73aea9..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_off.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_on.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_on.png deleted file mode 100644 index 092c77818f50b7e30abdc6005a73665178e43749..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_dx_checkbox_on.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_groups_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_groups_icon.png deleted file mode 100644 index fe623272e4ed7a2cfe5170fe0ee3f1514e42af10..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_groups_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_ic_launcher.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_ic_launcher.png deleted file mode 100644 index efa7c5f150e1c9d072a61f28a9f07e2b0f79b1b2..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_ic_launcher.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_icon_marka.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_icon_marka.png deleted file mode 100644 index f2fa7b028b42f5a33a63d3d49323bef3a71caa8b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_icon_marka.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_input_bar_bg_active.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_input_bar_bg_active.9.png deleted file mode 100644 index 39fbac907659a61f37d0b4164fcc0b3de8ef2593..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_input_bar_bg_active.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_input_bar_bg_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_input_bar_bg_normal.9.png deleted file mode 100644 index b9a0676349eaddc2fcee96141f251646c0f348d7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_input_bar_bg_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_location_msg.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_location_msg.9.png deleted file mode 100644 index 5ac77b1f92ac1a9c01e471fffbc28a5aabcd0c8c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_location_msg.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_login_error_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_login_error_icon.png deleted file mode 100644 index 58def8b067dacdd3c0ff800f758b4dbfa30eb609..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_login_error_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_disable.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_disable.9.png deleted file mode 100644 index 7ba3e7ec8592f2d7e3bb2f0ae4382b26f3004d01..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_disable.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_grey_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_grey_normal.9.png deleted file mode 100644 index f02c9140f224be02761e15e180c0fc468d3cd6ea..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_grey_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_pressed.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_pressed.9.png deleted file mode 100644 index 61e77ea05d710810b6f7a3615cda5406b9bc896f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_pressed.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_simple.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_simple.9.png deleted file mode 100644 index 939ddcfad9ae72d103260fcdafae1efdace5f4fa..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_listitem_simple.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_title_back.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_title_back.png deleted file mode 100644 index 251928c037dacb7e6ef74e5c30ae8e24ae636127..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_title_back.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_title_remove.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_title_remove.png deleted file mode 100644 index 8be0ce29ff13568bccde002de21b66be50ef3cdc..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_mm_title_remove.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_msg_state_fail_resend.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_msg_state_fail_resend.png deleted file mode 100644 index 4d5809f388588ea2bd8bebf10290f4185087e483..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_msg_state_fail_resend.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_msg_state_fail_resend_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_msg_state_fail_resend_pressed.png deleted file mode 100644 index 2b9d3c76e21ac1eae1f13e1b9581374af2bc4021..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_msg_state_fail_resend_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_new_friends_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_new_friends_icon.png deleted file mode 100644 index 1aded1c51c22521e16098b99f04f33531aafbc21..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_new_friends_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_01.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_01.png deleted file mode 100644 index cc89c6a1e9a7eeb4f49e75620c0a3c21d552643d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_01.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_02.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_02.png deleted file mode 100644 index 2d2c9d77f76dc3bebf300f579534a0046a0bfadc..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_02.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_03.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_03.png deleted file mode 100644 index c6fff08ec6a81eec25192231cb6565ef07bdd713..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_03.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_04.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_04.png deleted file mode 100644 index 056b94cb5ef041ce5f8613ed2d0b45c0123c99af..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_04.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_05.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_05.png deleted file mode 100644 index 0615af09cbfa38b5c5ad7ba0eb6714d16f4c9a2e..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_05.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_06.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_06.png deleted file mode 100644 index 3177c915457877518620612239533ca3f87be96b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_06.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_07.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_07.png deleted file mode 100644 index 4a1efb2404360e75e8709f1d7415f9cc4c6c0116..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_07.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_08.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_08.png deleted file mode 100644 index 4a4dd9cd13cb8a0af0a6b24a4d2629d52b0bb394..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_08.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_09.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_09.png deleted file mode 100644 index 0e374748fa890e022a2350661a63a0c88e0fa8d7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_09.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_10.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_10.png deleted file mode 100644 index 49af9f375b1ad10dd45c163f7757331b00277e54..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_10.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_11.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_11.png deleted file mode 100644 index fe2e94ee4a8d964635a4c7341ec2dda205bf972e..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_11.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_12.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_12.png deleted file mode 100644 index ba24969683bddab93fd29285ef7dbdf2a9117c13..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_12.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_13.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_13.png deleted file mode 100644 index bbe9d78d3950faacb45cceec726eaaffa168835e..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_13.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_14.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_14.png deleted file mode 100644 index d7698cdb600bfd9e6c4b033eaf6ffd2f57caa5be..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_record_animate_14.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_seabar_input.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_seabar_input.9.png deleted file mode 100644 index a215d2fc5542b99d602b0b1143629f6e39e58ed7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_seabar_input.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_bar_icon_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_bar_icon_normal.png deleted file mode 100644 index a7a69d7544363a4ab215cd2cf1531870e8a75e3e..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_bar_icon_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_clear_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_clear_normal.png deleted file mode 100644 index f8ece239946fa205448653271d358253709a1cd8..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_clear_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_clear_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_clear_pressed.png deleted file mode 100644 index 92a2226665d35c050c6b4631a5649e3810b7bb35..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_search_clear_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_settings_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_settings_normal.png deleted file mode 100644 index 4c8108f9fb57e3e5bd7a2e1ac30a98c8a1f88340..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_settings_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_settings_selected.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_settings_selected.png deleted file mode 100644 index 3115d685cd92deacb1ec4fcfdad3673807654bca..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_settings_selected.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_show_head_toast_bg.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_show_head_toast_bg.9.png deleted file mode 100644 index 248a1c776d59e2abd73f8b6628d4a67228a40014..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_show_head_toast_bg.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_slidetab_bg_press.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_slidetab_bg_press.9.png deleted file mode 100644 index 464aae8ab94b789a8b010a6478cd0f9c0ef2ae6c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_slidetab_bg_press.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_to_group_details_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_to_group_details_normal.png deleted file mode 100644 index d000e3c51ad2c1d48c080b185838a2f205f5f13d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_to_group_details_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_type_select_btn_nor.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_type_select_btn_nor.png deleted file mode 100644 index 14fae329b91be8412050840dcc1fd0ddcbb4c3e5..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_type_select_btn_nor.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_type_select_btn_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_type_select_btn_pressed.png deleted file mode 100644 index 72780f9bc9cab2ad835c56bf698167cbfaa0970a..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_type_select_btn_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_unread_count_bg.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_unread_count_bg.9.png deleted file mode 100644 index 8a7bcb2c78e88698e07790f272864f895f5cd54f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_unread_count_bg.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_download_btn_nor.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_download_btn_nor.png deleted file mode 100644 index 84f4caf5814ff9ebd66eea8beac7e2463da0f784..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_download_btn_nor.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_play_btn_small_nor.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_play_btn_small_nor.png deleted file mode 100644 index 44c7e66a74d516f897a765f1254cab60ed57c69d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_play_btn_small_nor.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_recorder_start_btn.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_recorder_start_btn.png deleted file mode 100644 index ab93f7631fa424dcf28e13efbffb0bcbe26eb967..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_recorder_start_btn.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_recorder_stop_btn.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_recorder_stop_btn.png deleted file mode 100644 index c05faceb06bb20cbeb98c01ce025e37e5a24540a..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_video_recorder_stop_btn.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_voice_unread.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_voice_unread.png deleted file mode 100644 index 4a6ac578729d69bb616751c3a8d3221d07c6bb56..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ease_voice_unread.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_1.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_1.png deleted file mode 100644 index 748bfdac4415d7bccf43fe53459242f77628f8b0..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_1.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_10.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_10.png deleted file mode 100644 index 500c6d574dd8c9ecceb5e98faac9bc101940961f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_10.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_11.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_11.png deleted file mode 100644 index 65067ac4e8af804e01a404d463a232a8e1832da7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_11.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_12.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_12.png deleted file mode 100644 index 6a4281d125b1cc1516dd03dac0589a04ed14b13f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_12.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_13.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_13.png deleted file mode 100644 index 828f8e2248c457b4f061df2f5b3ad544c1b184df..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_13.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_14.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_14.png deleted file mode 100644 index 743937faba1481b727a8279bfad14d86d5c6a899..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_14.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_15.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_15.png deleted file mode 100644 index 0db14b63a2029140555a1c963921fbe3e7892600..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_15.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_16.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_16.png deleted file mode 100644 index 2c6f6c1617749af7d018e941365a36bbd8e372bc..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_16.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_17.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_17.png deleted file mode 100644 index 4e558d20f8daecabd030730683723fc9fd13cbd1..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_17.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_18.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_18.png deleted file mode 100644 index 1bc6a0527787fe2ff07cd03261513db9c8792221..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_18.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_19.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_19.png deleted file mode 100644 index 5e5d747698e62ab6e5a574dbff0f74930a93f5b5..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_19.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_2.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_2.png deleted file mode 100644 index 6f95599d999197458bd181cac8cae274f73960a7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_2.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_20.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_20.png deleted file mode 100644 index 289765d68139381ea4f2e9898e557425f7e2d35e..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_20.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_21.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_21.png deleted file mode 100644 index 3eb02bf798cd570dcc5a51e876cbffa3a43fdd9c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_21.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_22.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_22.png deleted file mode 100644 index 453a6ad9047eb18fb879e02b9d0a531b1934c6cf..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_22.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_23.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_23.png deleted file mode 100644 index 119428fa89330e945e0e2c9ae98265b11d9981b0..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_23.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_24.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_24.png deleted file mode 100644 index 9fd65513819c708410be75cc6e98e32b14e8bd84..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_24.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_25.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_25.png deleted file mode 100644 index 10d5891a476724e28becbaca5495c2323aee6de8..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_25.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_26.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_26.png deleted file mode 100644 index cb54e455dfbba5f3021629cfd8f5397ae5d51a0c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_26.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_27.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_27.png deleted file mode 100644 index 0d477d3d0329dc715991379b07d91c710ca93f18..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_27.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_28.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_28.png deleted file mode 100644 index bc0826e448d3a4395252346df03e1461d84ca151..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_28.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_29.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_29.png deleted file mode 100644 index 184e4942091f73995b6d2e30a0ff5578720c338c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_29.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_3.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_3.png deleted file mode 100644 index 3dd9d011f745a49794def7f6bdb781f28c72dd64..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_3.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_30.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_30.png deleted file mode 100644 index 5fe610e67c41a61e88363f71298a71b1002227f3..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_30.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_31.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_31.png deleted file mode 100644 index e8c57a55b1561b4e30366e462667c1315f5ea032..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_31.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_32.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_32.png deleted file mode 100644 index 36d8f2147b415ee2230ca757ac5cf85deb40ea98..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_32.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_33.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_33.png deleted file mode 100644 index b71474a40be9280cb4a02983a4351826a28055bb..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_33.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_34.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_34.png deleted file mode 100644 index 79bb300b5c3f96991198117a1a353d486ab53fe4..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_34.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_35.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_35.png deleted file mode 100644 index f66ec3a62ad19d23bf81d2166c2f28210717f93d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_35.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_4.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_4.png deleted file mode 100644 index 444b511bc476a6dd5152413e04330ea691e64b80..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_4.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_5.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_5.png deleted file mode 100644 index 4a12c6392360e88705ca8b4383664ff0501215db..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_5.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_6.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_6.png deleted file mode 100644 index 664f69d3ecc3025c8896509259509503ebb283cf..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_6.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_7.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_7.png deleted file mode 100644 index 183ebe3491447def81562d204284b98dd2ff1684..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_7.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_8.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_8.png deleted file mode 100644 index 63c579b424686ea30a218cc730fde34c269bcf4a..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_8.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_9.png deleted file mode 100644 index a75b812f03db01ba3d585be12e3d146c84105bc3..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/ee_9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/loading.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/loading.png deleted file mode 100644 index dda9841a499471b10905c416aee4456dba126dce..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/loading.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/ic_launcher.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/ic_launcher.png deleted file mode 100644 index ec27f2ea4b8baef1fe717883e138517080f22946..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/ic_launcher.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/img_hx_avatar.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/img_hx_avatar.png deleted file mode 100644 index ae74b29ca3e94dccfd4712c1950d7952f291fb54..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/img_hx_avatar.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/loadingdialog_roundborder.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/loadingdialog_roundborder.xml deleted file mode 100644 index 150356cb67791829ac5b9123522c10af1d7f81c4..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/loadingdialog_roundborder.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/company_auth.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/company_auth.png deleted file mode 100644 index c3274a21224469ed5fa591166d960279e8ff606b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/company_auth.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/company_unauth.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/company_unauth.png deleted file mode 100644 index ed8fb392f109854b496d52e5e764b15b82389d55..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/company_unauth.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/delete_expression.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/delete_expression.png deleted file mode 100644 index 5ae5de8a881b49dbc0a20c107876c5f55e7580e7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/delete_expression.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_app_panel_video_icon.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_app_panel_video_icon.9.png deleted file mode 100644 index 3546a6bf118de03a7dc331bd5ce9fb1f11ca8360..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_app_panel_video_icon.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_back.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_back.png deleted file mode 100644 index 251928c037dacb7e6ef74e5c30ae8e24ae636127..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_back.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_blue_add.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_blue_add.png deleted file mode 100644 index 146613dba452fce6b099d2ed33b6a930c894c05b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_blue_add.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_edit_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_edit_normal.9.png deleted file mode 100644 index d30a05940d29179124a97fd5268b6b75e541e478..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_edit_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_face_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_face_normal.png deleted file mode 100644 index 12fae5913c1ca91be30072c70c25a8738a71802d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_face_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_face_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_face_pressed.png deleted file mode 100644 index 19f714e97ecd7d0c4500f0ab281b6f1834d018e6..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_face_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image.png deleted file mode 100644 index c4b0e89b59ff9628b29a1aa078b4fb0e5eeed7cf..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image_normal.png deleted file mode 100644 index cc6139f316d29bb4f8d67f540e229cfa54fc7507..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image_pressed.png deleted file mode 100644 index 64d28220bff5db0dd3b476a605283166faa31d09..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_image_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_item_file.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_item_file.png deleted file mode 100644 index 0ff66ee1c0f1295249a107b2e26c1345af090185..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_item_file.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location.png deleted file mode 100644 index c0ce54751d774fd76710e70387e352e72721a4ad..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location_normal.png deleted file mode 100644 index 298e9dd4dd6094a3e5e6ff1230446ec891f2bd8b..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location_pressed.png deleted file mode 100644 index 87f7fb5135c07cc928069a5783937a705d9ce00d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_location_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_press_speak_btn_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_press_speak_btn_normal.9.png deleted file mode 100644 index ef2ed4589285a7db4101edc33f8cacbb5ed116bd..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_press_speak_btn_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_press_speak_btn_pressed.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_press_speak_btn_pressed.9.png deleted file mode 100644 index 5e5472ff032c2e5eb9573eaae3244a2ce7ec604f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_press_speak_btn_pressed.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_send_btn_normal.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_send_btn_normal.9.png deleted file mode 100644 index 89c60a9157aaee717ab1c64544979d6589c2da64..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_send_btn_normal.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_send_btn_pressed.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_send_btn_pressed.9.png deleted file mode 100644 index 2143efff69b0f737fcfa49e7aed9ebbf5f978f9d..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_send_btn_pressed.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic.png deleted file mode 100644 index ae2cb3fddecaa5f4aa64f1ffd1acd8ada5893da4..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic_normal.png deleted file mode 100644 index 45c63e7c7226251a5816af8bf487b0bfafa0e622..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic_pressed.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic_pressed.png deleted file mode 100644 index 978531552e8cf730b7b8c88b4e1cc076b2b98dac..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_takepic_pressed.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_video_call_receive.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_video_call_receive.png deleted file mode 100644 index 5429803513f5cb63d574a4145fb3848ef5c6c0dc..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_video_call_receive.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_video_call_self.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_video_call_self.png deleted file mode 100644 index 45a5d6a377a65750d997cc05add2a3aa123cfe70..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_video_call_self.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_voice_call_receive.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_voice_call_receive.png deleted file mode 100644 index e0f02a5dc53c4b971a57e46d3f3ea223c4d8e6f6..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_voice_call_receive.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_voice_call_self.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_voice_call_self.png deleted file mode 100644 index 938bba1b6fda4754e5cd6b5d635e17b98345ed47..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chat_voice_call_self.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chatting_biaoqing_btn_enable.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chatting_biaoqing_btn_enable.png deleted file mode 100644 index 699d566a85e040d448d8089c1e1b39b69132b356..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chatting_biaoqing_btn_enable.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chatting_biaoqing_btn_normal.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chatting_biaoqing_btn_normal.png deleted file mode 100644 index 01dcaa062319f9ac855c8982e855c2a9ddf057ed..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_chatting_biaoqing_btn_normal.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_close_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_close_icon.png deleted file mode 100644 index 58c87edd82407d7c39493585c3e4fffc2e3e4c88..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_close_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_default_avatar.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_default_avatar.png deleted file mode 100644 index 7b2cdcfb29e419ba4476ebfcdf10a624e6efa914..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_default_avatar.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_default_expression.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_default_expression.png deleted file mode 100644 index 454fd94228b1254f40cec4ced17569bd9e8fc3d5..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_default_expression.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_delete_expression.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_delete_expression.png deleted file mode 100644 index 5ae5de8a881b49dbc0a20c107876c5f55e7580e7..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_delete_expression.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_dot_emojicon_selected.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_dot_emojicon_selected.png deleted file mode 100644 index 75719e834aa316ea6da915c44bdaa58bb3755206..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_dot_emojicon_selected.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_dot_emojicon_unselected.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_dot_emojicon_unselected.png deleted file mode 100644 index 32e04aeb5a25b1a4844fc93343ed82ae460e9a6e..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_dot_emojicon_unselected.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_group_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_group_icon.png deleted file mode 100644 index 83da1cad21cfe46db971ddc92d3af4dae3ea8f4c..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_group_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_groups_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_groups_icon.png deleted file mode 100644 index 8f99c8734d606e95f7008fb55eb29d6f14b6c534..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_groups_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_mm_title_remove.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_mm_title_remove.png deleted file mode 100644 index a17c672466684b8e3c70479be7f98b9f78f09892..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_mm_title_remove.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_new_friends_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_new_friends_icon.png deleted file mode 100644 index 87617c4933d6f58aae8a7c0b43cbe19357d50f9f..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_new_friends_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_open_icon.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_open_icon.png deleted file mode 100644 index 80455e0c2b270978da46069af39973fbd3ba7959..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_open_icon.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_unread_dot.9.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_unread_dot.9.png deleted file mode 100644 index 831a736562dfd5963349196ffa7fdd4125b2ccf0..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/ease_unread_dot.9.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/img_yuanqueshengtouxiang.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/img_yuanqueshengtouxiang.png deleted file mode 100644 index 78fe8cb2c8ee8a9568197ea1a16b6db4dc331860..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/img_yuanqueshengtouxiang.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/item_normal.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/item_normal.xml deleted file mode 100644 index b737418d77768ea1e7f5ab75620ae62f56ebd7c1..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/item_normal.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/item_pressed.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/item_pressed.xml deleted file mode 100644 index 07cad597d0c5f89c72f9fec4c7941439bdbe14b8..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/item_pressed.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/list_item_click_style.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/list_item_click_style.xml deleted file mode 100644 index 7ab90d2177a20a97b63417bbf8c5457c593f47fb..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/list_item_click_style.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/mobile_auth.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/mobile_auth.png deleted file mode 100644 index 4aec2eeca51b734532875dd15be2b21bb596a461..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/mobile_auth.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/mobile_unauth.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/mobile_unauth.png deleted file mode 100644 index dabfa7da9fb825f0931e367aba81787793ea5af1..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/mobile_unauth.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/video_auth.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/video_auth.png deleted file mode 100644 index 8f0a40d18f962039398f8b17121d73cf77185744..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/video_auth.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/video_unauth.png b/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/video_unauth.png deleted file mode 100644 index e8c595882c24ebe982ee63925575425b571efbe0..0000000000000000000000000000000000000000 Binary files a/easeui/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/video_unauth.png and /dev/null differ diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_normal_shape.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_normal_shape.xml deleted file mode 100644 index d9e0450d5f2c55abef03e02e075f4e18812236e8..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_normal_shape.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_pressed_shape.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_pressed_shape.xml deleted file mode 100644 index 6618ed1c04d36118301174d563721552057a0130..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_pressed_shape.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_selector.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_selector.xml deleted file mode 100644 index d42c2103b7711776219b4dc9f63420447d37648e..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_blue_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_bj.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_bj.xml deleted file mode 100644 index ed45f49777d788b65db1f12d116365f8b7f109bc..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_bj.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_normal_shape.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_normal_shape.xml deleted file mode 100644 index 9de9e1a2933363069ecf56e06a43acae1355a130..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_normal_shape.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_pressed_shape.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_pressed_shape.xml deleted file mode 100644 index 0fe34e420915110eeb5e05d12f34d97d8fedd630..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_btn_cancel_pressed_shape.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_image_selector.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_image_selector.xml deleted file mode 100644 index 919a51fc9746f337f927e5a2354055abf67dd44e..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_image_selector.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_location_selector.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_location_selector.xml deleted file mode 100644 index e4be6d867981d7a78868cb2566b108e50cc3d888..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_location_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_press_speak_btn.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_press_speak_btn.xml deleted file mode 100644 index 3fe285c7118fd91d2df2ae48bba04d014fb65661..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_press_speak_btn.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_send_btn_selector.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_send_btn_selector.xml deleted file mode 100644 index 045442cabd3de614f978889a5397a325775a847c..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_send_btn_selector.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_takepic_selector.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_takepic_selector.xml deleted file mode 100644 index 3c535615b6a33c85174a14fcaf75f49ebd7d5daf..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chat_takepic_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatfrom_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatfrom_bg.xml deleted file mode 100644 index 112fd98dfbc9eafbb85bfd490d8083335e0c6f39..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatfrom_bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatting_setmode_keyboard_btn.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatting_setmode_keyboard_btn.xml deleted file mode 100644 index 59f498b1588a91e4319f48a58a3415a9088f1a6f..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatting_setmode_keyboard_btn.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatting_setmode_voice_btn.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatting_setmode_voice_btn.xml deleted file mode 100644 index 3d2b5716ecbe5a6befa0b49f0e0a295941dd6e17..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatting_setmode_voice_btn.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatto_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatto_bg.xml deleted file mode 100644 index 713005aa5c9f6a024afddbd4a0b29297f29bc41f..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_chatto_bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_common_tab_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_common_tab_bg.xml deleted file mode 100644 index 923a42538782b6b2c21df4b37c12b82eb8abd2d1..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_common_tab_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_edit_text_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_edit_text_bg.xml deleted file mode 100644 index 05d910f55ac7f2afe818f4ce1a1fbf249a3a1166..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_edit_text_bg.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_mm_listitem.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_mm_listitem.xml deleted file mode 100644 index 25c09f49a3b287effb5c7aef1fb6f0391c1916cd..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_mm_listitem.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_mm_listitem_grey.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_mm_listitem_grey.xml deleted file mode 100644 index 3437b90064a7881c96245f49afe563f91d789836..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_mm_listitem_grey.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_msg_state_failed_resend.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_msg_state_failed_resend.xml deleted file mode 100644 index 77533c871c009167f37dda659618686859c5a7ab..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_msg_state_failed_resend.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_recording_hint_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_recording_hint_bg.xml deleted file mode 100644 index f199a5f7d182c6d43e7ef3b4116a3adfbbf913fd..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_recording_hint_bg.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_recording_text_hint_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_recording_text_hint_bg.xml deleted file mode 100644 index 14983f10bf75315f4a0c1ff2082a2969ce96dd19..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_recording_text_hint_bg.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_search_clear.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_search_clear.xml deleted file mode 100644 index ab4703cf77df37a27b585ac9ec7970b3a31a697a..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_search_clear.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_sidebar_background_pressed.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_sidebar_background_pressed.xml deleted file mode 100644 index fc444ed0e5e92f79237bcee6e5e6f082879dd97e..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_sidebar_background_pressed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_timestampe_bg.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_timestampe_bg.xml deleted file mode 100644 index 869049f80270bb2423a065e33f0c04efab356481..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_timestampe_bg.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_type_select_btn.xml b/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_type_select_btn.xml deleted file mode 100644 index 6d58a04b5469c6caa9f7d6913273a8cda01aa983..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/drawable/ease_type_select_btn.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/easeui/build/intermediates/res/merged/androidTest/debug/layout/ease_activity_baidumap.xml b/easeui/build/intermediates/res/merged/androidTest/debug/layout/ease_activity_baidumap.xml deleted file mode 100644 index db45c3f50f4111d531b5034afdb0437157ec6e23..0000000000000000000000000000000000000000 --- a/easeui/build/intermediates/res/merged/androidTest/debug/layout/ease_activity_baidumap.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - -