first commit 可编译运行

This commit is contained in:
renjianbo
2026-01-06 17:18:13 +08:00
parent ed498eb447
commit 8ae2bdd5f6
32 changed files with 4079 additions and 4085 deletions

10
.idea/deploymentTargetSelector.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetSelector">
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>
</project>

1
.idea/misc.xml generated
View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CMakeSettings">
<configurations>

10
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/July.iml" filepath="$PROJECT_DIR$/.idea/modules/July.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/July.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/July.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/citypicker/July.citypicker.iml" filepath="$PROJECT_DIR$/.idea/modules/citypicker/July.citypicker.iml" />
</modules>
</component>
</project>

View File

@@ -3,6 +3,14 @@
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
<option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
<option value="com.intellij.execution.junit.PatternConfigurationProducer" />
<option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
<option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
<option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
<option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
<option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

View File

@@ -1,12 +1,16 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
buildToolsVersion "28.0.0"
namespace 'com.fenghoo.seven'
compileSdk 34
compileSdkVersion 34
buildToolsVersion "30.0.2"
defaultConfig {
applicationId "com.fenghoo.seven"
minSdkVersion 19
targetSdkVersion 28
minSdk 26
minSdkVersion 26
targetSdk 34
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -36,6 +40,17 @@ android {
enabled=true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
packagingOptions {
jniLibs {
useLegacyPackaging = true
}
}
}
dependencies {
@@ -63,7 +78,7 @@ dependencies {
//状态栏颜色
implementation 'com.readystatesoftware.systembartint:systembartint:1.0.4'
implementation 'io.reactivex:rxjava:1.0.14'
implementation 'io.reactivex:rxandroid:1.0.1'
implementation 'io.reactivex:rxandroid:1.1.0'
implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
implementation files('libs/wechat-sdk-android-without-mta-1.0.2.jar')
implementation files('libs/ShareSDK-Wechat-Core-2.8.3.jar')
@@ -88,9 +103,9 @@ dependencies {
// fragment快速实现可选
implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
implementation('com.github.liuguangli:VerificationCodeInput:1.5')
implementation 'com.zhihu.android:matisse:0.5.2-beta2'
implementation 'com.zhihu.android:matisse:0.5.3-beta3'
implementation 'com.github.tbruyelle:rxpermissions:0.10.2'
implementation 'top.zibin:Luban:1.1.7'
implementation 'top.zibin:Luban:1.1.8'
//android 6.0权限处理
api 'pub.devrel:easypermissions:1.2.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
@@ -100,12 +115,13 @@ dependencies {
implementation 'com.123ufo:BannerView:1.0'
implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation 'com.github.bumptech.glide:glide:4.7.1'
implementation 'com.github.bumptech.glide:glide:4.9.0'
implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
}

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.fenghoo.seven">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" /> <!-- 获取运营商信息,用于支持提供运营商信息相关的接口 -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 这个权限用于获取wifi的获取权限wifi信息会用来进行网络定位 -->
@@ -60,6 +59,7 @@
<activity android:name=".main.activity.Main2Activity" /> <!-- 开启页 -->
<activity
android:name=".main.activity.SplashActivity"
android:exported="true"
android:screenOrientation="portrait"
android:theme="@style/SplashTheme">
<intent-filter>

View File

@@ -42,12 +42,9 @@ public class ForgetPasActivity extends BaseActivity implements View.OnClickListe
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_login:
ShowAty.CodeLoginActivity(ForgetPasActivity.this,mEtPhone.getText().toString().trim(),"1");
break;
default:
break;
int id = v.getId();
if (id == R.id.btn_login) {
ShowAty.CodeLoginActivity(ForgetPasActivity.this,mEtPhone.getText().toString().trim(),"1");
}
}
}

View File

@@ -92,34 +92,30 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.btn_login://登录
int id = view.getId();
if (id == R.id.btn_login) {//登录
if(longintype.equals("0")){
getPresenter().login();
}else {
boolean mobile = PhonenNumUtil.isMobile(getMobile());
if(!mobile){
ToastUtils.showToast(mContext,"输入的手机号不正确!");
return;
}
ShowAty.CodeLoginActivity(LoginPasswordActivity.this,getMobile(),"0");
}
break;
case R.id.login_tv_code://验证码登录
if(longintype.equals("0")){
codeLogin();
longintype="1";
}else {
passWordLogin();
longintype="0";
if(longintype.equals("0")){
getPresenter().login();
}else {
boolean mobile = PhonenNumUtil.isMobile(getMobile());
if(!mobile){
ToastUtils.showToast(mContext,"输入的手机号不正确!");
return;
}
ShowAty.CodeLoginActivity(LoginPasswordActivity.this,getMobile(),"0");
}
} else if (id == R.id.login_tv_code) {//验证码登录
if(longintype.equals("0")){
codeLogin();
longintype="1";
}else {
passWordLogin();
longintype="0";
}
break;
case R.id.login_tv_forgetpas://忘记密码
ShowAty.ForgetPasActivity(LoginPasswordActivity.this);
break;
} else if (id == R.id.login_tv_forgetpas) {//忘记密码
ShowAty.ForgetPasActivity(LoginPasswordActivity.this);
}
}

View File

@@ -110,8 +110,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{
@Override
public void onClick(View v) {
FragmentTransaction fragmentTransaction = fm.beginTransaction();
switch (v.getId()) {
case R.id.rl_home:
int id = v.getId();
if (id == R.id.rl_home) {
ToastUtils.showToast(this,"该功能暂未开放");
mTvHomeImg.setBackgroundResource(R.mipmap.icon_task);
@@ -139,8 +139,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{
StatusBarUtil.transparencyBar(this); //设置状态栏全透明
StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
StatusBarUtil.setStatusBarColor(this,R.color.colorPrimary);
break;
case R.id.rl_send:
} else if (id == R.id.rl_send) {
ToastUtils.showToast(this,"该功能暂未开放");
mTvHomeImg.setBackgroundResource(R.mipmap.icon_task_hui);
mTvSendImg.setBackgroundResource(R.mipmap.icon_zhibo);
@@ -168,8 +167,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{
StatusBarUtil.transparencyBar(this); //设置状态栏全透明
StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
StatusBarUtil.setStatusBarColor(this,R.color.colorPrimary);
break;
case R.id.rl_faxian:
} else if (id == R.id.rl_faxian) {
mTvHomeImg.setBackgroundResource(R.mipmap.icon_task_hui);
mTvSendImg.setBackgroundResource(R.mipmap.icon_zhibohui);
mTvMapImg.setBackgroundResource(R.mipmap.icon_kehuhui);
@@ -195,8 +193,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{
StatusBarUtil.transparencyBar(this); //设置状态栏全透明
StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
StatusBarUtil.setStatusBarColor(this,R.color.colorPrimary);
break;
case R.id.rl_map:
} else if (id == R.id.rl_map) {
mTvHomeImg.setBackgroundResource(R.mipmap.icon_task_hui);
mTvSendImg.setBackgroundResource(R.mipmap.icon_zhibohui);
mTvMapImg.setBackgroundResource(R.mipmap.icon_kehu);
@@ -223,8 +220,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{
StatusBarUtil.transparencyBar(this); //设置状态栏全透明
StatusBarUtil.StatusBarLightMode(this); //设置白底黑字
StatusBarUtil.setStatusBarColor(this,R.color.colorPrimary);
break;
case R.id.rl_mine:
} else if (id == R.id.rl_mine) {
mTvHomeImg.setBackgroundResource(R.mipmap.icon_task_hui);
mTvSendImg.setBackgroundResource(R.mipmap.icon_zhibohui);
mTvMapImg.setBackgroundResource(R.mipmap.icon_kehuhui);
@@ -251,10 +247,6 @@ public class MainActivity extends BaseActivity implements View.OnClickListener{
StatusBarUtil.transparencyBar(this); //设置状态栏全透明
StatusBarUtil.setStatusBarColor(this,R.color.colortheme);
break;
default:
break;
}
fragmentTransaction.commit();
}

View File

@@ -46,15 +46,12 @@ public class ModifyPasActivity extends BaseActivity implements View.OnClickListe
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_login:
//进入主页
int id = v.getId();
if (id == R.id.btn_login) {
//进入主页
// ProfileSpUtils.getInstance().saveLoginSatus(true);
// ProfileSpUtils.getInstance().saveProfile(data);
// startActivity(MainActivity.class);
break;
default:
break;
}
}
}

View File

@@ -96,31 +96,28 @@ public class MessageNoticeActivity extends BaseActivity implements View.OnClickL
@Override
public void onClick(View v) {
switch (v.getId()){
case R.id.tv_today://今天
mTvToday.setBackgroundResource(R.color.color_ffc107);
mTvToday.setTextColor(getResources().getColor(R.color.colorBlack));
mTvYesterday.setBackgroundResource(R.color.color_303030);
mTvYesterday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvHistory.setBackgroundResource(R.color.color_303030);
mTvHistory.setTextColor(getResources().getColor(R.color.colorWhite));
break;
case R.id.tv_yesterday://昨天
mTvToday.setBackgroundResource(R.color.color_303030);
mTvToday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvYesterday.setBackgroundResource(R.color.color_ffc107);
mTvYesterday.setTextColor(getResources().getColor(R.color.colorBlack));
mTvHistory.setBackgroundResource(R.color.color_303030);
mTvHistory.setTextColor(getResources().getColor(R.color.colorWhite));
break;
case R.id.tv_history://历史
mTvToday.setBackgroundResource(R.color.color_303030);
mTvToday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvYesterday.setBackgroundResource(R.color.color_303030);
mTvYesterday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvHistory.setBackgroundResource(R.color.color_ffc107);
mTvHistory.setTextColor(getResources().getColor(R.color.colorBlack));
break;
int id = v.getId();
if (id == R.id.tv_today) {//今天
mTvToday.setBackgroundResource(R.color.color_ffc107);
mTvToday.setTextColor(getResources().getColor(R.color.colorBlack));
mTvYesterday.setBackgroundResource(R.color.color_303030);
mTvYesterday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvHistory.setBackgroundResource(R.color.color_303030);
mTvHistory.setTextColor(getResources().getColor(R.color.colorWhite));
} else if (id == R.id.tv_yesterday) {//昨天
mTvToday.setBackgroundResource(R.color.color_303030);
mTvToday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvYesterday.setBackgroundResource(R.color.color_ffc107);
mTvYesterday.setTextColor(getResources().getColor(R.color.colorBlack));
mTvHistory.setBackgroundResource(R.color.color_303030);
mTvHistory.setTextColor(getResources().getColor(R.color.colorWhite));
} else if (id == R.id.tv_history) {//历史
mTvToday.setBackgroundResource(R.color.color_303030);
mTvToday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvYesterday.setBackgroundResource(R.color.color_303030);
mTvYesterday.setTextColor(getResources().getColor(R.color.colorWhite));
mTvHistory.setBackgroundResource(R.color.color_ffc107);
mTvHistory.setTextColor(getResources().getColor(R.color.colorBlack));
}
}
}

View File

@@ -75,26 +75,22 @@ public class CusInfoDialog extends Dialog implements View.OnClickListener {
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.rl_cus_03://复制抖音号
if (listener != null) {
listener.copydouyin();
}
dismiss();
break;
case R.id.rl_cus_04://复制手机号
if (listener != null) {
listener.copyphone();
}
dismiss();
break;
case R.id.rl_cus_05://拨打电话
if (listener != null) {
listener.phoneClick();
}
dismiss();
break;
int id = view.getId();
if (id == R.id.rl_cus_03) {//复制抖音号
if (listener != null) {
listener.copydouyin();
}
dismiss();
} else if (id == R.id.rl_cus_04) {//复制手机号
if (listener != null) {
listener.copyphone();
}
dismiss();
} else if (id == R.id.rl_cus_05) {//拨打电话
if (listener != null) {
listener.phoneClick();
}
dismiss();
}
}

View File

@@ -66,28 +66,24 @@ public class CusOperationDialog extends Dialog implements View.OnClickListener {
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.bt_draining_kehu://拨打电话
if (listener != null) {
listener.phoneClick();
}
dismiss();
break;
case R.id.rl_tv_uploadAvatar://信息完善
if (listener != null) {
listener.uploadAvatar();
}
dismiss();
break;
case R.id.rl_tv_kaidan://删除客户
if (listener != null) {
listener.kaidanonClick();
}
dismiss();
break;
case R.id.tv_cancel://取消
this.dismiss();
break;
int id = view.getId();
if (id == R.id.bt_draining_kehu) {//拨打电话
if (listener != null) {
listener.phoneClick();
}
dismiss();
} else if (id == R.id.rl_tv_uploadAvatar) {//信息完善
if (listener != null) {
listener.uploadAvatar();
}
dismiss();
} else if (id == R.id.rl_tv_kaidan) {//删除客户
if (listener != null) {
listener.kaidanonClick();
}
dismiss();
} else if (id == R.id.tv_cancel) {//取消
this.dismiss();
}
}

View File

@@ -81,10 +81,9 @@ public class HangyeSelectDialog extends Dialog implements View.OnClickListener {
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_cancel:
dismiss();
break;
int id = view.getId();
if (id == R.id.tv_cancel) {
dismiss();
}
}

View File

@@ -82,10 +82,9 @@ public class HangyeSelectDialogtwo extends Dialog implements View.OnClickListene
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_cancel:
dismiss();
break;
int id = view.getId();
if (id == R.id.tv_cancel) {
dismiss();
}
}

View File

@@ -129,24 +129,20 @@ public class RreplyDialog extends Dialog implements View.OnClickListener {
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.btn_send://上传头像
if (listener != null) {
listener.reply(reply_etSearchh.getText().toString());
}
dismiss();
break;
case R.id.reply_ima://快捷回复
if(flag){
reply_rcey.setVisibility(View.VISIBLE);
flag=false;
}else {
reply_rcey.setVisibility(View.GONE);
flag=true;
}
break;
int id = view.getId();
if (id == R.id.btn_send) {//上传头像
if (listener != null) {
listener.reply(reply_etSearchh.getText().toString());
}
dismiss();
} else if (id == R.id.reply_ima) {//快捷回复
if(flag){
reply_rcey.setVisibility(View.VISIBLE);
flag=false;
}else {
reply_rcey.setVisibility(View.GONE);
flag=true;
}
}
}

View File

@@ -176,11 +176,10 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList
@Override
public void onClick(View v) {
switch (v.getId()){
case R.id.rl_left:
finish();
break;
case R.id.RightTv:
int id = v.getId();
if (id == R.id.rl_left) {
finish();
} else if (id == R.id.RightTv) {
mShowListtwo.clear();
dbRecordBeanData = dbRecordDao.queryAll();
for (int i = 0; i < dbRecordBeanData.size(); i++) {
@@ -191,11 +190,9 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList
if(mShowListtwo.size()>0){
//进入分配页面
ShowAty.AllocationSelectActivity(this,mShowListtwo);}else {
ShowAty.AllocationSelectActivity(this,mShowListtwo); }else {
messageDialog("请选择调拨客户");
}
break;
}
}

View File

@@ -160,11 +160,10 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.rl_left://返回
finish();
break;
case R.id.btn_commit://添加图文编辑
int id = view.getId();
if (id == R.id.rl_left) {//返回
finish();
} else if (id == R.id.btn_commit) {//添加图文编辑
for (int i = 0; i < photoeditor.size(); i++) {
@@ -201,19 +200,16 @@ public class DesignActivity extends BaseTreeActivity<CommitDesignContract.View,
Gson gson = new Gson();
String strtext = gson.toJson(contents);
getPresenter().commitdesign(strtext);
break;
case R.id.rl_des://添加图文编辑
PhotoeditorBean photoeditorBean = new PhotoeditorBean();
photoeditorBean.setCity("");
photoeditorBean.setCustomer_id("");
photoeditorBean.setIndustry_id("");
photoeditorBean.setProvince("");
photoeditor.add(photoeditorBean);
adapter.notifyDataSetChanged();
int size = photoeditor.size();
mLabelRvList.scrollToPosition(size); // 将ListView定位到最后一行
break;
} else if (id == R.id.rl_des) {//添加图文编辑
PhotoeditorBean photoeditorBean = new PhotoeditorBean();
photoeditorBean.setCity("");
photoeditorBean.setCustomer_id("");
photoeditorBean.setIndustry_id("");
photoeditorBean.setProvince("");
photoeditor.add(photoeditorBean);
adapter.notifyDataSetChanged();
int size = photoeditor.size();
mLabelRvList.scrollToPosition(size); // 将ListView定位到最后一行
}
}

View File

@@ -86,17 +86,15 @@ public class JsonDataActivity extends AppCompatActivity implements View.OnClickL
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_data:
mHandler.sendEmptyMessage(MSG_LOAD_DATA);
break;
case R.id.btn_show:
if (isLoaded) {
showPickerView();
} else {
Toast.makeText(JsonDataActivity.this, "Please waiting until the data is parsed", Toast.LENGTH_SHORT).show();
}
break;
int id = v.getId();
if (id == R.id.btn_data) {
mHandler.sendEmptyMessage(MSG_LOAD_DATA);
} else if (id == R.id.btn_show) {
if (isLoaded) {
showPickerView();
} else {
Toast.makeText(JsonDataActivity.this, "Please waiting until the data is parsed", Toast.LENGTH_SHORT).show();
}
}
}

View File

@@ -82,29 +82,23 @@ public class SearchActivity extends BaseActivity implements View.OnClickListener
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.bt_sousuo_ditu: //取消
String seachStr = etSearch.getText().toString().trim();
// if (!TextUtils.isEmpty(seachStr)) {
//保存数据
LocatData.Init().addGood(seachStr);
EventBus.getDefault().post(new ThreeEvent(pagetype,seachStr));
finish();
int id = v.getId();
if (id == R.id.bt_sousuo_ditu) { //取消
String seachStr = etSearch.getText().toString().trim();
// if (!TextUtils.isEmpty(seachStr)) {
//保存数据
LocatData.Init().addGood(seachStr);
EventBus.getDefault().post(new ThreeEvent(pagetype,seachStr));
finish();
// } else {
// ToastUtils.showToast(SearchActivity.this,"搜索条件不能为空!");
// }
finish();
break;
case R.id.tvCancel: //取消
etSearch.setHint("请输入客户姓名、电话");
break;
case R.id.tvEmpty: //清空历史搜索记录
LocatData.Init().clearGood();
mAdapter.setList(new ArrayList<String>());
break;
default:
break;
finish();
} else if (id == R.id.tvCancel) { //取消
etSearch.setHint("请输入客户姓名、电话");
} else if (id == R.id.tvEmpty) { //清空历史搜索记录
LocatData.Init().clearGood();
mAdapter.setList(new ArrayList<String>());
}
}
}

View File

@@ -505,14 +505,11 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.constraintLayout7:
ShowAty.StyleActivity(getActivity());
break;
case R.id.constraintLayout8:
ShowAty.BudgetActivity(getActivity());
break;
int id = view.getId();
if (id == R.id.constraintLayout7) {
ShowAty.StyleActivity(getActivity());
} else if (id == R.id.constraintLayout8) {
ShowAty.BudgetActivity(getActivity());
}
}

View File

@@ -167,19 +167,13 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener
@Override
public void onClick(View v) {
switch (v.getId()) {
default:
break;
case R.id.bt_sousuo_ditu:
ShowAty.SearchActivity(getActivity(),pagetype,"");
break;
case R.id.bt_sousuo_two:
ShowAty.SearchActivity(getActivity(),pagetype,"");
break;
case R.id.bt_fenpei:
ShowAty.AllocationActivity(getActivity(),genzongzhongFragment.search);
break;
int id = v.getId();
if (id == R.id.bt_sousuo_ditu) {
ShowAty.SearchActivity(getActivity(),pagetype,"");
} else if (id == R.id.bt_sousuo_two) {
ShowAty.SearchActivity(getActivity(),pagetype,"");
} else if (id == R.id.bt_fenpei) {
ShowAty.AllocationActivity(getActivity(),genzongzhongFragment.search);
}
}

View File

@@ -170,19 +170,15 @@ public class MyFragment
startActivity(LoginPasswordActivity.class);
return;
}
switch (v.getId()) {
case R.id.my_rl_01:
startActivity(Main2Activity.class);
break;
case R.id.my_rl_02:
ToastUtils.showToast(getActivity(),"该功能暂未开放");
break;
case R.id.my_rl_03:
ToastUtils.showToast(getActivity(),"该功能暂未开放");
break;
case R.id.my_rl_function:
startActivity(PersonalProfileActivity.class);
break;
int id = v.getId();
if (id == R.id.my_rl_01) {
startActivity(Main2Activity.class);
} else if (id == R.id.my_rl_02) {
ToastUtils.showToast(getActivity(),"该功能暂未开放");
} else if (id == R.id.my_rl_03) {
ToastUtils.showToast(getActivity(),"该功能暂未开放");
} else if (id == R.id.my_rl_function) {
startActivity(PersonalProfileActivity.class);
}
}
@@ -193,15 +189,11 @@ public class MyFragment
startActivity(LoginPasswordActivity.class);
return;
}
switch (view.getId()) {
case R.id.item_my_twitter:
int id = view.getId();
if (id == R.id.item_my_twitter) {
// XfiveWebActivity.runActivity(getActivity(), "隐私政策", "http://www.fenghoo.cn/public/statement/7");
XfiveWebActivity.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
XfiveWebActivity.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
// WebActivitytwo.runActivity(getActivity(), "隐私政策", "file:///android_asset/privacy.html");
break;
}
}

View File

@@ -80,13 +80,10 @@ public class PersonalProfileActivity extends BaseTreeActivity<PersonalProfileCon
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.tv_banding:
//绑定微信
getPresenter().weChatBind();
break;
default:
break;
int id = v.getId();
if (id == R.id.tv_banding) {
//绑定微信
getPresenter().weChatBind();
}
}

View File

@@ -73,14 +73,9 @@ public class XfiveWebActivity extends BaseActivity implements View.OnClickListen
@Override
public void onClick(View v) {
switch (v.getId()) {
default:
break;
case R.id.webView:
break;
case R.id.layTop_left_tv:
finish();
break;
int id = v.getId();
if (id == R.id.layTop_left_tv) {
finish();
}
}
}

View File

@@ -109,31 +109,28 @@ public class TitleBar extends RelativeLayout implements View.OnClickListener {
@Override
public void onClick(View view) {
switch (view.getId()) {
//左边按钮
case R.id.iv_left_btn:
if (null != mListener) {
mListener.onLeftButtonClick(view);
}
if (null != mAllClickListener) {
mAllClickListener.onLeftButtonClick(view);
}
break;
int id = view.getId();
//左边按钮
if (id == R.id.iv_left_btn) {
if (null != mListener) {
mListener.onLeftButtonClick(view);
}
if (null != mAllClickListener) {
mAllClickListener.onLeftButtonClick(view);
}
} else if (id == R.id.iv_right_btn) {
//右边按钮
case R.id.iv_right_btn:
if (null != mListener) {
mListener.onRightButtonClick(view);
}
if (null != mAllClickListener) {
mAllClickListener.onRightButtonClick(view);
}
break;
if (null != mListener) {
mListener.onRightButtonClick(view);
}
if (null != mAllClickListener) {
mAllClickListener.onRightButtonClick(view);
}
} else if (id == R.id.tv_right_text) {
//右边文本按钮
case R.id.tv_right_text:
if (null != mAllClickListener) {
mAllClickListener.onRightTextButtonClick(view);
}
break;
if (null != mAllClickListener) {
mAllClickListener.onRightTextButtonClick(view);
}
}
}

View File

@@ -2,16 +2,28 @@
buildscript {
ext {
agp_version = '8.7.3'
}
repositories {
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'https://maven.aliyun.com/repository/public' }//jcenter
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }//gradle-plugin
maven { url 'https://maven.aliyun.com/repository/central' }//central
maven { url 'https://maven.aliyun.com/repository/google' }//google
google()
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.6"
@@ -20,6 +32,16 @@ buildscript {
allprojects {
repositories {
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'https://maven.aliyun.com/repository/public' }//jcenter
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }//gradle-plugin
maven { url 'https://maven.aliyun.com/repository/central' }//central
maven { url 'https://maven.aliyun.com/repository/google' }//google
flatDir {
dirs 'libs'
}
google()
jcenter()
maven { url "https://jitpack.io"}

View File

@@ -1,10 +1,12 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
// apply plugin: 'com.github.dcendents.android-maven' // 与 Gradle 8.9 不兼容,暂时注释
group='com.github.zaaach'
android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
namespace 'com.zaaach.citypicker'
compileSdk 34
compileSdkVersion 34
buildToolsVersion "30.0.2"
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
@@ -20,6 +22,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
dependencies {

View File

@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zaaach.citypicker">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"

View File

@@ -1,2 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
android.nonTransitiveRClass=true

View File

@@ -1,6 +1,6 @@
#Fri Aug 14 15:05:19 CST 2020
#Tue Jan 06 16:50:17 CST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

View File

@@ -1 +1 @@
include ':app', ':citypicker'
include ':app', ':citypicker'