Skip to content

R
RvApp
Commit 54546307 authored by jianglx's avatar jianglx
Browse files
Options

会员模块，城市数据的更新

parent 588a279e
Show whitespace changes
Inline Side-by-side
Showing with 1318 additions and 2815 deletions
MyFrame/build.gradle
View file @ 54546307
...@@ -53,8 +53,8 @@ dependencies { ...@@ -53,8 +53,8 @@ dependencies {
api project(path: ':Utils') api project(path: ':Utils')
//鲁班图片压缩 https://github.com/Curzibn/Luban //鲁班图片压缩 https://github.com/Curzibn/Luban
api 'top.zibin:Luban:1.1.8' api 'top.zibin:Luban:1.1.8'
//权限申请 https://github.com/googlesamples/easypermissions // //权限申请 https://github.com/googlesamples/easypermissions
api 'pub.devrel:easypermissions:2.0.0' // api 'pub.devrel:easypermissions:2.0.0'
//Glide //Glide
api "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion" api "com.github.bumptech.glide:glide:$rootProject.ext.glideVersion"
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 54546307
package com.xxfc.rv; package com.xxfc.rv;
import android.Manifest;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog;
import android.app.Notification; import android.app.Notification;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.ServiceConnection; import android.content.ServiceConnection;
...@@ -21,10 +18,8 @@ import android.support.annotation.Nullable; ...@@ -21,10 +18,8 @@ import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
...@@ -58,16 +53,11 @@ import com.rv.component.utils.LogUtil; ...@@ -58,16 +53,11 @@ import com.rv.component.utils.LogUtil;
import com.rv.component.utils.RvCache; import com.rv.component.utils.RvCache;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter; import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.main.home.HomeFragment; import com.rv.home.rv.module.ui.main.home.HomeFragment;
import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean; import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
import com.rv.im.Constants;
import com.rv.im.ImService; import com.rv.im.ImService;
import com.rv.im.ImSetting; import com.rv.im.ImSetting;
import com.rv.im.broadcast.RemoteReceiver;
import com.rv.im.call.AudioOrVideoController; import com.rv.im.call.AudioOrVideoController;
import com.rv.im.mvp.view.IChatView;
import com.rv.im.util.Md5Util;
import com.rv.rvmine.MineFragment; import com.rv.rvmine.MineFragment;
import com.rv.share.WebViewActivity; import com.rv.share.WebViewActivity;
import com.rv.share.view.PromotionDialog; import com.rv.share.view.PromotionDialog;
...@@ -75,7 +65,6 @@ import com.rv.tourism.R2; ...@@ -75,7 +65,6 @@ import com.rv.tourism.R2;
import com.rv.tourism.TourismFragment; import com.rv.tourism.TourismFragment;
import com.rv.version.bean.VersionCheckBean; import com.rv.version.bean.VersionCheckBean;
import com.rv.version.receiver.UpdateAppReceiver; import com.rv.version.receiver.UpdateAppReceiver;
import com.rv.version.util.DownloadAppUtils;
import com.rv.version.util.UpdateAppUtils; import com.rv.version.util.UpdateAppUtils;
import com.xxfc.discovery.DiscoveryFragment; import com.xxfc.discovery.DiscoveryFragment;
import com.xxfc.discovery.api.DiscoveryApi; import com.xxfc.discovery.api.DiscoveryApi;
...@@ -95,13 +84,10 @@ import java.util.Map; ...@@ -95,13 +84,10 @@ import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import cn.jpush.android.api.BasicPushNotificationBuilder; import cn.jpush.android.api.BasicPushNotificationBuilder;
import cn.jpush.android.api.CustomPushNotificationBuilder;
import cn.jpush.android.api.JPushInterface; import cn.jpush.android.api.JPushInterface;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
public class MainActivity extends BaseActivity<CommonPresenter> implements EasyPermissions.PermissionCallbacks { public class MainActivity extends BaseActivity<CommonPresenter>{
private static final String TAG = MainActivity.class.getSimpleName(); private static final String TAG = MainActivity.class.getSimpleName();
...@@ -149,8 +135,8 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP ...@@ -149,8 +135,8 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
private String imPassword; private String imPassword;
private String[] permissions = new String[]{android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_EXTERNAL_STORAGE, private String[] permissions = new String[]{android.Manifest.permission.READ_PHONE_STATE,
android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO, Manifest.permission.CALL_PHONE}; android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CALL_PHONE};
public static Intent getIntent(Context context) { public static Intent getIntent(Context context) {
return new Intent(context, MainActivity.class); return new Intent(context, MainActivity.class);
...@@ -167,18 +153,8 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP ...@@ -167,18 +153,8 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false); StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
AudioOrVideoController.init(getApplicationContext(), logoutListener); AudioOrVideoController.init(getApplicationContext(), logoutListener);
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
checkPermissions();
} }
/********
* 检查所有的权限
*/
private void checkPermissions() {
if (!EasyPermissions.hasPermissions(this, permissions)) {
EasyPermissions.requestPermissions(this, "App正常使用，需要以下权限", IChatView.REQUEST_PERMISSION_FILE, permissions);
return;
}
}
@Override @Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
...@@ -450,29 +426,9 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP ...@@ -450,29 +426,9 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
} else { } else {
Toast.makeText(getApplicationContext(), "授权失败,无法下载最新App", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), "授权失败,无法下载最新App", Toast.LENGTH_SHORT).show();
} }
} else {
EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
} }
} }
@Override
public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
Log.d(TAG, "授权成功");
}
@Override
public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
Toast.makeText(this, "用户授权失败", Toast.LENGTH_SHORT).show();
if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
new AppSettingsDialog.Builder(this).
setTitle("需要权限")
.setRationale("如果没有这些权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) { if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
......
RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
View file @ 54546307
...@@ -71,8 +71,8 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> { ...@@ -71,8 +71,8 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
if (appConfig == null) { if (appConfig == null) {
if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) { if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
Toast.makeText(getApplicationContext(), "网络异常，im初始化失败，请退出重进", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), "网络异常，im初始化失败，请退出重进", Toast.LENGTH_SHORT).show();
}
return; return;
}
} else { } else {
isImInitOk = true; isImInitOk = true;
} }
......
RvWrapper/src/main/assets/city.json
View file @ 54546307
{ {
"city": [{ "city": [{
"lists": [{ "lists": [{
"name": "阿坝藏族羌族自治州", "name": "鞍山市",
"id": 513200 "id": 210300
}, {
"name": "安庆市",
"id": 340800
}, {
"name": "安阳市",
"id": 410500
}, { }, {
"name": "阿拉善盟", "name": "阿拉善盟",
"id": 152900 "id": 152900
}, {
"name": "阿坝州",
"id": 513200
}, {
"name": "安顺市",
"id": 520400
}, { }, {
"name": "阿里地区", "name": "阿里地区",
"id": 542500 "id": 542500
...@@ -13,128 +25,145 @@ ...@@ -13,128 +25,145 @@
"name": "安康市", "name": "安康市",
"id": 610900 "id": 610900
}, { }, {
"name": "安庆市", "name": "阿克苏地区",
"id": 340800 "id": 652900
}, {
"name": "鞍山市",
"id": 210300
}, {
"name": "安顺市",
"id": 520400
}, { }, {
"name": "安阳市", "name": "阿勒泰地区",
"id": 410500 "id": 654300
}, { }, {
"name": "阿拉尔市",
"id": 659002
},{
"name": "澳门特别行政区", "name": "澳门特别行政区",
"id": 820000 "id": 820000
}], }],"title": "A"
"title": "A"
}, { }, {
"lists": [{ "lists": [{
"name": "北京市", "name": "北京市",
"id": 110100 "id": 110100
}, {
"name": "白银市",
"id": 620400
}, { }, {
"name": "保定市", "name": "保定市",
"id": 130600 "id": 130600
}, {
"name": "宝鸡市",
"id": 610300
}, {
"name": "保山市",
"id": 530500
}, { }, {
"name": "包头市", "name": "包头市",
"id": 150200 "id": 150200
}, { }, {
"name": "巴中市", "name": "本溪市",
"id": 511900 "id": 210500
},{
"name": "北海市",
"id": 450500
}, {
"name": "北海新区",
"id": 371627
}, { }, {
"name": "蚌埠市", "name": "蚌埠市",
"id": 340300 "id": 340300
}, { }, {
"name": "本溪市", "name": "北海市",
"id": 210500 "id": 450500
}, {
"name": "毕节市",
"id": 520500
}, { }, {
"name": "滨州市", "name": "滨州市",
"id": 371600 "id": 371600
}, { }, {
"name": "百色市", "name": "宝鸡市",
"id": 451000 "id": 610300
}, { }, {
"name": "亳州市", "name": "亳州市",
"id": 341600 "id": 341600
}, {
"name": "巴彦淖尔市",
"id": 150800
}, {
"name": "白山市",
"id": 220600
}, {
"name": "白城市",
"id": 220800
}, {
"name": "百色市",
"id": 451000
}, {
"name": "白沙黎族自治县",
"id": 469025
}, {
"name": "巴中市",
"id": 511900
}, {
"name": "毕节地区",
"id": 520500
}, {
"name": "保山市",
"id": 530500
}, {
"name": "白银市",
"id": 620400
}, {
"name": "巴音郭楞州",
"id": 652800
}, {
"name": "博尔塔拉州",
"id": 652700
}], }],
"title": "B" "title": "B"
}, { }, {
"lists": [{ "lists": [{
"name": "重庆",
"id": 500100
}, {
"name": "成都市", "name": "成都市",
"id": 510100 "id": 510100
}, {
"name": "重庆市",
"id": 500100
}, { }, {
"name": "长沙市", "name": "长沙市",
"id": 430100 "id": 430100
}, { }, {
"name": "长春市", "name": "长春市",
"id": 220100 "id": 220100
}, {
"name": "常州市",
"id": 320400
}, { }, {
"name": "沧州市", "name": "沧州市",
"id": 130900 "id": 130900
}, {
"name": "承德市",
"id": 130800
}, { }, {
"name": "常德市", "name": "常德市",
"id": 430700 "id": 430700
}, { }, {
"name": "昌都市", "name": "郴州市",
"id": 540300 "id": 431000
}, { }, {
"name": "长治市", "name": "长治市",
"id": 140400 "id": 140400
}, { }, {
"name": "常州市", "name": "滁州市",
"id": 320400 "id": 341100
}, {
"name": "池州市",
"id": 341700
}, {
"name": "赤峰市",
"id": 150400
}, { }, {
"name": "巢湖市", "name": "巢湖市",
"id": 340181 "id": 340181
}, {
"name": "朝阳市",
"id": 211300
}, { }, {
"name": "潮州市", "name": "潮州市",
"id": 445100 "id": 445100
}, {
"name": "承德市",
"id": 130800
}, {
"name": "郴州市",
"id": 431000
}, {
"name": "赤峰市",
"id": 150400
}, {
"name": "池州市",
"id": 341700
}, { }, {
"name": "崇左市", "name": "崇左市",
"id": 451400 "id": 451400
}, { }, {
"name": "楚雄彝族自治州", "name": "澄迈县",
"id": 469023
}, {
"name": "楚雄州",
"id": 532300 "id": 532300
}, { }, {
"name": "滁州市", "name": "昌都地区",
"id": 341100 "id": 540300
}, { }, {
"name": "朝阳区", "name": "昌吉州",
"id": 110105 "id": 652300
}], }],
"title": "C" "title": "C"
}, { }, {
...@@ -144,107 +173,122 @@ ...@@ -144,107 +173,122 @@
}, { }, {
"name": "东莞市", "name": "东莞市",
"id": 441900 "id": 441900
}, {
"name": "大理白族自治州",
"id": 532900
}, {
"name": "丹东市",
"id": 210600
}, { }, {
"name": "大庆市", "name": "大庆市",
"id": 230600 "id": 230600
}, {
"name": "东营市",
"id": 370500
}, {
"name": "德州市",
"id": 371400
}, { }, {
"name": "大同市", "name": "大同市",
"id": 140200 "id": 140200
}, { }, {
"name": "大兴安岭地区", "name": "大理州",
"id": 232700 "id": 532900
}, { }, {
"name": "德宏傣族景颇族自治州", "name": "丹东市",
"id": 533100 "id": 210600
}, { }, {
"name": "德阳市", "name": "德阳市",
"id": 510600 "id": 510600
}, { }, {
"name": "德州市", "name": "大兴安岭地区",
"id": 371400 "id": 232700
}, { }, {
"name": "定西市", "name": "儋州市",
"id": 621100 "id": 469003
}, { }, {
"name": "迪庆藏族自治州", "name": "东方市",
"id": 469007
}, {
"name": "定安县",
"id": 469021
}, {
"name": "达州市",
"id": 511700
}, {
"name": "德宏州",
"id": 533100
}, {
"name": "迪庆州",
"id": 533400 "id": 533400
}, { }, {
"name": "东营市", "name": "定西市",
"id": 370500 "id": 621100
}], }],
"title": "D" "title": "D"
}, { }, {
"lists": [{ "lists": [{
"name": "鄂尔多斯市", "name": "鄂尔多斯市",
"id": 150600 "id": 150600
}, {
"name": "恩施土家族苗族自治州",
"id": 422800
}, { }, {
"name": "鄂州市", "name": "鄂州市",
"id": 420700 "id": 420700
}, {
"name": "恩施州",
"id": 422800
}], }],
"title": "E" "title": "E"
}, { }, {
"lists": [{ "lists": [{
"name": "福州市", "name": "福州市",
"id": 350100 "id": 350100
}, {
"name": "防城港市",
"id": 450600
}, { }, {
"name": "佛山市", "name": "佛山市",
"id": 440600 "id": 440600
}, { }, {
"name": "抚顺市", "name": "抚顺市",
"id": 210400 "id": 210400
}, {
"name": "抚州市",
"id": 361000
}, { }, {
"name": "阜新市", "name": "阜新市",
"id": 210900 "id": 210900
}, { }, {
"name": "阜阳市", "name": "阜阳市",
"id": 341200 "id": 341200
}, {
"name": "抚州市",
"id": 361000
}, {
"name": "防城港市",
"id": 450600
}], }],
"title": "F" "title": "F"
}, { }, {
"lists": [{ "lists": [{
"name": "广州市", "name": "广州市",
"id": 440100 "id": 440100
}, {
"name": "桂林市",
"id": 450300
}, { }, {
"name": "贵阳市", "name": "贵阳市",
"id": 520100 "id": 520100
}, {
"name": "甘南县",
"id": 230225
}, { }, {
"name": "赣州市", "name": "赣州市",
"id": 360700 "id": 360700
}, { }, {
"name": "甘孜藏族自治州", "name": "桂林市",
"id": 513300 "id": 450300
}, { }, {
"name": "广安市", "name": "贵港市",
"id": 511600 "id": 450800
}, { }, {
"name": "广元市", "name": "广元市",
"id": 510800 "id": 510800
}, { }, {
"name": "贵港市", "name": "广安市",
"id": 450800 "id": 511600
}, { }, {
"name": "果洛藏族自治州", "name": "甘孜州",
"id": 513300
}, {
"name": "甘南州",
"id": 623000
}, {
"name": "固原市",
"id": 640400
}, {
"name": "果洛州",
"id": 632600 "id": 632600
}], }],
"title": "G" "title": "G"
...@@ -252,42 +296,57 @@ ...@@ -252,42 +296,57 @@
"lists": [{ "lists": [{
"name": "杭州市", "name": "杭州市",
"id": 330100 "id": 330100
}, {
"name": "哈尔滨市",
"id": 230100
}, { }, {
"name": "合肥市", "name": "合肥市",
"id": 340100 "id": 340100
}, { }, {
"name": "海口市", "name": "哈尔滨市",
"id": 460100 "id": 230100
}, { }, {
"name": "呼和浩特市", "name": "呼和浩特市",
"id": 150100 "id": 150100
}, { }, {
"name": "海北藏族自治州", "name": "邯郸市",
"id": 632200 "id": 130400
}, { }, {
"name": "海东市", "name": "葫芦岛市",
"id": 630200 "id": 211400
}, { }, {
"name": "海南区", "name": "衡水市",
"id": 150303 "id": 131100
}, { }, {
"name": "海西蒙古族藏族自治州", "name": "海口市",
"id": 632800 "id": 460100
}, { }, {
"name": "邯郸市", "name": "湖州市",
"id": 130400 "id": 330500
}, {
"name": "淮安市",
"id": 320800
}, {
"name": "衡阳市",
"id": 430400
}, { }, {
"name": "汉中市", "name": "汉中市",
"id": 610700 "id": 610700
}, { }, {
"name": "鹤壁市", "name": "菏泽市",
"id": 410600 "id": 371700
}, { }, {
"name": "河池市", "name": "惠州市",
"id": 451200 "id": 441300
}, {
"name": "黄山市",
"id": 341000
}, {
"name": "淮南市",
"id": 340400
}, {
"name": "淮北市",
"id": 340600
}, {
"name": "呼伦贝尔市",
"id": 150700
}, { }, {
"name": "鹤岗市", "name": "鹤岗市",
"id": 230400 "id": 230400
...@@ -295,11 +354,17 @@ ...@@ -295,11 +354,17 @@
"name": "黑河市", "name": "黑河市",
"id": 231100 "id": 231100
}, { }, {
"name": "衡水市", "name": "黄石市",
"id": 131100 "id": 420200
}, { }, {
"name": "衡阳市", "name": "黄冈市",
"id": 430400 "id": 421100
}, {
"name": "怀化市",
"id": 431200
}, {
"name": "鹤壁市",
"id": 410600
}, { }, {
"name": "河源市", "name": "河源市",
"id": 441600 "id": 441600
...@@ -307,47 +372,32 @@ ...@@ -307,47 +372,32 @@
"name": "贺州市", "name": "贺州市",
"id": 451100 "id": 451100
}, { }, {
"name": "红河哈尼族彝族自治州", "name": "河池市",
"id": 451200
}, {
"name": "红河州",
"id": 532500 "id": 532500
}, { }, {
"name": "淮安市", "name": "海东地区",
"id": 320800 "id": 630200
}, { }, {
"name": "淮北市", "name": "海北州",
"id": 340600 "id": 632200
}, { }, {
"name": "怀化市", "name": "黄南州",
"id": 431200 "id": 632300
}, { }, {
"name": "淮南市", "name": "海南州",
"id": 340400 "id": 632500
}, { }, {
"name": "黄冈市", "name": "海西州",
"id": 421100 "id": 632800
}, {
"name": "黄南藏族自治州",
"id": 632300
}, {
"name": "黄山市",
"id": 341000
}, {
"name": "黄石市",
"id": 420200
}, {
"name": "惠州市",
"id": 441300
}, {
"name": "葫芦岛市",
"id": 211400
}, {
"name": "呼伦贝尔市",
"id": 150700
}, { }, {
"name": "湖州市", "name": "哈密地区",
"id": 330500 "id": 652200
}, { }, {
"name": "菏泽市", "name": "和田地区",
"id": 371700 "id": 653200
}], }],
"title": "H" "title": "H"
}, { }, {
...@@ -355,59 +405,65 @@ ...@@ -355,59 +405,65 @@
"name": "济南市", "name": "济南市",
"id": 370100 "id": 370100
}, { }, {
"name": "佳木斯市", "name": "锦州市",
"id": 230800 "id": 210700
}, { }, {
"name": "吉安市", "name": "晋中市",
"id": 360800 "id": 140700
}, { }, {
"name": "江门市", "name": "吉林市",
"id": 440700 "id": 220200
}, { }, {
"name": "焦作市", "name": "济宁市",
"id": 410800 "id": 370800
}, {
"name": "金华市",
"id": 330700
}, { }, {
"name": "嘉兴市", "name": "嘉兴市",
"id": 330400 "id": 330400
}, { }, {
"name": "嘉峪关市", "name": "九江市",
"id": 620200 "id": 360400
}, {
"name": "荆州市",
"id": 421000
}, {
"name": "景德镇市",
"id": 360200
}, {
"name": "江门市",
"id": 440700
}, { }, {
"name": "揭阳市", "name": "揭阳市",
"id": 445200 "id": 445200
}, { }, {
"name": "吉林省", "name": "焦作市",
"id": 220000 "id": 410800
}, {
"name": "金昌市",
"id": 620300
}, { }, {
"name": "晋城市", "name": "晋城市",
"id": 140500 "id": 140500
}, { }, {
"name": "景德镇市", "name": "鸡西市",
"id": 360200 "id": 230300
}, {
"name": "荆门市",
"id": 420800
}, { }, {
"name": "荆州市", "name": "佳木斯市",
"id": 421000 "id": 230800
}, { }, {
"name": "金华市", "name": "吉安市",
"id": 330700 "id": 360800
}, { }, {
"name": "济宁市", "name": "荆门市",
"id": 370800 "id": 420800
}, { }, {
"name": "晋中市", "name": "济源市",
"id": 140700 "id": 419001
}, { }, {
"name": "锦州市", "name": "金昌市",
"id": 210700 "id": 620300
}, { }, {
"name": "九江市", "name": "嘉峪关市",
"id": 360400 "id": 620200
}, { }, {
"name": "酒泉市", "name": "酒泉市",
"id": 620900 "id": 620900
...@@ -420,75 +476,69 @@ ...@@ -420,75 +476,69 @@
}, { }, {
"name": "开封市", "name": "开封市",
"id": 410200 "id": 410200
}, {
"name": "喀什地区",
"id": 653100
}, {
"name": "克拉玛依市",
"id": 650200
}, {
"name": "克孜勒苏柯州",
"id": 653000
}], }],
"title": "K" "title": "K"
}, { }, {
"lists": [{ "lists": [{
"name": "洛阳市",
"id": 410300
}, {
"name": "兰州市", "name": "兰州市",
"id": 620100 "id": 620100
}, {
"name": "拉萨市",
"id": 540100
}, {
"name": "来宾市",
"id": 451300
}, {
"name": "莱芜市",
"id": 371200
}, { }, {
"name": "廊坊市", "name": "廊坊市",
"id": 131000 "id": 131000
}, { }, {
"name": "乐山市", "name": "临沂市",
"id": 511100 "id": 371300
}, { }, {
"name": "凉山彝族自治州", "name": "辽阳市",
"id": 513400 "id": 211000
}, { }, {
"name": "连云港市", "name": "连云港市",
"id": 320700 "id": 320700
}, {
"name": "泸州市",
"id": 510500
}, {
"name": "莱芜市",
"id": 371200
}, { }, {
"name": "聊城市", "name": "聊城市",
"id": 371500 "id": 371500
}, { }, {
"name": "辽阳市", "name": "柳州市",
"id": 211000 "id": 450200
}, {
"name": "辽源市",
"id": 220400
}, { }, {
"name": "丽江市", "name": "丽江市",
"id": 530700 "id": 530700
}, {
"name": "临沧市",
"id": 530900
}, {
"name": "临汾市",
"id": 141000
}, {
"name": "临夏回族自治州",
"id": 622900
}, {
"name": "临沂市",
"id": 371300
}, {
"name": "林芝地区",
"id": 542600
}, { }, {
"name": "丽水市", "name": "丽水市",
"id": 331100 "id": 331100
}, {
"name": "拉萨市",
"id": 540100
}, { }, {
"name": "六安市", "name": "六安市",
"id": 341500 "id": 341500
}, { }, {
"name": "六盘水市", "name": "临汾市",
"id": 520200 "id": 141000
}, { }, {
"name": "柳州市", "name": "吕梁市",
"id": 450200 "id": 141100
}, { }, {
"name": "陇南市", "name": "辽源市",
"id": 621200 "id": 220400
}, { }, {
"name": "龙岩市", "name": "龙岩市",
"id": 350800 "id": 350800
...@@ -499,35 +549,53 @@ ...@@ -499,35 +549,53 @@
"name": "漯河市", "name": "漯河市",
"id": 411100 "id": 411100
}, { }, {
"name": "洛阳市", "name": "来宾市",
"id": 410300 "id": 451300
}, { }, {
"name": "泸州市", "name": "临高县",
"id": 510500 "id": 469024
}, { }, {
"name": "吕梁市", "name": "乐山市",
"id": 141100 "id": 511100
}, {
"name": "凉山州",
"id": 513400
}, {
"name": "六盘水市",
"id": 520200
}, {
"name": "临沧市",
"id": 530900
}, {
"name": "林芝地区",
"id": 542600
}, {
"name": "陇南市",
"id": 621200
}, {
"name": "临夏州",
"id": 622900
}], }],
"title": "L" "title": "L"
}, { }, {
"lists": [{ "lists": [{
"name": "绵阳市",
"id": 510700
}, {
"name": "马鞍山市", "name": "马鞍山市",
"id": 340500 "id": 340500
}, {
"name": "牡丹江市",
"id": 231000
}, { }, {
"name": "茂名市", "name": "茂名市",
"id": 440900 "id": 440900
}, {
"name": "峨眉山市",
"id": 511181
}, { }, {
"name": "梅州市", "name": "梅州市",
"id": 441400 "id": 441400
}, { }, {
"name": "绵阳市", "name": "眉山市",
"id": 510700 "id": 511400
}, {
"name": "牡丹江市",
"id": 231000
}], }],
"title": "M" "title": "M"
}, { }, {
...@@ -535,20 +603,17 @@ ...@@ -535,20 +603,17 @@
"name": "南京市", "name": "南京市",
"id": 320100 "id": 320100
}, { }, {
"name": "南昌市", "name": "宁波市",
"id": 360100 "id": 330200
}, { }, {
"name": "南宁市", "name": "南宁市",
"id": 450100 "id": 450100
}, { }, {
"name": "宁波市", "name": "南昌市",
"id": 330200 "id": 360100
}, { }, {
"name": "南充市", "name": "南充市",
"id": 511300 "id": 511300
}, {
"name": "南平市",
"id": 350700
}, { }, {
"name": "南通市", "name": "南通市",
"id": 320600 "id": 320600
...@@ -556,41 +621,47 @@ ...@@ -556,41 +621,47 @@
"name": "南阳市", "name": "南阳市",
"id": 411300 "id": 411300
}, { }, {
"name": "那曲地区", "name": "宁德市",
"id": 542400 "id": 350900
}, {
"name": "南平市",
"id": 350700
}, { }, {
"name": "内江市", "name": "内江市",
"id": 511000 "id": 511000
}, { }, {
"name": "宁德市", "name": "怒江州",
"id": 350900
}, {
"name": "怒江傈僳族自治州",
"id": 533300 "id": 533300
}, {
"name": "那曲地区",
"id": 542400
}], }],
"title": "N" "title": "N"
}, { }, {
"lists": [{ "lists": [{
"name": "盘锦市", "name": "平顶山市",
"id": 211100 "id": 410400
}, { }, {
"name": "攀枝花市", "name": "攀枝花市",
"id": 510400 "id": 510400
}, { }, {
"name": "平顶山市", "name": "莆田市",
"id": 410400 "id": 350300
}, { }, {
"name": "平凉市", "name": "盘锦市",
"id": 620800 "id": 211100
}, {
"name": "濮阳市",
"id": 410900
}, { }, {
"name": "萍乡市", "name": "萍乡市",
"id": 360300 "id": 360300
}, { }, {
"name": "莆田市", "name": "普洱市",
"id": 350300 "id": 530800
}, { }, {
"name": "濮阳市", "name": "平凉市",
"id": 410900 "id": 620800
}], }],
"title": "P" "title": "P"
}, { }, {
...@@ -598,59 +669,65 @@ ...@@ -598,59 +669,65 @@
"name": "青岛市", "name": "青岛市",
"id": 370200 "id": 370200
}, { }, {
"name": "黔东南苗族侗族自治州", "name": "泉州市",
"id": 522600 "id": 350500
}, {
"name": "黔南布依族苗族自治州",
"id": 522700
}, {
"name": "黔西南布依族苗族自治州",
"id": 522300
}, {
"name": "庆阳市",
"id": 621000
}, {
"name": "清远市",
"id": 441800
}, { }, {
"name": "秦皇岛市", "name": "秦皇岛市",
"id": 130300 "id": 130300
}, {
"name": "钦州市",
"id": 450700
}, { }, {
"name": "齐齐哈尔市", "name": "齐齐哈尔市",
"id": 230200 "id": 230200
}, {
"name": "泉州市",
"id": 350500
}, { }, {
"name": "曲靖市", "name": "曲靖市",
"id": 530300 "id": 530300
}, { }, {
"name": "衢州市", "name": "衢州市",
"id": 330800 "id": 330800
}],
"title": "Q"
}, { }, {
"lists": [{ "name": "清远市",
"name": "日喀则市", "id": 441800
"id": 540200 }, {
"name": "七台河市",
"id": 230900
}, {
"name": "潜江市",
"id": 429005
}, {
"name": "钦州市",
"id": 450700
}, {
"name": "琼海市",
"id": 469002
}, {
"name": "黔西南州",
"id": 522300
}, {
"name": "黔东南州",
"id": 522600
}, {
"name": "黔南州",
"id": 522700
}, { }, {
"name": "庆阳市",
"id": 621000
}],
"title": "Q"
}, {
"lists": [{
"name": "日照市", "name": "日照市",
"id": 371100 "id": 371100
}, {
"name": "日喀则地区",
"id": 540200
}], }],
"title": "R" "title": "R"
}, { }, {
"lists": [{ "lists": [{
"name": "上海市",
"id": 310100
}, {
"name": "深圳市", "name": "深圳市",
"id": 440300 "id": 440300
}, { }, {
"name": "苏州市", "name": "上海市",
"id": 320500 "id": 310100
}, { }, {
"name": "沈阳市", "name": "沈阳市",
"id": 210100 "id": 210100
...@@ -658,110 +735,137 @@ ...@@ -658,110 +735,137 @@
"name": "石家庄市", "name": "石家庄市",
"id": 130100 "id": 130100
}, { }, {
"name": "三门峡市", "name": "苏州市",
"id": 411200 "id": 320500
}, {
"name": "三明市",
"id": 350400
}, { }, {
"name": "三亚市", "name": "三亚市",
"id": 460200 "id": 460200
}, { }, {
"name": "商洛市", "name": "绍兴市",
"id": 611000 "id": 330600
}, { }, {
"name": "商丘市", "name": "绥化市",
"id": 411400 "id": 231200
}, { }, {
"name": "上饶市", "name": "四平市",
"id": 361100 "id": 220300
}, { }, {
"name": "山南地区", "name": "宿迁市",
"id": 542200 "id": 321300
}, { }, {
"name": "汕头市", "name": "汕头市",
"id": 440500 "id": 440500
}, { }, {
"name": "汕尾市", "name": "商丘市",
"id": 441500 "id": 411400
}, { }, {
"name": "韶关市", "name": "石河子市",
"id": 440200 "id": 659001
}, { }, {
"name": "绍兴市", "name": "宿州市",
"id": 330600 "id": 341300
}, { }, {
"name": "邵阳市", "name": "朔州市",
"id": 430500 "id": 140600
}, {
"name": "松原市",
"id": 220700
}, {
"name": "双鸭山市",
"id": 230500
}, {
"name": "上饶市",
"id": 361100
}, {
"name": "三明市",
"id": 350400
}, { }, {
"name": "十堰市", "name": "十堰市",
"id": 420300 "id": 420300
}, { }, {
"name": "朔州市", "name": "随州市",
"id": 140600 "id": 421300
}, { }, {
"name": "四平市", "name": "神农架林区",
"id": 220300 "id": 429021
}, { }, {
"name": "绥化市", "name": "邵阳市",
"id": 231200 "id": 430500
}, {
"name": "三门峡市",
"id": 411200
}, {
"name": "韶关市",
"id": 440200
}, {
"name": "汕尾市",
"id": 441500
}, { }, {
"name": "遂宁市", "name": "遂宁市",
"id": 510900 "id": 510900
}, { }, {
"name": "随州市", "name": "山南地区",
"id": 421300 "id": 542200
}, { }, {
"name": "宿迁市", "name": "商洛市",
"id": 321300 "id": 611000
}, { }, {
"name": "宿州市", "name": "石嘴山市",
"id": 341300 "id": 640200
}], }],
"title": "S" "title": "S"
}, { }, {
"lists": [{ "lists": [{
"name": "天津", "name": "天津市",
"id": 120100 "id": 120100
}, { }, {
"name": "太原市", "name": "太原市",
"id": 140100 "id": 140100
}, { }, {
"name": "泰安市", "name": "唐山市",
"id": 370900 "id": 130200
}, { }, {
"name": "泰州市", "name": "铁岭市",
"id": 321200 "id": 211200
}, { }, {
"name": "台州市", "name": "台州市",
"id": 331000 "id": 331000
}, { }, {
"name": "唐山市", "name": "泰州市",
"id": 130200 "id": 321200
}, {
"name": "泰安市",
"id": 370900
}, { }, {
"name": "天水市", "name": "天水市",
"id": 620500 "id": 620500
}, { }, {
"name": "铁岭市", "name": "铜陵市",
"id": 211200 "id": 340700
}, { }, {
"name": "铜川市", "name": "通辽市",
"id": 610200 "id": 150500
}, { }, {
"name": "通化市", "name": "通化市",
"id": 220500 "id": 220500
}, { }, {
"name": "通辽市", "name": "天门市",
"id": 150500 "id": 429006
}, { }, {
"name": "铜陵市", "name": "屯昌县",
"id": 340700 "id": 469022
}, { }, {
"name": "铜仁市", "name": "铜仁地区",
"id": 520600 "id": 520600
}, { }, {
"name": "台湾", "name": "铜川市",
"id": 710000 "id": 610200
}, {
"name": "吐鲁番地区",
"id": 652100
}, {
"name": "塔城地区",
"id": 654200
}], }],
"title": "T" "title": "T"
}, { }, {
...@@ -769,530 +873,263 @@ ...@@ -769,530 +873,263 @@
"name": "武汉市", "name": "武汉市",
"id": 420100 "id": 420100
}, { }, {
"name": "乌鲁木齐市", "name": "威海市",
"id": 650100 "id": 371000
}, { }, {
"name": "无锡市", "name": "无锡市",
"id": 320200 "id": 320200
}, { }, {
"name": "威海市", "name": "乌鲁木齐市",
"id": 371000 "id": 650100
}, { }, {
"name": "潍坊市", "name": "潍坊市",
"id": 370700 "id": 370700
}, {
"name": "文山壮族苗族自治州",
"id": 532600
}, { }, {
"name": "温州市", "name": "温州市",
"id": 330300 "id": 330300
}, {
"name": "乌海市",
"id": 150300
}, { }, {
"name": "芜湖市", "name": "芜湖市",
"id": 340200 "id": 340200
}, {
"name": "乌海市",
"id": 150300
}, { }, {
"name": "乌兰察布市", "name": "乌兰察布市",
"id": 150900 "id": 150900
}, {
"name": "梧州市",
"id": 450400
}, {
"name": "五指山市",
"id": 469001
}, {
"name": "文昌市",
"id": 469005
}, {
"name": "万宁市",
"id": 469006
}, {
"name": "文山州",
"id": 532600
}, {
"name": "渭南市",
"id": 610500
}, { }, {
"name": "武威市", "name": "武威市",
"id": 620600 "id": 620600
}, { }, {
"name": "梧州市", "name": "吴忠市",
"id": 450400 "id": 640300
}], }],
"title": "W" "title": "W"
}, { }, {
"lists": [{ "lists": [{
"name": "厦门市",
"id": 350200
}, {
"name": "西安市", "name": "西安市",
"id": 610100 "id": 610100
}, { }, {
"name": "西宁市", "name": "西宁市",
"id": 630100 "id": 630100
}, { }, {
"name": "襄阳市", "name": "厦门市",
"id": 420600 "id": 350200
}, {
"name": "徐州市",
"id": 320300
}, { }, {
"name": "湘潭市", "name": "湘潭市",
"id": 430300 "id": 430300
}, {
"name": "湘西土家族苗族自治州",
"id": 433100
}, {
"name": "咸宁市",
"id": 421200
}, {
"name": "咸阳市",
"id": 610400
}, {
"name": "孝感市",
"id": 420900
}, { }, {
"name": "邢台市", "name": "邢台市",
"id": 130500 "id": 130500
}, {
"name": "襄阳市",
"id": 420600
}, { }, {
"name": "新乡市", "name": "新乡市",
"id": 410700 "id": 410700
}, { }, {
"name": "信阳市", "name": "许昌市",
"id": 411500 "id": 411000
}, {
"name": "咸阳市",
"id": 610400
}, { }, {
"name": "新余市", "name": "新余市",
"id": 360500 "id": 360500
}, {
"name": "忻州市",
"id": 140900
}, {
"name": "西双版纳傣族自治州",
"id": 532800
}, { }, {
"name": "宣城市", "name": "宣城市",
"id": 341800 "id": 341800
}, { }, {
"name": "许昌市", "name": "忻州市",
"id": 411000 "id": 140900
}, {
"name": "徐州市",
"id": 320300
}, {
"name": "香港特别行政区",
"id": 810000
}, { }, {
"name": "锡林郭勒盟", "name": "锡林郭勒盟",
"id": 152500 "id": 152500
}, { }, {
"name": "兴安盟", "name": "兴安盟",
"id": 152200 "id": 152200
}],
"title": "X"
}, {
"lists": [{
"name": "银川市",
"id": 640100
}, {
"name": "雅安市",
"id": 511800
}, { }, {
"name": "延安市", "name": "孝感市",
"id": 610600 "id": 420900
}, { }, {
"name": "延边朝鲜族自治州", "name": "咸宁市",
"id": 222400 "id": 421200
}, { }, {
"name": "盐城市", "name": "仙桃市",
"id": 320900 "id": 429004
}, { }, {
"name": "阳江市", "name": "湘西州",
"id": 441700 "id": 433100
}, { }, {
"name": "阳泉市", "name": "信阳市",
"id": 140300 "id": 411500
}, { }, {
"name": "扬州市", "name": "西双版纳州",
"id": 321000 "id": 532800
}],
"title": "X"
}, { }, {
"lists": [{
"name": "烟台市", "name": "烟台市",
"id": 370600 "id": 370600
}, { }, {
"name": "宜宾市", "name": "银川市",
"id": 511500 "id": 640100
}, { }, {
"name": "宜昌市", "name": "宜昌市",
"id": 420500 "id": 420500
}, { }, {
"name": "宜春市", "name": "岳阳市",
"id": 360900 "id": 430600
}, { }, {
"name": "营口市", "name": "营口市",
"id": 210800 "id": 210800
}, { }, {
"name": "益阳市", "name": "扬州市",
"id": 430900 "id": 321000
}, {
"name": "永州市",
"id": 431100
}, {
"name": "岳阳市",
"id": 430600
}, { }, {
"name": "榆林市", "name": "盐城市",
"id": 610800 "id": 320900
}, { }, {
"name": "运城市", "name": "运城市",
"id": 140800 "id": 140800
}, { }, {
"name": "云浮市", "name": "宜宾市",
"id": 445300 "id": 511500
}, { }, {
"name": "玉树藏族自治州", "name": "阳泉市",
"id": 632700 "id": 140300
}, { }, {
"name": "玉溪市", "name": "延吉市",
"id": 530400 "id": 222401
}, { }, {
"name": "玉林市", "name": "玉林市",
"id": 450900 "id": 450900
}],
"title": "Y"
}, { }, {
"lists": [{ "name": "延安市",
"name": "杂多县", "id": 610600
"id": 632722
}, {
"name": "赞皇县",
"id": 130129
}, {
"name": "枣强县",
"id": 131121
}, { }, {
"name": "枣阳市", "name": "榆林市",
"id": 420683 "id": 610800
}, { }, {
"name": "枣庄市", "name": "伊春市",
"id": 370400 "id": 230700
}, { }, {
"name": "泽库县", "name": "鹰潭市",
"id": 632323 "id": 360600
}, { }, {
"name": "曾都区", "name": "宜春市",
"id": 421303 "id": 360900
}, { }, {
"name": "泽普县", "name": "益阳市",
"id": 653124 "id": 430900
}, { }, {
"name": "泽州县", "name": "永州市",
"id": 140525 "id": 431100
}, { }, {
"name": "札达县", "name": "阳江市",
"id": 542522 "id": 441700
}, { }, {
"name": "扎赉特旗", "name": "云浮市",
"id": 152223 "id": 445300
}, { }, {
"name": "扎兰屯市", "name": "雅安市",
"id": 150783 "id": 511800
}, { }, {
"name": "扎鲁特旗", "name": "玉溪市",
"id": 150526 "id": 530400
}, { }, {
"name": "扎囊县", "name": "玉树州",
"id": 542222 "id": 632700
}, { }, {
"name": "张北县", "name": "伊犁州",
"id": 130722 "id": 654000
}],
"title": "Y"
}, { }, {
"name": "张店区", "lists": [{
"id": 370303 "name": "郑州市",
"id": 410100
}, { }, {
"name": "章贡区", "name": "遵义市",
"id": 360702 "id": 520300
}, { }, {
"name": "张家港市", "name": "株洲市",
"id": 320582 "id": 430200
}, { }, {
"name": "张家界市", "name": "淄博市",
"id": 430800 "id": 370300
}, { }, {
"name": "张家口市", "name": "张家口市",
"id": 130700 "id": 130700
}, { }, {
"name": "漳平市", "name": "珠海市",
"id": 350881 "id": 440400
}, {
"name": "漳浦县",
"id": 350623
}, {
"name": "章丘市",
"id": 370181
}, {
"name": "樟树市",
"id": 360982
}, {
"name": "张湾区",
"id": 420303
}, {
"name": "彰武县",
"id": 210922
}, {
"name": "临漳县",
"id": 130423
}, {
"name": "张掖市",
"id": 620700
}, {
"name": "漳州市",
"id": 350600
}, {
"name": "长子县",
"id": 140428
}, {
"name": "湛河区",
"id": 410411
}, {
"name": "湛江市",
"id": 440800
}, {
"name": "站前区",
"id": 210802
}, {
"name": "沾益县",
"id": 530328
}, {
"name": "诏安县",
"id": 350624
}, {
"name": "召陵区",
"id": 411104
}, {
"name": "昭平县",
"id": 451121
}, {
"name": "肇庆市",
"id": 441200
}, {
"name": "昭通市",
"id": 530600
}, {
"name": "赵县",
"id": 130133
}, {
"name": "昭阳区",
"id": 530602
}, {
"name": "招远市",
"id": 370685
}, {
"name": "肇源县",
"id": 230622
}, {
"name": "肇州县",
"id": 230621
}, {
"name": "柞水县",
"id": 611026
}, {
"name": "柘城县",
"id": 411424
}, {
"name": "浙江省",
"id": 330000
}, {
"name": "镇安县",
"id": 611025
}, {
"name": "振安区",
"id": 210604
}, {
"name": "镇巴县",
"id": 610728
}, {
"name": "正安县",
"id": 520324
}, {
"name": "正定县",
"id": 130123
}, {
"name": "正蓝旗",
"id": 152530
}, {
"name": "正宁县",
"id": 621025
}, {
"name": "蒸湘区",
"id": 430408
}, {
"name": "正镶白旗",
"id": 152529
}, {
"name": "正阳县",
"id": 411724
}, {
"name": "郑州市",
"id": 410100
}, {
"name": "镇海区",
"id": 330211
}, { }, {
"name": "镇江市", "name": "镇江市",
"id": 321100 "id": 321100
}, {
"name": "浈江区",
"id": 440204
}, {
"name": "镇康县",
"id": 530924
}, {
"name": "镇赉县",
"id": 220821
}, {
"name": "镇平县",
"id": 411324
}, {
"name": "振兴区",
"id": 210603
}, {
"name": "镇雄县",
"id": 530627
}, {
"name": "镇原县",
"id": 621027
}, {
"name": "志丹县",
"id": 610625
}, {
"name": "治多县",
"id": 632724
}, {
"name": "芝罘区",
"id": 370602
}, {
"name": "枝江市",
"id": 420583
}, {
"name": "芷江侗族自治县",
"id": 431228
}, {
"name": "织金县",
"id": 520524
}, {
"name": "中方县",
"id": 431221
}, {
"name": "中江县",
"id": 510623
}, {
"name": "钟楼区",
"id": 320404
}, {
"name": "中牟县",
"id": 410122
}, {
"name": "中宁县",
"id": 640521
}, {
"name": "中山区",
"id": 210202
}, {
"name": "中山市",
"id": 442000
}, {
"name": "钟山区",
"id": 520201
}, {
"name": "钟山县",
"id": 451122
}, {
"name": "中卫市",
"id": 640500
}, {
"name": "钟祥市",
"id": 420881
}, {
"name": "中阳县",
"id": 141129
}, {
"name": "中原区",
"id": 410102
}, {
"name": "周村区",
"id": 370306
}, { }, {
"name": "周口市", "name": "周口市",
"id": 411600 "id": 411600
}, { }, {
"name": "周宁县", "name": "中山市",
"id": 350925 "id": 442000
}, { }, {
"name": "舟曲县", "name": "漳州市",
"id": 623023 "id": 350600
}, { }, {
"name": "舟山市", "name": "舟山市",
"id": 330900 "id": 330900
}, { }, {
"name": "周至县", "name": "湛江市",
"id": 610124 "id": 440800
}, {
"name": "庄河市",
"id": 210283
}, {
"name": "诸城市",
"id": 370782
}, { }, {
"name": "珠海市", "name": "肇庆市",
"id": 440400 "id": 441200
}, { }, {
"name": "珠晖区", "name": "枣庄市",
"id": 430405 "id": 370400
}, { }, {
"name": "诸暨市", "name": "张家界市",
"id": 330681 "id": 430800
}, { }, {
"name": "驻马店市", "name": "驻马店市",
"id": 411700 "id": 411700
}, {
"name": "准格尔旗",
"id": 150622
}, {
"name": "涿鹿县",
"id": 130731
}, {
"name": "卓尼县",
"id": 623022
}, {
"name": "涿州市",
"id": 130681
}, {
"name": "卓资县",
"id": 150921
}, {
"name": "珠山区",
"id": 360203
}, {
"name": "竹山县",
"id": 420323
}, {
"name": "竹溪县",
"id": 420324
}, {
"name": "株洲市",
"id": 430200
}, {
"name": "株洲县",
"id": 430221
}, {
"name": "淄博市",
"id": 370300
}, {
"name": "子长县",
"id": 610623
}, {
"name": "淄川区",
"id": 370302
}, { }, {
"name": "自贡市", "name": "自贡市",
"id": 510300 "id": 510300
}, { }, {
"name": "秭归县", "name": "资阳市",
"id": 420527 "id": 512000
}, {
"name": "紫金县",
"id": 441621
}, {
"name": "自流井区",
"id": 510302
}, { }, {
"name": "资溪县", "name": "昭通市",
"id": 361028 "id": 530600
}, { }, {
"name": "资兴市", "name": "张掖市",
"id": 431081 "id": 620700
}, { }, {
"name": "资阳区", "name": "中卫市",
"id": 430902 "id": 640500
}], }],
"title": "Z" "title": "Z"
}] }]
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseLazyFragment.java 0 → 100644
View file @ 54546307
package com.ruiwenliu.wrapper.base;
import android.os.Bundle;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
public abstract class BaseLazyFragment<P extends MvpPresenter> extends BaseFragment<P> {
@Override
public int getViewLayout() {
return 0;
}
@Override
protected void initView(Bundle savedInstanceState) {
}
@Override
protected void loadData(Bundle savedInstanceState) {
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
}
RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/UserInfoBean.java
View file @ 54546307
...@@ -34,6 +34,8 @@ public class UserInfoBean extends BaseBean implements Serializable { ...@@ -34,6 +34,8 @@ public class UserInfoBean extends BaseBean implements Serializable {
private String icon ; private String icon ;
private String bigIcon ;
//用户id //用户id
private Integer userid; private Integer userid;
//imid //imid
...@@ -291,5 +293,13 @@ public class UserInfoBean extends BaseBean implements Serializable { ...@@ -291,5 +293,13 @@ public class UserInfoBean extends BaseBean implements Serializable {
public void setPositionName(String positionName) { public void setPositionName(String positionName) {
this.positionName = positionName; this.positionName = positionName;
} }
public String getBigIcon() {
return bigIcon;
}
public void setBigIcon(String bigIcon) {
this.bigIcon = bigIcon;
}
} }
} }
module_home/src/main/assets/city.json deleted 100644 → 0
View file @ 588a279e
{
"city": [{
"lists": [{
"name": "阿坝藏族羌族自治州",
"id": 513200
}, {
"name": "阿拉善盟",
"id": 152900
}, {
"name": "阿里地区",
"id": 542500
}, {
"name": "安康市",
"id": 610900
}, {
"name": "安庆市",
"id": 340800
}, {
"name": "鞍山市",
"id": 210300
}, {
"name": "安顺市",
"id": 520400
}, {
"name": "安阳市",
"id": 410500
}, {
"name": "澳门特别行政区",
"id": 820000
}],
"title": "A"
}, {
"lists": [{
"name": "北京市",
"id": 110100
}, {
"name": "白银市",
"id": 620400
}, {
"name": "保定市",
"id": 130600
}, {
"name": "宝鸡市",
"id": 610300
}, {
"name": "保山市",
"id": 530500
}, {
"name": "包头市",
"id": 150200
}, {
"name": "巴中市",
"id": 511900
},{
"name": "北海市",
"id": 450500
}, {
"name": "北海新区",
"id": 371627
}, {
"name": "蚌埠市",
"id": 340300
}, {
"name": "本溪市",
"id": 210500
}, {
"name": "毕节市",
"id": 520500
}, {
"name": "滨州市",
"id": 371600
}, {
"name": "百色市",
"id": 451000
}, {
"name": "亳州市",
"id": 341600
}],
"title": "B"
}, {
"lists": [{
"name": "重庆",
"id": 500100
}, {
"name": "成都市",
"id": 510100
}, {
"name": "长沙市",
"id": 430100
}, {
"name": "长春市",
"id": 220100
}, {
"name": "沧州市",
"id": 130900
}, {
"name": "常德市",
"id": 430700
}, {
"name": "昌都市",
"id": 540300
}, {
"name": "长治市",
"id": 140400
}, {
"name": "常州市",
"id": 320400
}, {
"name": "巢湖市",
"id": 340181
}, {
"name": "潮州市",
"id": 445100
}, {
"name": "承德市",
"id": 130800
}, {
"name": "郴州市",
"id": 431000
}, {
"name": "赤峰市",
"id": 150400
}, {
"name": "池州市",
"id": 341700
}, {
"name": "崇左市",
"id": 451400
}, {
"name": "楚雄彝族自治州",
"id": 532300
}, {
"name": "滁州市",
"id": 341100
}, {
"name": "朝阳区",
"id": 110105
}],
"title": "C"
}, {
"lists": [{
"name": "大连市",
"id": 210200
}, {
"name": "东莞市",
"id": 441900
}, {
"name": "大理白族自治州",
"id": 532900
}, {
"name": "丹东市",
"id": 210600
}, {
"name": "大庆市",
"id": 230600
}, {
"name": "大同市",
"id": 140200
}, {
"name": "大兴安岭地区",
"id": 232700
}, {
"name": "德宏傣族景颇族自治州",
"id": 533100
}, {
"name": "德阳市",
"id": 510600
}, {
"name": "德州市",
"id": 371400
}, {
"name": "定西市",
"id": 621100
}, {
"name": "迪庆藏族自治州",
"id": 533400
}, {
"name": "东营市",
"id": 370500
}],
"title": "D"
}, {
"lists": [{
"name": "鄂尔多斯市",
"id": 150600
}, {
"name": "恩施土家族苗族自治州",
"id": 422800
}, {
"name": "鄂州市",
"id": 420700
}],
"title": "E"
}, {
"lists": [{
"name": "福州市",
"id": 350100
}, {
"name": "防城港市",
"id": 450600
}, {
"name": "佛山市",
"id": 440600
}, {
"name": "抚顺市",
"id": 210400
}, {
"name": "抚州市",
"id": 361000
}, {
"name": "阜新市",
"id": 210900
}, {
"name": "阜阳市",
"id": 341200
}],
"title": "F"
}, {
"lists": [{
"name": "广州市",
"id": 440100
}, {
"name": "桂林市",
"id": 450300
}, {
"name": "贵阳市",
"id": 520100
}, {
"name": "甘南县",
"id": 230225
}, {
"name": "赣州市",
"id": 360700
}, {
"name": "甘孜藏族自治州",
"id": 513300
}, {
"name": "广安市",
"id": 511600
}, {
"name": "广元市",
"id": 510800
}, {
"name": "贵港市",
"id": 450800
}, {
"name": "果洛藏族自治州",
"id": 632600
}],
"title": "G"
}, {
"lists": [{
"name": "杭州市",
"id": 330100
}, {
"name": "哈尔滨市",
"id": 230100
}, {
"name": "合肥市",
"id": 340100
}, {
"name": "海口市",
"id": 460100
}, {
"name": "呼和浩特市",
"id": 150100
}, {
"name": "海北藏族自治州",
"id": 632200
}, {
"name": "海东市",
"id": 630200
}, {
"name": "海南区",
"id": 150303
}, {
"name": "海西蒙古族藏族自治州",
"id": 632800
}, {
"name": "邯郸市",
"id": 130400
}, {
"name": "汉中市",
"id": 610700
}, {
"name": "鹤壁市",
"id": 410600
}, {
"name": "河池市",
"id": 451200
}, {
"name": "鹤岗市",
"id": 230400
}, {
"name": "黑河市",
"id": 231100
}, {
"name": "衡水市",
"id": 131100
}, {
"name": "衡阳市",
"id": 430400
}, {
"name": "河源市",
"id": 441600
}, {
"name": "贺州市",
"id": 451100
}, {
"name": "红河哈尼族彝族自治州",
"id": 532500
}, {
"name": "淮安市",
"id": 320800
}, {
"name": "淮北市",
"id": 340600
}, {
"name": "怀化市",
"id": 431200
}, {
"name": "淮南市",
"id": 340400
}, {
"name": "黄冈市",
"id": 421100
}, {
"name": "黄南藏族自治州",
"id": 632300
}, {
"name": "黄山市",
"id": 341000
}, {
"name": "黄石市",
"id": 420200
}, {
"name": "惠州市",
"id": 441300
}, {
"name": "葫芦岛市",
"id": 211400
}, {
"name": "呼伦贝尔市",
"id": 150700
}, {
"name": "湖州市",
"id": 330500
}, {
"name": "菏泽市",
"id": 371700
}],
"title": "H"
}, {
"lists": [{
"name": "济南市",
"id": 370100
}, {
"name": "佳木斯市",
"id": 230800
}, {
"name": "吉安市",
"id": 360800
}, {
"name": "江门市",
"id": 440700
}, {
"name": "焦作市",
"id": 410800
}, {
"name": "嘉兴市",
"id": 330400
}, {
"name": "嘉峪关市",
"id": 620200
}, {
"name": "揭阳市",
"id": 445200
}, {
"name": "吉林省",
"id": 220000
}, {
"name": "金昌市",
"id": 620300
}, {
"name": "晋城市",
"id": 140500
}, {
"name": "景德镇市",
"id": 360200
}, {
"name": "荆门市",
"id": 420800
}, {
"name": "荆州市",
"id": 421000
}, {
"name": "金华市",
"id": 330700
}, {
"name": "济宁市",
"id": 370800
}, {
"name": "晋中市",
"id": 140700
}, {
"name": "锦州市",
"id": 210700
}, {
"name": "九江市",
"id": 360400
}, {
"name": "酒泉市",
"id": 620900
}],
"title": "J"
}, {
"lists": [{
"name": "昆明市",
"id": 530100
}, {
"name": "开封市",
"id": 410200
}],
"title": "K"
}, {
"lists": [{
"name": "兰州市",
"id": 620100
}, {
"name": "拉萨市",
"id": 540100
}, {
"name": "来宾市",
"id": 451300
}, {
"name": "莱芜市",
"id": 371200
}, {
"name": "廊坊市",
"id": 131000
}, {
"name": "乐山市",
"id": 511100
}, {
"name": "凉山彝族自治州",
"id": 513400
}, {
"name": "连云港市",
"id": 320700
}, {
"name": "聊城市",
"id": 371500
}, {
"name": "辽阳市",
"id": 211000
}, {
"name": "辽源市",
"id": 220400
}, {
"name": "丽江市",
"id": 530700
}, {
"name": "临沧市",
"id": 530900
}, {
"name": "临汾市",
"id": 141000
}, {
"name": "临夏回族自治州",
"id": 622900
}, {
"name": "临沂市",
"id": 371300
}, {
"name": "林芝地区",
"id": 542600
}, {
"name": "丽水市",
"id": 331100
}, {
"name": "六安市",
"id": 341500
}, {
"name": "六盘水市",
"id": 520200
}, {
"name": "柳州市",
"id": 450200
}, {
"name": "陇南市",
"id": 621200
}, {
"name": "龙岩市",
"id": 350800
}, {
"name": "娄底市",
"id": 431300
}, {
"name": "漯河市",
"id": 411100
}, {
"name": "洛阳市",
"id": 410300
}, {
"name": "泸州市",
"id": 510500
}, {
"name": "吕梁市",
"id": 141100
}],
"title": "L"
}, {
"lists": [{
"name": "马鞍山市",
"id": 340500
}, {
"name": "茂名市",
"id": 440900
}, {
"name": "峨眉山市",
"id": 511181
}, {
"name": "梅州市",
"id": 441400
}, {
"name": "绵阳市",
"id": 510700
}, {
"name": "牡丹江市",
"id": 231000
}],
"title": "M"
}, {
"lists": [{
"name": "南京市",
"id": 320100
}, {
"name": "南昌市",
"id": 360100
}, {
"name": "南宁市",
"id": 450100
}, {
"name": "宁波市",
"id": 330200
}, {
"name": "南充市",
"id": 511300
}, {
"name": "南平市",
"id": 350700
}, {
"name": "南通市",
"id": 320600
}, {
"name": "南阳市",
"id": 411300
}, {
"name": "那曲地区",
"id": 542400
}, {
"name": "内江市",
"id": 511000
}, {
"name": "宁德市",
"id": 350900
}, {
"name": "怒江傈僳族自治州",
"id": 533300
}],
"title": "N"
}, {
"lists": [{
"name": "盘锦市",
"id": 211100
}, {
"name": "攀枝花市",
"id": 510400
}, {
"name": "平顶山市",
"id": 410400
}, {
"name": "平凉市",
"id": 620800
}, {
"name": "萍乡市",
"id": 360300
}, {
"name": "莆田市",
"id": 350300
}, {
"name": "濮阳市",
"id": 410900
}],
"title": "P"
}, {
"lists": [{
"name": "青岛市",
"id": 370200
}, {
"name": "黔东南苗族侗族自治州",
"id": 522600
}, {
"name": "黔南布依族苗族自治州",
"id": 522700
}, {
"name": "黔西南布依族苗族自治州",
"id": 522300
}, {
"name": "庆阳市",
"id": 621000
}, {
"name": "清远市",
"id": 441800
}, {
"name": "秦皇岛市",
"id": 130300
}, {
"name": "钦州市",
"id": 450700
}, {
"name": "齐齐哈尔市",
"id": 230200
}, {
"name": "泉州市",
"id": 350500
}, {
"name": "曲靖市",
"id": 530300
}, {
"name": "衢州市",
"id": 330800
}],
"title": "Q"
}, {
"lists": [{
"name": "日喀则市",
"id": 540200
}, {
"name": "日照市",
"id": 371100
}],
"title": "R"
}, {
"lists": [{
"name": "上海市",
"id": 310100
}, {
"name": "深圳市",
"id": 440300
}, {
"name": "苏州市",
"id": 320500
}, {
"name": "沈阳市",
"id": 210100
}, {
"name": "石家庄市",
"id": 130100
}, {
"name": "三门峡市",
"id": 411200
}, {
"name": "三明市",
"id": 350400
}, {
"name": "三亚市",
"id": 460200
}, {
"name": "商洛市",
"id": 611000
}, {
"name": "商丘市",
"id": 411400
}, {
"name": "上饶市",
"id": 361100
}, {
"name": "山南地区",
"id": 542200
}, {
"name": "汕头市",
"id": 440500
}, {
"name": "汕尾市",
"id": 441500
}, {
"name": "韶关市",
"id": 440200
}, {
"name": "绍兴市",
"id": 330600
}, {
"name": "邵阳市",
"id": 430500
}, {
"name": "十堰市",
"id": 420300
}, {
"name": "朔州市",
"id": 140600
}, {
"name": "四平市",
"id": 220300
}, {
"name": "绥化市",
"id": 231200
}, {
"name": "遂宁市",
"id": 510900
}, {
"name": "随州市",
"id": 421300
}, {
"name": "宿迁市",
"id": 321300
}, {
"name": "宿州市",
"id": 341300
}],
"title": "S"
}, {
"lists": [{
"name": "天津",
"id": 120100
}, {
"name": "太原市",
"id": 140100
}, {
"name": "泰安市",
"id": 370900
}, {
"name": "泰州市",
"id": 321200
}, {
"name": "台州市",
"id": 331000
}, {
"name": "唐山市",
"id": 130200
}, {
"name": "天水市",
"id": 620500
}, {
"name": "铁岭市",
"id": 211200
}, {
"name": "铜川市",
"id": 610200
}, {
"name": "通化市",
"id": 220500
}, {
"name": "通辽市",
"id": 150500
}, {
"name": "铜陵市",
"id": 340700
}, {
"name": "铜仁市",
"id": 520600
}, {
"name": "台湾",
"id": 710000
}],
"title": "T"
}, {
"lists": [{
"name": "武汉市",
"id": 420100
}, {
"name": "乌鲁木齐市",
"id": 650100
}, {
"name": "无锡市",
"id": 320200
}, {
"name": "威海市",
"id": 371000
}, {
"name": "潍坊市",
"id": 370700
}, {
"name": "文山壮族苗族自治州",
"id": 532600
}, {
"name": "温州市",
"id": 330300
}, {
"name": "乌海市",
"id": 150300
}, {
"name": "芜湖市",
"id": 340200
}, {
"name": "乌兰察布市",
"id": 150900
}, {
"name": "武威市",
"id": 620600
}, {
"name": "梧州市",
"id": 450400
}],
"title": "W"
}, {
"lists": [{
"name": "厦门市",
"id": 350200
}, {
"name": "西安市",
"id": 610100
}, {
"name": "西宁市",
"id": 630100
}, {
"name": "襄阳市",
"id": 420600
}, {
"name": "湘潭市",
"id": 430300
}, {
"name": "湘西土家族苗族自治州",
"id": 433100
}, {
"name": "咸宁市",
"id": 421200
}, {
"name": "咸阳市",
"id": 610400
}, {
"name": "孝感市",
"id": 420900
}, {
"name": "邢台市",
"id": 130500
}, {
"name": "新乡市",
"id": 410700
}, {
"name": "信阳市",
"id": 411500
}, {
"name": "新余市",
"id": 360500
}, {
"name": "忻州市",
"id": 140900
}, {
"name": "西双版纳傣族自治州",
"id": 532800
}, {
"name": "宣城市",
"id": 341800
}, {
"name": "许昌市",
"id": 411000
}, {
"name": "徐州市",
"id": 320300
}, {
"name": "香港特别行政区",
"id": 810000
}, {
"name": "锡林郭勒盟",
"id": 152500
}, {
"name": "兴安盟",
"id": 152200
}],
"title": "X"
}, {
"lists": [{
"name": "银川市",
"id": 640100
}, {
"name": "雅安市",
"id": 511800
}, {
"name": "延安市",
"id": 610600
}, {
"name": "延边朝鲜族自治州",
"id": 222400
}, {
"name": "盐城市",
"id": 320900
}, {
"name": "阳江市",
"id": 441700
}, {
"name": "阳泉市",
"id": 140300
}, {
"name": "扬州市",
"id": 321000
}, {
"name": "烟台市",
"id": 370600
}, {
"name": "宜宾市",
"id": 511500
}, {
"name": "宜昌市",
"id": 420500
}, {
"name": "宜春市",
"id": 360900
}, {
"name": "营口市",
"id": 210800
}, {
"name": "益阳市",
"id": 430900
}, {
"name": "永州市",
"id": 431100
}, {
"name": "岳阳市",
"id": 430600
}, {
"name": "榆林市",
"id": 610800
}, {
"name": "运城市",
"id": 140800
}, {
"name": "云浮市",
"id": 445300
}, {
"name": "玉树藏族自治州",
"id": 632700
}, {
"name": "玉溪市",
"id": 530400
}, {
"name": "玉林市",
"id": 450900
}],
"title": "Y"
}, {
"lists": [{
"name": "杂多县",
"id": 632722
}, {
"name": "赞皇县",
"id": 130129
}, {
"name": "枣强县",
"id": 131121
}, {
"name": "枣阳市",
"id": 420683
}, {
"name": "枣庄市",
"id": 370400
}, {
"name": "泽库县",
"id": 632323
}, {
"name": "曾都区",
"id": 421303
}, {
"name": "泽普县",
"id": 653124
}, {
"name": "泽州县",
"id": 140525
}, {
"name": "札达县",
"id": 542522
}, {
"name": "扎赉特旗",
"id": 152223
}, {
"name": "扎兰屯市",
"id": 150783
}, {
"name": "扎鲁特旗",
"id": 150526
}, {
"name": "扎囊县",
"id": 542222
}, {
"name": "张北县",
"id": 130722
}, {
"name": "张店区",
"id": 370303
}, {
"name": "章贡区",
"id": 360702
}, {
"name": "张家港市",
"id": 320582
}, {
"name": "张家界市",
"id": 430800
}, {
"name": "张家口市",
"id": 130700
}, {
"name": "漳平市",
"id": 350881
}, {
"name": "漳浦县",
"id": 350623
}, {
"name": "章丘市",
"id": 370181
}, {
"name": "樟树市",
"id": 360982
}, {
"name": "张湾区",
"id": 420303
}, {
"name": "彰武县",
"id": 210922
}, {
"name": "临漳县",
"id": 130423
}, {
"name": "张掖市",
"id": 620700
}, {
"name": "漳州市",
"id": 350600
}, {
"name": "长子县",
"id": 140428
}, {
"name": "湛河区",
"id": 410411
}, {
"name": "湛江市",
"id": 440800
}, {
"name": "站前区",
"id": 210802
}, {
"name": "沾益县",
"id": 530328
}, {
"name": "诏安县",
"id": 350624
}, {
"name": "召陵区",
"id": 411104
}, {
"name": "昭平县",
"id": 451121
}, {
"name": "肇庆市",
"id": 441200
}, {
"name": "昭通市",
"id": 530600
}, {
"name": "赵县",
"id": 130133
}, {
"name": "昭阳区",
"id": 530602
}, {
"name": "招远市",
"id": 370685
}, {
"name": "肇源县",
"id": 230622
}, {
"name": "肇州县",
"id": 230621
}, {
"name": "柞水县",
"id": 611026
}, {
"name": "柘城县",
"id": 411424
}, {
"name": "浙江省",
"id": 330000
}, {
"name": "镇安县",
"id": 611025
}, {
"name": "振安区",
"id": 210604
}, {
"name": "镇巴县",
"id": 610728
}, {
"name": "正安县",
"id": 520324
}, {
"name": "正定县",
"id": 130123
}, {
"name": "正蓝旗",
"id": 152530
}, {
"name": "正宁县",
"id": 621025
}, {
"name": "蒸湘区",
"id": 430408
}, {
"name": "正镶白旗",
"id": 152529
}, {
"name": "正阳县",
"id": 411724
}, {
"name": "郑州市",
"id": 410100
}, {
"name": "镇海区",
"id": 330211
}, {
"name": "镇江市",
"id": 321100
}, {
"name": "浈江区",
"id": 440204
}, {
"name": "镇康县",
"id": 530924
}, {
"name": "镇赉县",
"id": 220821
}, {
"name": "镇平县",
"id": 411324
}, {
"name": "振兴区",
"id": 210603
}, {
"name": "镇雄县",
"id": 530627
}, {
"name": "镇原县",
"id": 621027
}, {
"name": "志丹县",
"id": 610625
}, {
"name": "治多县",
"id": 632724
}, {
"name": "芝罘区",
"id": 370602
}, {
"name": "枝江市",
"id": 420583
}, {
"name": "芷江侗族自治县",
"id": 431228
}, {
"name": "织金县",
"id": 520524
}, {
"name": "中方县",
"id": 431221
}, {
"name": "中江县",
"id": 510623
}, {
"name": "钟楼区",
"id": 320404
}, {
"name": "中牟县",
"id": 410122
}, {
"name": "中宁县",
"id": 640521
}, {
"name": "中山区",
"id": 210202
}, {
"name": "中山市",
"id": 442000
}, {
"name": "钟山区",
"id": 520201
}, {
"name": "钟山县",
"id": 451122
}, {
"name": "中卫市",
"id": 640500
}, {
"name": "钟祥市",
"id": 420881
}, {
"name": "中阳县",
"id": 141129
}, {
"name": "中原区",
"id": 410102
}, {
"name": "周村区",
"id": 370306
}, {
"name": "周口市",
"id": 411600
}, {
"name": "周宁县",
"id": 350925
}, {
"name": "舟曲县",
"id": 623023
}, {
"name": "舟山市",
"id": 330900
}, {
"name": "周至县",
"id": 610124
}, {
"name": "庄河市",
"id": 210283
}, {
"name": "诸城市",
"id": 370782
}, {
"name": "珠海市",
"id": 440400
}, {
"name": "珠晖区",
"id": 430405
}, {
"name": "诸暨市",
"id": 330681
}, {
"name": "驻马店市",
"id": 411700
}, {
"name": "准格尔旗",
"id": 150622
}, {
"name": "涿鹿县",
"id": 130731
}, {
"name": "卓尼县",
"id": 623022
}, {
"name": "涿州市",
"id": 130681
}, {
"name": "卓资县",
"id": 150921
}, {
"name": "珠山区",
"id": 360203
}, {
"name": "竹山县",
"id": 420323
}, {
"name": "竹溪县",
"id": 420324
}, {
"name": "株洲市",
"id": 430200
}, {
"name": "株洲县",
"id": 430221
}, {
"name": "淄博市",
"id": 370300
}, {
"name": "子长县",
"id": 610623
}, {
"name": "淄川区",
"id": 370302
}, {
"name": "自贡市",
"id": 510300
}, {
"name": "秭归县",
"id": 420527
}, {
"name": "紫金县",
"id": 441621
}, {
"name": "自流井区",
"id": 510302
}, {
"name": "资溪县",
"id": 361028
}, {
"name": "资兴市",
"id": 431081
}, {
"name": "资阳区",
"id": 430902
}],
"title": "Z"
}]
}
\ No newline at end of file
module_mine/build.gradle
View file @ 54546307
...@@ -54,8 +54,6 @@ dependencies { ...@@ -54,8 +54,6 @@ dependencies {
implementation 'top.zibin:Luban:1.1.3' implementation 'top.zibin:Luban:1.1.3'
implementation project(':plugin_member') implementation project(':plugin_member')
api project(':plugin_version') api project(':plugin_version')
//动态权限申请库
implementation 'pub.devrel:easypermissions:1.3.0'
implementation 'com.alibaba:fastjson:1.2.21' implementation 'com.alibaba:fastjson:1.2.21'
api project(':plugin_share') api project(':plugin_share')
api project(':plugin_coupon') api project(':plugin_coupon')
......
module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java
View file @ 54546307
package com.rv.rvmine.personal; package com.rv.rvmine.personal;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -21,6 +23,7 @@ import com.frame.base.url.Constance; ...@@ -21,6 +23,7 @@ import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.util.ViewHolder; import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.util.glide.GlideManager; import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.rv.home.rv.module.ApiConfig; import com.rv.home.rv.module.ApiConfig;
import com.rv.component.dialog.PickerDialog; import com.rv.component.dialog.PickerDialog;
import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean; import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;
...@@ -41,11 +44,10 @@ import java.util.Map; ...@@ -41,11 +44,10 @@ import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
import top.zibin.luban.Luban; import top.zibin.luban.Luban;
import top.zibin.luban.OnCompressListener; import top.zibin.luban.OnCompressListener;
...@@ -53,7 +55,7 @@ import top.zibin.luban.OnCompressListener; ...@@ -53,7 +55,7 @@ import top.zibin.luban.OnCompressListener;
* 实名认证 * 实名认证
*/ */
@Route(path = Constance.ACTIVITY_URL_IDCARDCERTIFICATION) @Route(path = Constance.ACTIVITY_URL_IDCARDCERTIFICATION)
public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresenter> implements EasyPermissions.PermissionCallbacks { public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.et_name) @BindView(R2.id.et_name)
EditText etName; EditText etName;
...@@ -235,56 +237,33 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen ...@@ -235,56 +237,33 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
}.show(); }.show();
} }
/** @SuppressLint("CheckResult")
* 打开相机和相册
*
* @param type 1、相机2、相册
* <p>
* 此处方法不奏效
*/
// @SuppressLint("CheckResult")
// private void processPicker(final int type) {
// /**
// * 6.0以上手机做权限处理
// */
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
// new RxPermission(mActivity).request(
// new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
// Manifest.permission.CAMERA}).subscribe(new Consumer<Boolean>() {
// @Override
// public void accept(Boolean aBoolean) throws Exception {
// if (aBoolean == true) {
// switch (type) {
// case 1001:
// mPresenter.openCamera(false);
// break;
// case 1002:
// mPresenter.openAlbum(false);
// break;
// }
//
// }
// }
// });
// } else {
// switch (type) {
// case 1001:
// mPresenter.openCamera(false);
// break;
// case 1002:
// mPresenter.openAlbum(false);
// break;
// }
// }
// }
private String[] cameraPermissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
private void processPicker() { private void processPicker() {
if (!EasyPermissions.hasPermissions(this, cameraPermissions)) { /**
EasyPermissions.requestPermissions(this, "拍照需要此权限，否则无法正常使用", 1, cameraPermissions); * 6.0以上手机做权限处理
return; */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
switch (typeCamera) {
case 1001:
mPresenter.openCamera(false);
break;
case 1002:
mPresenter.openAlbum(false);
break;
}
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
} }
}
});
} else {
switch (typeCamera) { switch (typeCamera) {
case 1001: case 1001:
mPresenter.openCamera(false); mPresenter.openCamera(false);
...@@ -295,10 +274,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen ...@@ -295,10 +274,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
} }
} }
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
} }
/** /**
...@@ -351,23 +326,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen ...@@ -351,23 +326,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
return headMap; return headMap;
} }
@Override
public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
processPicker();
}
@Override
public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
Toast.makeText(this, "用户授权失败", Toast.LENGTH_SHORT).show();
if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
new AppSettingsDialog.Builder(this).
setTitle("需要权限")
.setRationale("如果没有这些权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
private class Verified { private class Verified {
private String name; private String name;
private String idNumber; private String idNumber;
......
plugin_im/build.gradle
View file @ 54546307
...@@ -63,7 +63,6 @@ dependencies { ...@@ -63,7 +63,6 @@ dependencies {
implementation "com.google.code.gson:gson:$rootProject.ext.gsonVersion" implementation "com.google.code.gson:gson:$rootProject.ext.gsonVersion"
implementation 'cc.aoeiuv020:imaging:1.0' implementation 'cc.aoeiuv020:imaging:1.0'
implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:design:28.0.0'
implementation 'pub.devrel:easypermissions:1.3.0'
implementation 'top.zibin:Luban:1.1.3' implementation 'top.zibin:Luban:1.1.3'
// 定制的jitsi， // 定制的jitsi，
api files('libs/jitsi-meet-sdk-1.16.0-2.aar') api files('libs/jitsi-meet-sdk-1.16.0-2.aar')
......
plugin_im/src/main/java/com/rv/im/ChatActivity.java
View file @ 54546307
...@@ -4,6 +4,7 @@ import android.Manifest; ...@@ -4,6 +4,7 @@ import android.Manifest;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
...@@ -29,6 +30,7 @@ import android.widget.Toast; ...@@ -29,6 +30,7 @@ import android.widget.Toast;
import com.ruiwenliu.wrapper.base.BaseBean; import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter; import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.TitleView; import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.im.adapter.ChatContentAdapter; import com.rv.im.adapter.ChatContentAdapter;
import com.rv.im.audio.IMRecordController; import com.rv.im.audio.IMRecordController;
...@@ -55,10 +57,7 @@ import java.io.File; ...@@ -55,10 +57,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import pub.devrel.easypermissions.AppSettingsDialog; public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements IChatView, ChatMessageListener, View.OnClickListener, RecordListener {
import pub.devrel.easypermissions.EasyPermissions;
public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements EasyPermissions.PermissionCallbacks, IChatView, ChatMessageListener, View.OnClickListener, RecordListener {
private ImageButton voiceImgBtn; private ImageButton voiceImgBtn;
private ImageButton ibKeyword; private ImageButton ibKeyword;
...@@ -84,9 +83,6 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements ...@@ -84,9 +83,6 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
private int startPosition; private int startPosition;
private int endPosition; private int endPosition;
private String[] recordPermissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE};
private String[] callPermissions = {Manifest.permission.RECORD_AUDIO, Manifest.permission.CALL_PHONE, Manifest.permission.CAMERA};
private ChatContentAdapter.OnClickItemListener clickItemListener = new ChatContentAdapter.OnClickItemListener() { private ChatContentAdapter.OnClickItemListener clickItemListener = new ChatContentAdapter.OnClickItemListener() {
@Override @Override
public void onClick(int resId, ChatMessage message) { public void onClick(int resId, ChatMessage message) {
...@@ -320,17 +316,34 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements ...@@ -320,17 +316,34 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
isCamera = true; isCamera = true;
presenter.clickPicPicker(isCamera); presenter.clickPicPicker(isCamera);
} else if (id == R.id.voice_img_btn) { } else if (id == R.id.voice_img_btn) {
// 判断是否有录音与储存读写的权限
if (!EasyPermissions.hasPermissions(getApplicationContext(), recordPermissions)) { /**
EasyPermissions.requestPermissions(ChatActivity.this, "录音需要此权限，否则无法正常使用", REQUEST_PERMISSION_AUDIO, recordPermissions); * 6.0以上手机做权限处理
return; */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(aBoolean -> {
if (aBoolean == true) {
changeChatFaceView(false);
chatEdit.setVisibility(View.GONE);
recordBtn.setVisibility(View.VISIBLE);
ibKeyword.setVisibility(View.VISIBLE);
voiceImgBtn.setVisibility(View.GONE);
closeKeyboard();
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
} }
});
} else {
changeChatFaceView(false); changeChatFaceView(false);
chatEdit.setVisibility(View.GONE); chatEdit.setVisibility(View.GONE);
recordBtn.setVisibility(View.VISIBLE); recordBtn.setVisibility(View.VISIBLE);
ibKeyword.setVisibility(View.VISIBLE); ibKeyword.setVisibility(View.VISIBLE);
voiceImgBtn.setVisibility(View.GONE); voiceImgBtn.setVisibility(View.GONE);
closeKeyboard(); closeKeyboard();
}
} else if (id == R.id.ib_keyword) { } else if (id == R.id.ib_keyword) {
changeChatFaceView(false); changeChatFaceView(false);
chatEdit.setVisibility(View.VISIBLE); chatEdit.setVisibility(View.VISIBLE);
...@@ -342,18 +355,37 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements ...@@ -342,18 +355,37 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
presenter.clickFile(); presenter.clickFile();
} else if (id == R.id.tv_vilte) { } else if (id == R.id.tv_vilte) {
callType = 1; callType = 1;
if (!EasyPermissions.hasPermissions(getApplicationContext(), callPermissions)) {
EasyPermissions.requestPermissions(ChatActivity.this, "通话需要此权限，否则无法正常使用", REQUEST_PERMISSION_CALL, recordPermissions); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
return; new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(aBoolean -> {
if (aBoolean == true) {
presenter.realDial(callType, null);
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
} }
});
} else {
presenter.realDial(callType, null); presenter.realDial(callType, null);
}
} else if (id == R.id.tv_video) { } else if (id == R.id.tv_video) {
callType = 2; callType = 2;
if (!EasyPermissions.hasPermissions(getApplicationContext(), callPermissions)) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
EasyPermissions.requestPermissions(ChatActivity.this, "通话需要此权限，否则无法正常使用", REQUEST_PERMISSION_CALL, recordPermissions); new RxPermission(mActivity).request(
return; Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.RECORD_AUDIO,
Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(aBoolean -> {
if (aBoolean == true) {
presenter.realDial(callType, null);
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
} }
});
} else {
presenter.realDial(callType, null); presenter.realDial(callType, null);
}
} else if (id == R.id.emotion_btn) { } else if (id == R.id.emotion_btn) {
if (isFaceShown()) {// 表情布局在显示,那么点击则是隐藏表情，显示键盘 if (isFaceShown()) {// 表情布局在显示,那么点击则是隐藏表情，显示键盘
// showKeyboard(); // showKeyboard();
...@@ -462,40 +494,6 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements ...@@ -462,40 +494,6 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
private boolean isCamera = false; private boolean isCamera = false;
private InputMethodManager mInputManager; private InputMethodManager mInputManager;
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
}
@Override
public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
if (requestCode == REQUEST_PERMISSION_PHOTO) {
presenter.clickPicPicker(isCamera);
} else if (requestCode == REQUEST_PERMISSION_AUDIO) {
chatEdit.setVisibility(View.GONE);
recordBtn.setVisibility(View.VISIBLE);
ibKeyword.setVisibility(View.VISIBLE);
voiceImgBtn.setVisibility(View.GONE);
} else if (requestCode == REQUEST_PERMISSION_FILE) {
presenter.clickFile();
} else if (requestCode == REQUEST_PERMISSION_CALL) {
presenter.realDial(callType, null);
}
}
@Override
public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
Toast.makeText(this, "用户授权失败", Toast.LENGTH_SHORT).show();
if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
new AppSettingsDialog.Builder(this).
setTitle("需要权限")
.setRationale("如果没有这些权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
......
plugin_im/src/main/java/com/rv/im/CustomerListActivity.java
View file @ 54546307
package com.rv.im; package com.rv.im;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Toast; import android.widget.Toast;
...@@ -20,21 +16,17 @@ import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout; ...@@ -20,21 +16,17 @@ import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView; import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.rv.im.adapter.CustomerListAdapter; import com.rv.im.adapter.CustomerListAdapter;
import com.rv.im.bean.CustomersBean; import com.rv.im.bean.CustomersBean;
import com.rv.im.db.service.ChatConversationServiceImp;
import com.rv.im.db.service.ChatMessageServiceImp; import com.rv.im.db.service.ChatMessageServiceImp;
import com.rv.im.db.service.CustomerServiceImp; import com.rv.im.db.service.CustomerServiceImp;
import com.rv.im.db.service.ICustomerService; import com.rv.im.db.service.ICustomerService;
import com.rv.im.db.table.ChatConversation;
import com.rv.im.db.table.ChatMessage; import com.rv.im.db.table.ChatMessage;
import com.rv.im.db.table.Customer; import com.rv.im.db.table.Customer;
import com.rv.im.util.ServiceUtils; import com.rv.im.util.ServiceUtils;
import com.rv.im.xmpp.ListenerManager; import com.rv.im.xmpp.ListenerManager;
import com.rv.im.xmpp.listener.AuthStateListener;
import com.rv.im.xmpp.listener.ChatMessageListener; import com.rv.im.xmpp.listener.ChatMessageListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> implements SimpleRefreshLayout.OnSimpleRefreshListener, ChatMessageListener { public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> implements SimpleRefreshLayout.OnSimpleRefreshListener, ChatMessageListener {
......
plugin_im/src/main/java/com/rv/im/mvp/presenter/ChatPresenterImp.java
View file @ 54546307
package com.rv.im.mvp.presenter; package com.rv.im.mvp.presenter;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
...@@ -11,7 +12,9 @@ import android.provider.MediaStore; ...@@ -11,7 +12,9 @@ import android.provider.MediaStore;
import android.support.v4.content.FileProvider; import android.support.v4.content.FileProvider;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.rv.im.Constants; import com.rv.im.Constants;
import com.rv.im.ImSetting; import com.rv.im.ImSetting;
import com.rv.im.call.Jitsi_pre; import com.rv.im.call.Jitsi_pre;
...@@ -34,7 +37,6 @@ import java.util.Arrays; ...@@ -34,7 +37,6 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import pub.devrel.easypermissions.EasyPermissions;
import top.zibin.luban.Luban; import top.zibin.luban.Luban;
import top.zibin.luban.OnCompressListener; import top.zibin.luban.OnCompressListener;
...@@ -79,18 +81,33 @@ public class ChatPresenterImp implements IChatPresenter { ...@@ -79,18 +81,33 @@ public class ChatPresenterImp implements IChatPresenter {
sendMessage(message); sendMessage(message);
} }
@SuppressLint("CheckResult")
@Override @Override
public void clickPicPicker(boolean isCamera) { public void clickPicPicker(boolean isCamera) {
if (!EasyPermissions.hasPermissions(weakReference.get(), cameraPermissions)) {
EasyPermissions.requestPermissions((Activity) weakReference.get(), "拍照需要此权限，否则无法正常使用", IChatView.REQUEST_PERMISSION_PHOTO, cameraPermissions); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
return; new RxPermission((Activity) weakReference.get()).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(aBoolean -> {
if (aBoolean == true) {
if (isCamera) {
clickCamera();
} else {
openAlbum();
}
} else {
Toast.makeText(weakReference.get(), "用户授权失败", Toast.LENGTH_SHORT).show();
} }
});
} else {
if (isCamera) { if (isCamera) {
clickCamera(); clickCamera();
} else { } else {
openAlbum(); openAlbum();
} }
} }
}
@Override @Override
public void openAlbum() { public void openAlbum() {
...@@ -167,7 +184,7 @@ public class ChatPresenterImp implements IChatPresenter { ...@@ -167,7 +184,7 @@ public class ChatPresenterImp implements IChatPresenter {
if (!TextUtils.isEmpty(meetUrl)) { if (!TextUtils.isEmpty(meetUrl)) {
intent.putExtra("meetUrl", meetUrl); intent.putExtra("meetUrl", meetUrl);
} }
((Activity) weakReference.get()).startActivity(intent); weakReference.get().startActivity(intent);
} }
private void sendMessage(ChatMessage message) { private void sendMessage(ChatMessage message) {
...@@ -307,16 +324,25 @@ public class ChatPresenterImp implements IChatPresenter { ...@@ -307,16 +324,25 @@ public class ChatPresenterImp implements IChatPresenter {
sendMessage(message); sendMessage(message);
} }
@SuppressLint("CheckResult")
@Override @Override
public void clickFile() { public void clickFile() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission((Activity) weakReference.get()).request(
if (!EasyPermissions.hasPermissions(weakReference.get(), cameraPermissions)) { Manifest.permission.WRITE_EXTERNAL_STORAGE,
EasyPermissions.requestPermissions((Activity) weakReference.get(), "拍照需要此权限，否则无法正常使用", IChatView.REQUEST_PERMISSION_FILE, choiceFilePermissions); Manifest.permission.READ_EXTERNAL_STORAGE).subscribe(aBoolean -> {
return; if (aBoolean == true) {
showFileChoiceDialog();
} else {
Toast.makeText(weakReference.get(), "用户授权失败", Toast.LENGTH_SHORT).show();
}
});
} else {
showFileChoiceDialog();
}
} }
private void showFileChoiceDialog() {
SelectFileDialog dialog = new SelectFileDialog(weakReference.get(), new SelectFileDialog.OptionFileListener() { SelectFileDialog dialog = new SelectFileDialog(weakReference.get(), new SelectFileDialog.OptionFileListener() {
@Override @Override
public void option(List<File> files) { public void option(List<File> files) {
......
plugin_member/src/main/java/com/rv.member/view/LoginView.java
View file @ 54546307
...@@ -84,8 +84,8 @@ public class LoginView extends LinearLayout { ...@@ -84,8 +84,8 @@ public class LoginView extends LinearLayout {
SpannableStringBuilder bugBuilder = new SpannableStringBuilder(info.getBuyCount() + "\n 购买记录 (次)") ; SpannableStringBuilder bugBuilder = new SpannableStringBuilder(info.getBuyCount() + "\n 购买记录 (次)") ;
bugBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(getContext(), 18), null, null), 0, String.valueOf(info.getBuyCount()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE); bugBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(getContext(), 18), null, null), 0, String.valueOf(info.getBuyCount()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
tvPurchaseRecord.setText(bugBuilder); tvPurchaseRecord.setText(bugBuilder);
if (!TextUtils.isEmpty(info.getIcon())) if (!TextUtils.isEmpty(info.getBigIcon()))
GlideManager.getInstance(getContext()).loadImage(info.getIcon(), ivMemberLevel); GlideManager.getInstance(getContext()).loadImage(info.getBigIcon(), ivMemberLevel);
} }
} }
} }
......
plugin_member/src/main/res/layout/item_login_view.xml
View file @ 54546307
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
android:layout_width="@dimen/size_60" android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_40" /> android:layout_marginRight="@dimen/size_30" />
</RelativeLayout> </RelativeLayout>
......
plugin_member/src/main/res/layout/item_member_detail.xml
View file @ 54546307
...@@ -71,16 +71,17 @@ ...@@ -71,16 +71,17 @@
android:layout_marginLeft="@dimen/size_20" android:layout_marginLeft="@dimen/size_20"
android:layout_marginRight="@dimen/size_20" android:layout_marginRight="@dimen/size_20"
android:textColor="#666666" android:textColor="#666666"
android:layout_marginBottom="13dp"
android:textSize="@dimen/dp_10" /> android:textSize="@dimen/dp_10" />
<Button <Button
android:visibility="gone"
android:id="@+id/btn_buy" android:id="@+id/btn_buy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_40" android:layout_height="@dimen/dp_40"
android:layout_marginLeft="@dimen/size_20" android:layout_marginLeft="@dimen/size_20"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:layout_marginRight="@dimen/size_20" android:layout_marginRight="@dimen/size_20"
android:layout_marginBottom="13dp"
android:background="@drawable/shape_rv_bg_dark_yellow" android:background="@drawable/shape_rv_bg_dark_yellow"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment