diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java index 3cade46..733a8f5 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/LoginActivity.java @@ -444,8 +444,8 @@ public class LoginActivity extends BaseActivity implements OnClickListener, OnCa break; case R.id.tv_doctor: Uri uri = Uri -// .parse("http://android.myapp.com/myapp/detail.htm?apkName=cn.shangyu.gdxzExpert");//应用宝 - .parse("http://appstore.huawei.com/app/C10526652");//华为 + .parse("http://android.myapp.com/myapp/detail.htm?apkName=cn.shangyu.gdxzExpert");//应用宝 +// .parse("http://appstore.huawei.com/app/C10526652");//华为 // .parse("https://h5coml.vivo.com.cn/h5coml/appdetail_h5/browser_v2/index.html?appId=892989&resource=301&source=1");//vivo Intent intent = new Intent(Intent.ACTION_VIEW, uri); startActivity(intent); diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java index d822b97..8ffe863 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/SettingAndHelpActivity.java @@ -33,6 +33,7 @@ import cn.shangyu.gdxzPatient.ecdemo.common.utils.ToastUtil; import cn.shangyu.gdxzPatient.ecdemo.common.view.SettingItem; import cn.shangyu.gdxzPatient.ecdemo.ui.SDKCoreHelper; import cn.shangyu.gdxzPatient.netease.config.LogoutHelper; +import cn.shangyu.gdxzPatient.splash.WelcomeUI; import cn.shangyu.gdxzPatient.utils.BadgeCountUtils; import cn.shangyu.gdxzPatient.utils.Constant; import cn.shangyu.gdxzPatient.utils.DataCleanManager; @@ -73,7 +74,7 @@ public class SettingAndHelpActivity extends BaseActivity implements private RelativeLayout m_cache; private RelativeLayout m_changepsw,rl_change_iphone; private RelativeLayout m_help,rl_shareapp; - private RelativeLayout m_out, m_aboutus,rl_patgroup; + private RelativeLayout m_out, m_aboutus,rl_patgroup,rl_setting_xieyi; private TextView tv_settings_update, tv_new_version,tv_send; private TextView call_servie;// 拨打客服电话； @@ -138,6 +139,7 @@ public class SettingAndHelpActivity extends BaseActivity implements rl_shareapp.setOnClickListener(this); rl_patgroup.setOnClickListener(this); rl_change_iphone.setOnClickListener(this); + rl_setting_xieyi.setOnClickListener(this); try { tv_total_cache.setText(DataCleanManager.getTotalCacheSize(ctx)); @@ -189,6 +191,7 @@ public class SettingAndHelpActivity extends BaseActivity implements rl_patgroup = (RelativeLayout) view.findViewById(R.id.rl_patgroup);// 退出 tv_new_version = (TextView) view.findViewById(R.id.tv_new_version);// 清除缓存 ll_dynamic=view.findViewById(R.id.ll_dynamic); + rl_setting_xieyi=view.findViewById(R.id.rl_setting_xieyi); ll_dynamic.setOnClickListener(this); // 是否显示更新新版本 if (SharePrefUtil.getBoolean(this, "mIsNewVersion", false)) { @@ -395,6 +398,13 @@ public class SettingAndHelpActivity extends BaseActivity implements @Override public void onClick(View v) { switch (v.getId()) { + case R.id.rl_setting_xieyi://隐私政策 + Intent intent = new Intent(SettingAndHelpActivity.this, ZzcxyActivity.class); + intent.putExtra("tittle", "注册协议及隐私政策"); + intent.setType("zcxy1"); + intent.putExtra("content", Url.zcxy); + startActivity(intent); + break; case R.id.ll_dynamic: goToNotificationSetting(); break; @@ -449,11 +459,11 @@ public class SettingAndHelpActivity extends BaseActivity implements startActivity(intentzhuxiao); break; case R.id.rl_setting_help:// 帮助页 - Intent intent = new Intent(SettingAndHelpActivity.this, + Intent intentxy = new Intent(SettingAndHelpActivity.this, NewsDetailActivity.class); - intent.setType("Help"); - intent.putExtra("content", Url.appHelp); - startActivity(intent); + intentxy.setType("Help"); + intentxy.putExtra("content", Url.appHelp); + startActivity(intentxy); break; case R.id.rl_setting_changepsw:// 修改密码 Intent modifyPwdIntent = new Intent(SettingAndHelpActivity.this, diff --git a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZzcxyActivity.java b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZzcxyActivity.java index b16f3a3..df4d8c1 100644 --- a/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZzcxyActivity.java +++ b/app/src/main/java/cn/shangyu/gdxzPatient/activity/ZzcxyActivity.java @@ -61,7 +61,11 @@ public class ZzcxyActivity extends BaseActivity implements OnClickListener { top_title.setText("帮助"); }else if(intent.getType().equals("zcxy")){ top_title.setText("注册协议与条款"); - }else if(intent.getType().equals("yszc")){ + } + else if(intent.getType().equals("zcxy1")){ + top_title.setText("注册协议及隐私政策"); + } + else if(intent.getType().equals("yszc")){ top_title.setText("隐私政策"); } @@ -155,18 +159,18 @@ public class ZzcxyActivity extends BaseActivity implements OnClickListener { * webview视图，回退 */ private void initEvent() { - new Thread(new Runnable() { - @Override - public void run() { - wv_zcxy.setWebChromeClient(new WebChromeClient(){ - @Override - public void onReceivedTouchIconUrl(WebView view, - String url, boolean precomposed) { - super.onReceivedTouchIconUrl(view, url, precomposed); - } - }); - } - }); +// new Thread(new Runnable() { +// @Override +// public void run() { +// wv_zcxy.setWebChromeClient(new WebChromeClient(){ +// @Override +// public void onReceivedTouchIconUrl(WebView view, +// String url, boolean precomposed) { +// super.onReceivedTouchIconUrl(view, url, precomposed); +// } +// }); +// } +// }); top_back_layout.setOnClickListener(new OnClickListener() { @Override @@ -187,6 +191,6 @@ public class ZzcxyActivity extends BaseActivity implements OnClickListener { } - private ZzcxyActivity ctx; +// private ZzcxyActivity ctx; } diff --git a/app/src/main/res/layout/activity_regist_zcxy.xml b/app/src/main/res/layout/activity_regist_zcxy.xml index e9253ba..9d2f893 100644 --- a/app/src/main/res/layout/activity_regist_zcxy.xml +++ b/app/src/main/res/layout/activity_regist_zcxy.xml @@ -8,6 +8,6 @@ android:id="@+id/wv_zcxy" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_" /> + /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 1687f39..b427d08 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -406,7 +406,32 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" android:background="@color/list_divider" /> + + + + +