更新优化

app/src/main/java/cn/shangyu/gdxzExpert/activity/AccumulatePointsActivity.java

@@ -1,5 +1,6 @@
 package cn.shangyu.gdxzExpert.activity;
 
+import static cn.shangyu.gdxzExpert.application.BaseApplication.getContext;
 import static cn.shangyu.gdxzExpert.utils.CommonUtil.BigModule;
 
 import android.app.AlertDialog;
@@ -52,8 +53,10 @@ import cn.shangyu.gdxzExpert.pointsmall.PointsMallActivity;
 import cn.shangyu.gdxzExpert.ui.CustomProgressDialog;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
 import cn.shangyu.gdxzExpert.utils.Constant;
+import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.utils.Url;
 import cn.shangyu.gdxzExpert.widget.ECAlertDialog;
 import cn.shangyu.gdxzExpert.widget.LoadingPage.ResultState;
@@ -384,8 +387,10 @@ public class AccumulatePointsActivity extends BaseActivity implements OnCallBack
 			}
 			else
 			{
-				Intent intent = new Intent(AccumulatePointsActivity.this, PointsMallActivity.class);
-				startActivity(intent);
+//				Intent intent = new Intent(AccumulatePointsActivity.this, PointsMallActivity.class);
+//				startActivity(intent);
+				UniappUtil.showUniMp(getContext(), "/pages_goods/pointMall/pointMall", null);
+
 			}
 		} else if (id == R.id.ll_integraltickit) {//积分券
 			Intent intent1 = new Intent(AccumulatePointsActivity.this, IntegralTicketActivity.class);

app/src/main/java/cn/shangyu/gdxzExpert/activity/CoollectCourseActivity.java

@@ -35,6 +35,7 @@ import cn.shangyu.gdxzExpert.utils.SharePrefUtil;
 import cn.shangyu.gdxzExpert.utils.StringUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.utils.Url;
 import cn.shangyu.gdxzExpert.widget.LoadingPage.ResultState;
 
@@ -129,7 +130,7 @@ public class CoollectCourseActivity extends BaseActivity implements
 		pageParams.put("src", DataList.get(arg2-1).path);
 		pageParams.put("uuid", DataList.get(arg2-1).other_uuid);
 		pageParams.put("from", "collect");
-		MyUserIconUtil.showUniMp(mActivity, "/pages_app/pptDetail/pptDetail", pageParams);
+		UniappUtil.showUniMp(mActivity, "/pages_app/pptDetail/pptDetail", pageParams);
 	}
 
 	@Override

app/src/main/java/cn/shangyu/gdxzExpert/activity/DuiFuliActivity.java

@@ -38,8 +38,10 @@ import cn.shangyu.gdxzExpert.bean.FuCardBean;
 import cn.shangyu.gdxzExpert.http.OnCallBackFromNet;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
 import cn.shangyu.gdxzExpert.utils.GsonTools;
+import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.widget.LoadingPage;
 
 public class DuiFuliActivity extends BaseActivity implements OnCallBackFromNet {
@@ -238,9 +240,11 @@ public class DuiFuliActivity extends BaseActivity implements OnCallBackFromNet {
 //                broadc.setType("qiandao");
 //                startActivity(broadc);
         } else if (id == R.id.r_top) {
-                Intent intent1=new Intent(DuiFuliActivity.this,MyWelfAreActivity.class);
-                intent1.putExtra("changeFragment",2);
-                startActivity(intent1);
+//                Intent intent1=new Intent(DuiFuliActivity.this,MyWelfAreActivity.class);
+//                intent1.putExtra("changeFragment",2);
+//                startActivity(intent1);
+
+            UniappUtil.showUniMp(DuiFuliActivity.this, "/pages_app/myWelfare/myWelfare", null);
         }
     }
 
@@ -290,10 +294,10 @@ public class DuiFuliActivity extends BaseActivity implements OnCallBackFromNet {
                             public void onClick(View v) {
 
                                 dialog4.dismiss();
-                                Intent intent1=new Intent(DuiFuliActivity.this,MyWelfAreActivity.class);
-                                intent1.putExtra("changeFragment",2);
-                                startActivity(intent1);
-
+//                                Intent intent1=new Intent(DuiFuliActivity.this,MyWelfAreActivity.class);
+//                                intent1.putExtra("changeFragment",2);
+//                                startActivity(intent1);
+                                UniappUtil.showUniMp(DuiFuliActivity.this, "/pages_app/myWelfare/myWelfare", null);
 
                             }
                         });

app/src/main/java/cn/shangyu/gdxzExpert/activity/GandanConsultActivity.java

@@ -25,6 +25,7 @@ import cn.shangyu.gdxzExpert.utils.GsonTools;
 import cn.shangyu.gdxzExpert.utils.LogUtil;
 import cn.shangyu.gdxzExpert.utils.StringUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.utils.Url;
 import cn.shangyu.gdxzExpert.view.RollViewPager;
 import cn.shangyu.gdxzExpert.widget.LoadingPage;
@@ -120,7 +121,8 @@ public class GandanConsultActivity extends BaseActivity implements View.OnClickL
         } else if (id == R.id.rl_video) {//肝胆新闻
             startActivity(new Intent(ct, NewsActivity.class));
         } else if (id == R.id.rl_lczhaomu) {//肝胆会议
-            startActivity(new Intent(ct, GandanMeetingActivity.class));
+//            startActivity(new Intent(ct, GandanMeetingActivity.class));
+            UniappUtil.showUniMp(ct, "/pages/live/live", null);
         }
     }
 

app/src/main/java/cn/shangyu/gdxzExpert/activity/MainActivity.java

@@ -197,6 +197,7 @@ import cn.shangyu.gdxzExpert.utils.StreamTool;
 import cn.shangyu.gdxzExpert.utils.StringUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.utils.UpdateVersionUtils;
 import cn.shangyu.gdxzExpert.utils.Url;
 import cn.shangyu.gdxzExpert.view.viewbadger.BadgeView;
@@ -469,7 +470,7 @@ public class MainActivity extends BaseActivity implements
 				@Override
 				public void onClick(View v) {
 
-					MyUserIconUtil.showUniMp(MainActivity.this, "/pages_app/patientVideo/patientVideo", null);
+					UniappUtil.showUniMp(MainActivity.this, "/pages_app/patientVideo/patientVideo", null);
 //					startActivity(new Intent(ct,PatientVideoActivity.class));
 				}
 			});
@@ -640,7 +641,7 @@ public class MainActivity extends BaseActivity implements
 							Intent intent = new Intent(BaseApplication.getContext(), NewSystemMessageActivity.class);
 							intent.putExtra("module",2);
 							PendingIntent pendingIntent = PendingIntent.getActivity(BaseApplication.getContext(), 35,
-									intent, PendingIntent.FLAG_UPDATE_CURRENT);
+									intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 							// 处理自定义通知消息
 							Notification notification1 = new NotificationCompat.Builder(MainActivity.this,"随访消息")
 									.setAutoCancel(true)
@@ -664,7 +665,7 @@ public class MainActivity extends BaseActivity implements
 							saveUnreadFollow();
 							Intent intent = new Intent(BaseApplication.getContext(), NormNewPatientActivity.class);
 							PendingIntent pendingIntent = PendingIntent.getActivity(BaseApplication.getContext(), 35,
-									intent, PendingIntent.FLAG_UPDATE_CURRENT);
+									intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 							// 处理自定义通知消息
 							Notification notification1 = new NotificationCompat.Builder(MainActivity.this,"随访消息")
 									.setAutoCancel(true)
@@ -692,7 +693,7 @@ public class MainActivity extends BaseActivity implements
 							saveUnreadFollow();
 							Intent intent = new Intent(BaseApplication.getContext(), NormNewPatientActivity.class);
 							PendingIntent pendingIntent = PendingIntent.getActivity(BaseApplication.getContext(), 35,
-									intent, PendingIntent.FLAG_UPDATE_CURRENT);
+									intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 							// 处理自定义通知消息
 							Notification notification1 = new NotificationCompat.Builder(MainActivity.this,"随访消息")
 									.setAutoCancel(true)
@@ -721,7 +722,7 @@ public class MainActivity extends BaseActivity implements
 					{
 						Intent intent = new Intent(BaseApplication.getContext(), MainActivity.class);
 						PendingIntent pendingIntent = PendingIntent.getActivity(BaseApplication.getContext(), 35,
-								intent, PendingIntent.FLAG_UPDATE_CURRENT);
+								intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 						// 处理自定义通知消息
 						Notification notification1 = new NotificationCompat.Builder(MainActivity.this,"随访消息")
 								.setAutoCancel(true)
@@ -742,7 +743,7 @@ public class MainActivity extends BaseActivity implements
 			{
 				Intent intent = new Intent(BaseApplication.getContext(), MainActivity.class);
 				PendingIntent pendingIntent = PendingIntent.getActivity(BaseApplication.getContext(), 35,
-						intent, PendingIntent.FLAG_UPDATE_CURRENT);
+						intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
 				// 处理自定义通知消息
 				Notification notification1 = new NotificationCompat.Builder(MainActivity.this,"随访消息")
@@ -1214,12 +1215,12 @@ public class MainActivity extends BaseActivity implements
 
 			changeNews();
 		} else if (checkedId == R.id.tab_rbn_kepu) {
-			mToolbar.setBackgroundColor(getResources().getColor(R.color.top_bg));
-			mToolbar.getBackground().setAlpha(255);
-			mRg_kepu.setVisibility(View.VISIBLE);
-			mV_kp.setVisibility(View.VISIBLE);
+//			mToolbar.setBackgroundColor(getResources().getColor(R.color.top_bg));
+//			mToolbar.getBackground().setAlpha(255);
+//			mRg_kepu.setVisibility(View.VISIBLE);
+//			mV_kp.setVisibility(View.VISIBLE);
 			mRb_published.setChecked(true);
-			top_sgin.setVisibility(View.GONE);
+//			top_sgin.setVisibility(View.GONE);
 			MobclickAgent.onEvent(this, EXPERT_TAB_TEACH);
 
 //			mRb_teach.setTextColor(getResources().getColor(R.color.tab_text_sel));
@@ -1238,7 +1239,10 @@ public class MainActivity extends BaseActivity implements
 //			tab_rbn_my.setCompoundDrawablesWithIntrinsicBounds(null,
 //					getResources().getDrawable(R.drawable.home_my_nor), null, null);
 
-			changePatientZhongxin();
+//			changePatientZhongxin();
+
+			showUniMp(true, "/pages/patientClass/patientClass");
+
 		} else if (checkedId == R.id.tab_rbn_home) {
 			mToolbar.setBackgroundColor(getResources().getColor(R.color.top_bg));
 			mRg_kepu.setVisibility(View.GONE);
@@ -1351,7 +1355,7 @@ public class MainActivity extends BaseActivity implements
 //				//没有用
 //			}
 
-			showUniMp(true);
+			showUniMp(true, "/pages/live/live");
 
 
 		} else if (checkedId == R.id.tab_rbn_my) {
@@ -1403,7 +1407,7 @@ public class MainActivity extends BaseActivity implements
 	};
 
 	//展示uniapp mp
-	public void showUniMp(boolean showLoading){
+	public void showUniMp(boolean showLoading, String targetPath){
 		if(showLoading){
 			showFullScreenLoading();
 		}
@@ -1419,7 +1423,7 @@ public class MainActivity extends BaseActivity implements
 				sendJsonPostParamtoNetSignMD5(getAccessToken, param, ACCESS_TOKEN,this);
 			}
 
-			MyUserIconUtil.showUniMp(MainActivity.this, "/pages/live/live", null);
+			UniappUtil.showUniMp(MainActivity.this, targetPath, null);
 			if(showLoading) {
 				hideFullScreenLoading();
 			}
@@ -1760,7 +1764,7 @@ public class MainActivity extends BaseActivity implements
 		top_right_system_msg.setImageResource(R.drawable.my_message_icon);
 		top_sao.setVisibility(View.GONE);
 		top_search.setVisibility(View.VISIBLE);
-		top_search.setOnClickListener(new OnClickListener() {
+		top_search.setOnClickListener(new OnClickListener() 	{
 
 			@Override
 			public void onClick(View v) {
@@ -1813,8 +1817,8 @@ public class MainActivity extends BaseActivity implements
 				}
 				needreportSimple("read_message");
 				MobclickAgent.onEvent(MainActivity.this, EXPERT_HOME_MESSGAE);
-				startActivity(new Intent(ct, NewSystemMessageActivity.class));
-
+//				startActivity(new Intent(ct, NewSystemMessageActivity.class));
+				showUniMp(true, "/pages_app/msg/msg");
 //				startActivity(new Intent(ct, SystemMessageActivity.class));
 //				SharePrefUtil.saveBoolean(ct, "isHaveSysMsg", false);
 //				if (badgeSysMsg != null) {
@@ -2071,18 +2075,23 @@ public class MainActivity extends BaseActivity implements
 	protected void onResume() {
 
 		LogUtil.i("onResume: ", current_tab_id+"");
-		if(current_tab_id == R.id.tab_rbn_donation && BaseApplication.auto_show_unimp){
+		if((current_tab_id == R.id.tab_rbn_donation || current_tab_id == R.id.tab_rbn_kepu) && BaseApplication.auto_show_unimp){
 			long current_timestmp = System.currentTimeMillis();
 			//防止无限循环打开
 			if(current_timestmp - BaseApplication.auto_show_unimp_timestamp > 1.5 * 1000){
 				BaseApplication.auto_show_unimp_timestamp = current_timestmp;
-				showUniMp(true);
+				if(current_tab_id == R.id.tab_rbn_donation){
+					showUniMp(true, "/pages/live/live");
+				}else if(current_tab_id == R.id.tab_rbn_kepu){
+					showUniMp(true, "/pages/patientClass/patientClass");
+				}
+
 			}else{
 				//触发错误次数
 				BaseApplication.auto_show_unimp_error_times ++;
 				//错误次数大于5，则关闭小程序
 				if(BaseApplication.auto_show_unimp_error_times > 5){
-					MyUserIconUtil.closeUniMP();
+					UniappUtil.closeUniMP();
 					BaseApplication.auto_show_unimp_error_times = 0;
 				}
 			}
@@ -2995,10 +3004,10 @@ public class MainActivity extends BaseActivity implements
 							btn_sure.setOnClickListener(new OnClickListener() {
 								@Override
 								public void onClick(View v) {
-                                                                                                                                    Intent intent1 = new Intent(MainActivity.this, MyWelfAreActivity.class);
-                                                                                                                                    startActivity(intent1);
-                                                                                                                                    dialog4.dismiss();
-
+//									Intent intent1 = new Intent(MainActivity.this, MyWelfAreActivity.class);
+//									startActivity(intent1);
+									dialog4.dismiss();
+									UniappUtil.showUniMp(MainActivity.this, "/pages_app/myWelfare/myWelfare", null);
 
 								}
 							});
@@ -3036,10 +3045,11 @@ public class MainActivity extends BaseActivity implements
 							btn_sure.setOnClickListener(new OnClickListener() {
 								@Override
 								public void onClick(View v) {
-                                                                                                                                    Intent intent1 = new Intent(MainActivity.this, MyWelfAreActivity.class);
-                                                                                                                                   startActivity(intent1);
-                                                                                                                                    dialog4.dismiss();
+//									Intent intent1 = new Intent(MainActivity.this, MyWelfAreActivity.class);
+//									startActivity(intent1);
+									dialog4.dismiss();
 
+									UniappUtil.showUniMp(MainActivity.this, "/pages_app/myWelfare/myWelfare", null);
 
 								}
 							});

app/src/main/java/cn/shangyu/gdxzExpert/activity/MyDownLoadsActivity.java

@@ -14,6 +14,7 @@ import cn.shangyu.gdxzExpert.utils.Constant;
 import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.SharePrefUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.widget.LoadingPage.ResultState;
 
 public class MyDownLoadsActivity extends BaseActivity{
@@ -214,14 +215,14 @@ public class MyDownLoadsActivity extends BaseActivity{
 		} else if (id == R.id.rl_4) {
 			if (isDownLoad) {
 				//跳到uniapp 的缓存页面
-				MyUserIconUtil.showUniMp(MyDownLoadsActivity.this, "/pages_app/zhinanDownload/zhinanDownload", null);
+				UniappUtil.showUniMp(MyDownLoadsActivity.this, "/pages_app/zhinanDownload/zhinanDownload", null);
 			} else {
 				startActivity(new Intent(mActivity, CoollectVideoActivity.class).putExtra("name",mTv_title4.getText().toString()));
 			}
 		} else if (id == R.id.rl_5) {
 			if (isDownLoad) {
 				//跳到uniapp 的缓存页面
-				MyUserIconUtil.showUniMp(MyDownLoadsActivity.this, "/pages_app/pptDownload/pptDownload", null);
+				UniappUtil.showUniMp(MyDownLoadsActivity.this, "/pages_app/pptDownload/pptDownload", null);
 			} else {
 				startActivity(new Intent(mActivity, CoollectCourseActivity.class));
 			}

app/src/main/java/cn/shangyu/gdxzExpert/activity/MyFuliCardActivity.java

@@ -24,8 +24,10 @@ import cn.shangyu.gdxzExpert.pulltorefreshview.PullToRefreshBase;
 import cn.shangyu.gdxzExpert.pulltorefreshview.PullToRefreshListView;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
 import cn.shangyu.gdxzExpert.utils.GsonTools;
+import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.widget.LoadingPage;
 
 public class MyFuliCardActivity extends BaseActivity implements OnCallBackFromNet {
@@ -140,9 +142,11 @@ public class MyFuliCardActivity extends BaseActivity implements OnCallBackFromNe
 //                startActivity(broadc);
                 break;
             case R.id.r_top:
-                Intent intent1=new Intent(MyFuliCardActivity.this,MyWelfAreActivity.class);
-                intent1.putExtra("changeFragment",2);
-                startActivity(intent1);
+//                Intent intent1=new Intent(MyFuliCardActivity.this,MyWelfAreActivity.class);
+//                intent1.putExtra("changeFragment",2);
+//                startActivity(intent1);
+
+                UniappUtil.showUniMp(MyFuliCardActivity.this, "/pages_app/myWelfare/myWelfare", null);
                 break;
         }
 

app/src/main/java/cn/shangyu/gdxzExpert/activity/MyPatientActivity.java

@@ -69,6 +69,7 @@ import cn.shangyu.gdxzExpert.utils.GsonTools;
 import cn.shangyu.gdxzExpert.utils.LogUtil;
 import cn.shangyu.gdxzExpert.utils.SharePrefUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.utils.Url;
 import cn.shangyu.gdxzExpert.view.viewbadger.BadgeView;
 import cn.shangyu.gdxzExpert.widget.ECAlertDialog;
@@ -90,6 +91,7 @@ import static cn.shangyu.gdxzExpert.fragment.PatientListFragment.PatientUrl;
 
 public class MyPatientActivity extends BaseActivity implements
 		OnCheckedChangeListener, OnUpdateMsgUnreadCountsListener, ReminderManager.UnreadNumChangedCallback {
+	private static final String EXTRA_OPEN_PATIENT_MSG = "open_patient_msg";
 
 	private RadioGroup main_radiogroup;
 	private FragmentManager fm;
@@ -169,7 +171,7 @@ public class MyPatientActivity extends BaseActivity implements
 		main_radiogroup.setOnCheckedChangeListener(this);
 		instance = this;
 		fm = getSupportFragmentManager();
-		changeMessage();
+		handleEntryIntent(getIntent());
 		isSuccessView = true;
 		// 患者列表申请提醒
 		bt_paintlist = (Button) view.findViewById(R.id.bt_paintlist);
@@ -182,6 +184,30 @@ public class MyPatientActivity extends BaseActivity implements
 		yuninit();
 		return view;
 	}
+
+	@Override
+	protected void onNewIntent(Intent intent) {
+		super.onNewIntent(intent);
+		setIntent(intent);
+		if (isSuccessView) {
+			handleEntryIntent(intent);
+		}
+	}
+
+	private void handleEntryIntent(Intent intent) {
+		// 默认保持原有行为：进入页面即展示患者消息
+		if (intent != null && intent.getBooleanExtra(EXTRA_OPEN_PATIENT_MSG, false)) {
+			// 清掉一次性标记，避免后续 getIntent() 重复触发同一路由
+			intent.removeExtra(EXTRA_OPEN_PATIENT_MSG);
+		}
+		if (main_radiogroup != null
+				&& main_radiogroup.getCheckedRadioButtonId() != R.id.tab_rbn_message) {
+			main_radiogroup.setOnCheckedChangeListener(null);
+			main_radiogroup.check(R.id.tab_rbn_message);
+			main_radiogroup.setOnCheckedChangeListener(this);
+		}
+		changeMessage();
+	}
 	private LocalBroadcastManager localBroadcastManager;
 	private IntentFilter intentFilter;
 	LocalReceiver localReceiver;
@@ -255,9 +281,17 @@ public class MyPatientActivity extends BaseActivity implements
 				break;
 			case R.id.tab_rbn_patlist:
 				changePatlist();
+
+//				com.alibaba.fastjson.JSONObject pageParams = new JSONObject();
+//				pageParams.put("type", "list");
+//				UniappUtil.showUniMp(MyPatientActivity.this, "/pages_app/patientMsg/patientList", pageParams);
 				break;
 			case R.id.tab_rbn_visit:
 				changevisit();
+
+//				com.alibaba.fastjson.JSONObject pageParams_plan = new JSONObject();
+//				pageParams_plan.put("type", "plan");
+//				UniappUtil.showUniMp(MyPatientActivity.this, "/pages_app/patientMsg/patientPlan", pageParams_plan);
 				break;
 		}
 	}

app/src/main/java/cn/shangyu/gdxzExpert/activity/MyWelfAreActivity.java

@@ -20,7 +20,9 @@ import cn.shangyu.gdxzExpert.base.BaseActivity;
 import cn.shangyu.gdxzExpert.fragment.GetWelfAreFragment;
 import cn.shangyu.gdxzExpert.fragment.WelfAreFragment;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
+import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.widget.LoadingPage;
 
 /**
@@ -147,7 +149,9 @@ public class MyWelfAreActivity extends BaseActivity {
         } else if (id == R.id.ll_buy_point) {
             startActivity(new Intent(mcontext,WelfareDetailActivity.class));
         } else if (id == R.id.ll_integraltickit) {
-            startActivity(new Intent(mcontext,AccumulatePointsActivity.class));
+//            startActivity(new Intent(mcontext,AccumulatePointsActivity.class));
+
+            UniappUtil.showUniMp(mcontext, "/pages_app/myPoint/myPoint", null);
         }
     }
     private void initFragment() {

app/src/main/java/cn/shangyu/gdxzExpert/activity/NavigationActivity.java

@@ -31,9 +31,11 @@ import cn.shangyu.gdxzExpert.pointsmall.PointsMallActivity;
 import cn.shangyu.gdxzExpert.polyvplayer.QualityCourseActivity;
 import cn.shangyu.gdxzExpert.ui.CustomProgressDialog;
 import cn.shangyu.gdxzExpert.utils.Constant;
+import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.SharePrefUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.utils.Url;
 import cn.shangyu.gdxzExpert.widget.ECAlertDialog;
 import cn.shangyu.gdxzExpert.widget.LoadingPage.ResultState;
@@ -457,12 +459,13 @@ public class NavigationActivity extends BaseActivity implements OnCallBackFromNe
 			break;
 			case R.id.bt_point1:
 			case R.id.bt_point:
-				startActivity(new Intent(mActivity, PointsMallActivity.class));
+//				startActivity(new Intent(mActivity, PointsMallActivity.class));
+				UniappUtil.showUniMp(mActivity, "/pages_goods/pointMall/pointMall", null);
 				break;
 			case R.id.ll_sign1:
 			case R.id.ll_sign:
-				startActivity(new Intent(NavigationActivity.this,AccumulatePointsActivity.class));
-
+//				startActivity(new Intent(NavigationActivity.this,AccumulatePointsActivity.class));
+				UniappUtil.showUniMp(NavigationActivity.this, "/pages_app/myPoint/myPoint", null);
 //				if (Constant.isSignIn) {
 //					dilaog2 = ECAlertDialog.buildAlert(NavigationActivity.this,
 //							"今日已签到,每日只能签到一次。\n                请明日继续哦~", "关闭", new DialogInterface.OnClickListener() {// 确定

app/src/main/java/cn/shangyu/gdxzExpert/activity/PublicConsultationActivity.java

@@ -16,6 +16,7 @@ import cn.shangyu.gdxzExpert.base.BaseActivity;
 import cn.shangyu.gdxzExpert.fragment.MoreToOneConsultFragment;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 import cn.shangyu.gdxzExpert.widget.LoadingPage;
 
 /**
@@ -156,7 +157,7 @@ public class PublicConsultationActivity extends BaseActivity implements RadioGro
                 }
                 break;
             case R.id.rb_question2:
-                MyUserIconUtil.showUniMp(this, "/pages_app/consult/consult", null);
+                UniappUtil.showUniMp(this, "/pages_app/consult/consult", null);
                 break;
         }
     }

app/src/main/java/cn/shangyu/gdxzExpert/activity/PublicSearchActivity.java

@@ -2,6 +2,8 @@ package cn.shangyu.gdxzExpert.activity;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 
+import static cn.shangyu.gdxzExpert.application.BaseApplication.getContext;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -37,9 +39,11 @@ import cn.shangyu.gdxzExpert.report.CommUtil;
 import cn.shangyu.gdxzExpert.report.ReportService;
 import cn.shangyu.gdxzExpert.report.reportBean;
 import cn.shangyu.gdxzExpert.utils.Constant;
+import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
 import cn.shangyu.gdxzExpert.utils.StringUtil;
 import cn.shangyu.gdxzExpert.utils.ToastUtil;
 import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
 
 public class PublicSearchActivity extends AppCompatActivity implements OnClickListener {
 	private GridView gv_search;
@@ -273,11 +277,15 @@ public class PublicSearchActivity extends AppCompatActivity implements OnClickLi
 				needreport("名科");
 				break;
 			case 11:
-				Intent intentshop = new Intent(PublicSearchActivity.this,
-						PointsMallActivity.class);
-				intentshop.putExtra("name", searchStr);
-				intentshop.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-				startActivity(intentshop);
+//				Intent intentshop = new Intent(PublicSearchActivity.this, PointsMallActivity.class);
+//				intentshop.putExtra("name", searchStr);
+//				intentshop.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+//				startActivity(intentshop);
+
+				com.alibaba.fastjson.JSONObject pageParams = new com.alibaba.fastjson.JSONObject();
+				pageParams.put("name", searchStr);
+				UniappUtil.showUniMp(PublicSearchActivity.this, "/pages_goods/pointMall/pointMall", pageParams);
+
 				needreport("积分商城");
 				break;
 			default:
@@ -409,11 +417,12 @@ public class PublicSearchActivity extends AppCompatActivity implements OnClickLi
 			startActivity(intentDepart);
 			break;
 		case 12:
-			Intent intentshop = new Intent(PublicSearchActivity.this,
-					PointsMallActivity.class);
-			intentshop.putExtra("name", searchStr);
-			intentshop.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			startActivity(intentshop);
+//			Intent intentshop = new Intent(PublicSearchActivity.this, PointsMallActivity.class);
+//			intentshop.putExtra("name", searchStr);
+//			intentshop.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+//			startActivity(intentshop);
+			UniappUtil.showUniMp(getContext(), "/pages_goods/pointMall/pointMall", null);
+
 			break;
 		default:
 			break;

app/src/main/java/cn/shangyu/gdxzExpert/activity/SettingAndHelpActivity.java

@@ -63,8 +63,8 @@ import cn.shangyu.gdxzExpert.ecdemo.storage.IMessageSqlManager;
 import cn.shangyu.gdxzExpert.ecdemo.ui.SDKCoreHelper;
 import cn.shangyu.gdxzExpert.ecdemo.ui.SettingItem;
 import cn.shangyu.gdxzExpert.http.OnCallBackFromNet;
+import cn.shangyu.gdxzExpert.netease.bagder.Badger;
 import cn.shangyu.gdxzExpert.netease.config.LogoutHelper;
-import cn.shangyu.gdxzExpert.utils.BadgeCountUtils;
 import cn.shangyu.gdxzExpert.utils.CommonUtil;
 import cn.shangyu.gdxzExpert.utils.Constant;
 import cn.shangyu.gdxzExpert.utils.DataCleanManager;
@@ -763,17 +763,19 @@ public class SettingAndHelpActivity extends BaseActivity implements OnCallBackFr
 		tv_cache.setText(getCacheSize());
 		LogUtil.i("cache==" + getCacheSize());
 		closeProgressDialog();
-		//清除随访患者未读消息数
-		int i = IMessageSqlManager.UnreadCount(Constant.typePatient);
-		//清除公益咨询未读消息数
-		int i1 = IMessageSqlManager.UnreadCount(Constant.typeConsult);
+		// 清除本地会话未读（随访患者、公益咨询）
+		IMessageSqlManager.UnreadCount(Constant.typePatient);
+		IMessageSqlManager.UnreadCount(Constant.typeConsult);
 		ConversationSqlManager.setChattingSessionRead(1);
-		String brand = android.os.Build.BRAND;
-		if ("Xiaomi".equals(brand)){
-			//小米不需要原生角标
-		}else {
-			BadgeCountUtils.removeBadge(UIUtils.getContext());
-
+		// 清除云信 IM 未读
+		NIMClient.getService(MsgService.class).clearAllUnreadCount();
+		// 清除桌面角标（IM + unreadFollow）及应用内系统消息角标状态
+		Badger.clearAllBadges(ct);
+		SharePrefUtil.saveBoolean(ct, "isHaveSysMsg", false);
+		NotificationManager notificationManager =
+				(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		if (notificationManager != null) {
+			notificationManager.cancel(55);
 		}
 		String pathName = getApplicationContext().getExternalFilesDir("").getAbsolutePath()+ "/欢迎页/huanyingye.jpg";
 		File currentFile = new File(pathName);
@@ -782,7 +784,6 @@ public class SettingAndHelpActivity extends BaseActivity implements OnCallBackFr
 		}
 		SharePrefUtil.saveString(getApplicationContext(),
 				Url.getStartpage+"new", "");
-		NIMClient.getService(MsgService.class).clearAllUnreadCount();
 		ToastUtil.showToast("清除完毕");
 	}
 

app/src/main/java/cn/shangyu/gdxzExpert/activity/UniappPayPointActivity.java

@@ -0,0 +1,706 @@
+package cn.shangyu.gdxzExpert.activity;
+
+import static cn.shangyu.gdxzExpert.utils.Constant.uniapp_mp_appid;
+
+import android.app.Activity;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.pingplusplus.android.Pingpp;
+import com.tencent.mm.opensdk.modelpay.PayReq;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.shangyu.gdxzExpert.R;
+import cn.shangyu.gdxzExpert.application.BaseApplication;
+import cn.shangyu.gdxzExpert.base.BaseActivity;
+import cn.shangyu.gdxzExpert.bean.PayWechatBean;
+import cn.shangyu.gdxzExpert.http.OnCallBackFromNet;
+import cn.shangyu.gdxzExpert.utils.Constant;
+import cn.shangyu.gdxzExpert.utils.DestroyActivityUtil;
+import cn.shangyu.gdxzExpert.utils.GsonTools;
+import cn.shangyu.gdxzExpert.utils.LogUtil;
+import cn.shangyu.gdxzExpert.utils.OneClickUtil;
+import cn.shangyu.gdxzExpert.utils.SharePrefUtil;
+import cn.shangyu.gdxzExpert.utils.StringUtil;
+import cn.shangyu.gdxzExpert.utils.ToastUtil;
+import cn.shangyu.gdxzExpert.utils.UIUtils;
+import cn.shangyu.gdxzExpert.utils.UniappUtil;
+import cn.shangyu.gdxzExpert.utils.Url;
+import cn.shangyu.gdxzExpert.widget.ECAlertDialog;
+import cn.shangyu.gdxzExpert.widget.LoadingPage.ResultState;
+import io.dcloud.feature.sdk.Interface.IUniMP;
+
+/**
+ * uniapp 端调用 支付购买积分
+ */
+public class UniappPayPointActivity extends BaseActivity implements OnCallBackFromNet,
+		OnCheckedChangeListener{
+	private Intent getintent;
+	private View view;
+	private Button mBt_pay;
+	private CheckBox mCb_balance, mCb_zhifubao, mCb_weixin, mCb_yinlian;
+	private LinearLayout mLl_balance, mLl_zhifubao, mLl_weixin, mLl_yinlian;
+	private String CHANNEL_ZHIFUBAO = "alipay";
+	private String CHANNEL_WEIXIN = "wx";
+	private String CHANNEL_YINLAN = "upacp";
+	
+	private String payChannel = "0";
+	private String pay_money;
+
+	private String product_id;
+	private String type;
+
+	private String order_id;
+	private TextView mTv_pay_money, mTv_pay_yue, mTv_monet_enough,pay_name,pay_type;
+	private String uuid;
+	private double pay;
+	private boolean NoMoney = false;
+	// private boolean isDetail = false;
+	private boolean paySUCCESS = false;
+	private String paymoney;
+	private String jifen;
+
+	@Override
+	public void setTitle() {
+		// TODO Auto-generated method stub
+		top_title.setText("购买积分");
+//		pay_money = getIntent().getStringExtra("money");
+//		order_id = getIntent().getStringExtra("order_id");
+		// if (getIntent().getType() != null
+		// && getIntent().getType().equals("detail")) {
+		// isDetail = true;
+		// }
+	}
+
+	@Override
+	public View onCreateSuccessedView() {
+		// TODO Auto-generated method stub
+//		api = WXAPIFactory.createWXAPI(this, Constant.WeId,false);
+//		Intent intent = getIntent();
+//		api.handleIntent(intent, this);
+		ImmersionBar.with(this).keyboardEnable(true).statusBarDarkFont(true).titleBar(mToolbar).init();
+		view = UIUtils.inflate(R.layout.activity_pay);
+		mBt_pay = (Button) view.findViewById(R.id.bt_pay);
+		mCb_balance = (CheckBox) view.findViewById(R.id.cb_pay_balance);
+		mCb_zhifubao = (CheckBox) view.findViewById(R.id.cb_pay_zhifubao);
+		mCb_weixin = (CheckBox) view.findViewById(R.id.cb_pay_weixin);
+		mCb_yinlian = (CheckBox) view.findViewById(R.id.cb_pay_yinlian);
+		mLl_balance = (LinearLayout) view.findViewById(R.id.ll_pay_balance);
+		mLl_zhifubao = (LinearLayout) view.findViewById(R.id.ll_pay_zhifubao);
+		mLl_weixin = (LinearLayout) view.findViewById(R.id.ll_pay_weixin);
+		mLl_yinlian = (LinearLayout) view.findViewById(R.id.ll_pay_yinlian);
+		mTv_pay_money = (TextView) view.findViewById(R.id.tv_pay_money);
+		pay_type = (TextView) view.findViewById(R.id.pay_type);
+		pay_name = (TextView) view.findViewById(R.id.pay_name);
+		mTv_monet_enough = (TextView) view.findViewById(R.id.tv_money_enough);
+		mTv_pay_yue = (TextView) view.findViewById(R.id.tv_yue);
+		uuid = SharePrefUtil.getString(UniappPayPointActivity.this, "uuid", "");
+		initIntent();
+		initListener();
+		getUserResult();
+		return view;
+	}
+
+	private void initIntent() {
+		// TODO Auto-generated method stub
+		pay_money = getIntent().getStringExtra("money");
+		product_id = getIntent().getStringExtra("product_id");
+		type = getIntent().getStringExtra("type");
+		order_id = getIntent().getStringExtra("order_id");
+		jifen = getIntent().getStringExtra("jifen");
+		//购买积分
+		pay = Double.parseDouble(pay_money);
+		mTv_pay_money.setText(paymoney);
+		pay_type.setVisibility(View.GONE);
+		pay_name.setText("您购买了"+jifen+"积分");
+	}
+
+	private void initListener() {
+		// TODO Auto-generated method stub
+		mBt_pay.setOnClickListener(this);
+		mCb_balance.setOnCheckedChangeListener(this);
+		mCb_zhifubao.setOnCheckedChangeListener(this);
+		mCb_weixin.setOnCheckedChangeListener(this);
+		mCb_yinlian.setOnCheckedChangeListener(this);
+		mLl_balance.setOnClickListener(this);
+		mLl_weixin.setOnClickListener(this);
+		mLl_yinlian.setOnClickListener(this);
+		mLl_zhifubao.setOnClickListener(this);
+	}
+
+	@Override
+	public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+		// TODO Auto-generated method stub
+
+		// AGP 8.0+ R.id 不再是 final 常量，不能用于 switch，改用 if-else
+		int buttonId = buttonView.getId();
+		if (buttonId == R.id.cb_pay_balance) {
+			if (isChecked) {
+				payChannel = "balance";
+				mCb_zhifubao.setChecked(false);
+				mCb_weixin.setChecked(false);
+				mCb_yinlian.setChecked(false);
+				if (NoMoney) {
+					payChannel = "0";
+				}
+			}
+			else
+			{
+				payChannel = "0";
+				if(mCb_weixin.isChecked())
+				{
+					payChannel = CHANNEL_WEIXIN;
+				}
+			}
+			if (NoMoney) {
+				ToastUtil.showMessage("余额不足");
+				mCb_balance.setChecked(false);
+			}
+		} else if (buttonId == R.id.cb_pay_zhifubao) {
+			if (isChecked) {
+				payChannel = CHANNEL_ZHIFUBAO;
+				mCb_balance.setChecked(false);
+				mCb_weixin.setChecked(false);
+				mCb_yinlian.setChecked(false);
+			}
+		} else if (buttonId == R.id.cb_pay_weixin) {
+			if (isChecked) {
+				payChannel = CHANNEL_WEIXIN;
+				mCb_balance.setChecked(false);
+				mCb_zhifubao.setChecked(false);
+				mCb_yinlian.setChecked(false);
+			}
+			else
+			{
+				payChannel = "0";
+				if(mCb_balance.isChecked())
+				{
+					payChannel = "balance";
+				}
+			}
+		} else if (buttonId == R.id.cb_pay_yinlian) {
+			if (isChecked) {
+				payChannel = CHANNEL_YINLAN;
+				mCb_balance.setChecked(false);
+				mCb_zhifubao.setChecked(false);
+				mCb_weixin.setChecked(false);
+			}
+		}
+	}
+
+	@Override
+	public ResultState onLoad() {
+		// TODO Auto-generated method stub
+		return ResultState.STATE_SUCCESSED;
+	}
+
+	@Override
+	protected void processClick(View v) {
+		// TODO Auto-generated method stub
+		// AGP 8.0+ R.id 不再是 final 常量，不能用于 switch，改用 if-else
+		int id = v.getId();
+		if (id == R.id.bt_pay) {
+//            if(payChannel!=null)
+//			{
+//				PayReq request = new PayReq();
+//				request.appId = Constant.WeId;
+//				request.partnerId = Constant.PayId;
+//				request.prepayId= "1101000000140415649af9fc314aa427";
+//				request.packageValue = "Sign=WXPay";
+//				request.nonceStr= "1101000000140429eb40476f8896f4c9";
+//				request.timeStamp= "1398746574";
+//				request.sign="oR9d8PuhnIc+YZ8cBHFCwfgpaK9gd7vaRvkYD7rthRAZ+QBhcCYL21N7cHCTUxbQ+EAt6Uy+lwSN22f5YZvI45MLko8Pfso0jm46v5hqcVwrk6uddkGuT+Cdvu4WBqDzaDjnNa5UK3GfE1Wfl2gHxIIY5lLdUgWFts17D4WuolLLkiFZV+JSHMvH7eaLdT9N5GBovBwu5yYKUR7skR8Fu+LozcSqQixnlEZUfyE55feLOQTUYzLmR9pNtPbPsu6WVhbNHMS3Ss2+AehHvz+n64GDmXxbX++IOBvm2olHu3PsO";
+//				api.sendReq(request);
+//				return;
+//			}
+
+
+			if (!payChannel.equals("0")) {
+				// 按钮进入“支付中...”状态，并禁止再次点击
+				if (mBt_pay != null) {
+					mBt_pay.setEnabled(false);
+					mBt_pay.setText("支付中...");
+				}
+				if(OneClickUtil.isFastDoubleClick(R.id.bt_pay,1500))
+				{
+
+					return;
+				}
+				if (payChannel.equals("balance")) {
+					if (NoMoney) {
+						ToastUtil.showMessage("请选择付款方式");
+						mCb_balance.setChecked(false);
+					}else {
+						sendMessageDialog();
+					}
+
+				}  else{
+
+					getPayChargeResult("");
+				}
+
+			} else {
+				ToastUtil.showMessage("请选择付款方式");
+			}
+		} else if (id == R.id.ll_pay_balance) {
+			payChannel = "balance";
+			mCb_balance.setChecked(true);
+			mCb_zhifubao.setChecked(false);
+			mCb_weixin.setChecked(false);
+			mCb_yinlian.setChecked(false);
+
+			if (NoMoney) {
+				ToastUtil.showMessage("余额不足");
+				mCb_balance.setChecked(false);
+			}
+		} else if (id == R.id.ll_pay_zhifubao) {
+			payChannel = CHANNEL_ZHIFUBAO;
+			mCb_balance.setChecked(false);
+			mCb_zhifubao.setChecked(true);
+			mCb_weixin.setChecked(false);
+			mCb_yinlian.setChecked(false);
+		} else if (id == R.id.ll_pay_weixin) {
+			payChannel = CHANNEL_WEIXIN;
+			mCb_balance.setChecked(false);
+			mCb_zhifubao.setChecked(false);
+			mCb_weixin.setChecked(true);
+			mCb_yinlian.setChecked(false);
+		} else if (id == R.id.ll_pay_yinlian) {
+
+			payChannel = CHANNEL_YINLAN;
+			mCb_balance.setChecked(false);
+			mCb_zhifubao.setChecked(false);
+			mCb_weixin.setChecked(false);
+			mCb_yinlian.setChecked(true);
+		}
+	}
+
+	public static final int GET_CREATE_ORDER_RESULT = 101;
+	public static final int GET_USER_DATA_RESULT = 201;
+	public static final int GET_PAYR_SUCCESS_RESULT = 301;
+	public static final int PAYPOINTORDER = 401;
+
+	// public void getPayResult() {
+	// String uuid = SharePrefUtil.getString(ct, Constant.USERID, "");
+	// Map<String, String> param = new HashMap<String, String>();
+	// param.put("uid", uuid);
+	// param.put("amount", 1 + "");
+	// param.put("subject", "dasdkljh");
+	// param.put("body", "asdasd");
+	// sendParamtoNet(Url.getCreateOrder, param, GET_CREATE_ORDER_RESULT,
+	// mActivity, true);
+	// }
+
+	public void getPayChargeResult(String password) {
+		Map<String, String> param = new HashMap<String, String>();
+//		param.put("amount", pay_money);
+//		param.put("order_id", order_id);
+//		param.put("expert_uuid", uuid);
+		param.put("trade_no", order_id);
+		param.put("channel", payChannel);
+
+		if (CHANNEL_YINLAN.equals(payChannel)){
+			ToastUtil.showMessage("暂不支持");
+		}else {
+			if (StringUtil.isEmpty(jifen)){//不是购买积分
+				if (payChannel.equals("balance")) {
+					param.put("pwd", password);
+				}
+
+
+				sendJsonPostParamtoNetSignMD5(Url.getPayXinYiOrder, param, GET_CREATE_ORDER_RESULT, this);
+			}else {//购买积分
+				if (payChannel.equals("balance")) {
+					param.put("pwd", password);
+				}else {
+					param.put("pwd", "");
+				}
+				sendJsonPostParamtoNetSignMD5(Url.payPointOrder, param, GET_CREATE_ORDER_RESULT, this);
+			}
+		}
+	}
+	public void getUserResult() {
+		Map<String, String> param = new HashMap<String, String>();
+//		param.put("user_uuid", uuid);
+		sendJsonPostParamtoNetSignMD5(Url.getRetrieveUser, param, GET_USER_DATA_RESULT,
+				this);
+	}
+
+	// 完成订单
+	public void getPaySucceedResult() {
+		Map<String, String> param = new HashMap<String, String>();
+		param.put("order_id", order_id);
+		if (StringUtil.isEmpty(jifen)){
+			sendParamtoNet(Url.getpayXinyiOrderSucceed, param,
+					GET_PAYR_SUCCESS_RESULT, this, true);
+		}else {
+
+			sendParamtoNet(Url.payPointOrderSucceed, param,
+					GET_PAYR_SUCCESS_RESULT, this, true);
+		}
+
+
+	}
+
+	@Override
+	public void onCallbackFromThread(String resultJson) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void onCallBackFromThread(String resultJson, int resultCode) {
+		Log.d("WXEntryActivity",resultCode+"  "+resultJson);
+		// TODO Auto-generated method stub
+		switch (resultCode) {
+			case 102:
+				try {
+					JSONObject jsonObject=new JSONObject(resultJson);
+					if("200".equals(jsonObject.getString("code")))
+					{
+						if("SUCCESS".equals(jsonObject.getJSONObject("data").getString("tradeState")))
+						{
+							paySUCCESS = true;
+							Log.d("aaa","1  paySUCCESS  "+paySUCCESS);
+							aaa();
+						}
+					}
+
+				} catch (JSONException e) {
+					e.printStackTrace();
+				}
+
+				break;
+		case GET_USER_DATA_RESULT:
+//			RetrieveUser bean = GsonTools.fromGsonToBean(resultJson,
+//					RetrieveUser.class);
+			double yue = 0.0;
+
+				try {
+					JSONObject jsonObject = new JSONObject(resultJson);
+					if (!"200".equals(jsonObject.getString("code"))) {
+						ToastUtil.showMessage(jsonObject.getString("msg"));
+						return;
+					}
+					yue = jsonObject.getDouble("data");
+
+				} catch (JSONException e) {
+					e.printStackTrace();
+
+				}
+
+			mTv_pay_yue.setText("余额支付￥" + String.format("%.2f", yue / 100));
+			if (pay > yue) {
+				NoMoney = true;
+				mTv_monet_enough.setVisibility(View.VISIBLE);
+			} else {
+				mTv_monet_enough.setVisibility(View.INVISIBLE);
+
+			}
+
+
+			break;
+		case GET_CREATE_ORDER_RESULT:
+			if(payChannel.equals("balance"))
+			{
+				try {
+					JSONObject jsonObject=new JSONObject(resultJson);
+					if("200".equals(jsonObject.getString("code")))
+					{
+						paySUCCESS = true;
+						Log.d("aaa","2 paySUCCESS  "+paySUCCESS);
+						aaa();
+					}
+					else
+					{
+						ToastUtil.showToast(jsonObject.getString("msg"));
+					}
+				} catch (JSONException e) {
+					e.printStackTrace();
+				}
+
+				return;
+			}
+			PayWechatBean payBean= GsonTools.fromGsonToBean(resultJson,
+					PayWechatBean.class);
+			if(payBean!=null&&"200".equals(payBean.getCode()))
+			{
+				PayReq request = new PayReq();
+				request.appId = payBean.getData().getAppid();
+				request.partnerId = payBean.getData().getPartnerid();
+				request.prepayId= payBean.getData().getPrepayid();
+				request.packageValue = payBean.getData().getPackage_str();
+				request.nonceStr= payBean.getData().getNoncestr();
+				request.timeStamp= payBean.getData().getTimestamp();
+				request.sign=payBean.getData().getSign();
+				api.sendReq(request);
+//				Log.d("WXEntryActivity","pay  "+pay);
+
+			}
+			else
+			{
+				ToastUtil.showToast(payBean.getMessage());
+			}
+//			LogUtil.i("resultJson = "+resultJson);
+//			if (payChannel.equals("")) {
+//				if ("\"SUCCEED\"".equals(resultJson)) {
+//					getPaySucceedResult();
+//				} else if("\"密码错误\"".equals(resultJson)) {
+//					ToastUtil.showMessage("密码错误");
+//				}else{
+//					ToastUtil.showMessage("支付失败");
+//				}
+//
+//			} else {
+//				String result = StringEscapeUtils.unescapeJava(resultJson);
+//				if (!StringUtil.isEmpty(result)) {
+//					String sssss = result.substring(1, result.length() - 1);
+//					Pingpp.createPayment(PayActivity.this, sssss);
+//				} else {
+//					ToastUtil.showMessage("服务器异常");
+//				}
+//
+//			}
+
+			break;
+		case GET_PAYR_SUCCESS_RESULT:
+			if ("\"SUCCEED\"".equals(resultJson)) {
+				ToastUtil.showMessage("支付成功");
+				paySUCCESS = true;
+				Log.d("aaa","3 paySUCCESS  "+paySUCCESS);
+				aaa();
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	private ECAlertDialog buildAlert;
+
+	public void aaa() {
+		buildAlert = ECAlertDialog.buildAlert(UniappPayPointActivity.this, "购买"+jifen+"积分成功，谢谢您对肝胆相照平台的支持",
+				null, "确定", new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						// TODO Auto-generated method stub
+						buildAlert.dismiss();
+					}
+				}, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						LogUtil.i("paySucess", "222" + type);
+						IUniMP uniapp_MP_cash = BaseApplication.getUniMPCaches().get(uniapp_mp_appid);
+						if(uniapp_MP_cash != null && uniapp_MP_cash.isRunning()){
+							com.alibaba.fastjson.JSONObject pageParams = new com.alibaba.fastjson.JSONObject();
+							String targetPath = "";
+							if(type.equals("video")){
+								pageParams.put("id",product_id);
+								targetPath = "/pages_app/videoDetail/videoDetail";
+								UniappUtil.showUniMp(UniappPayPointActivity.this, targetPath, pageParams);
+							}else if(type.equals("goods")){
+								JSONObject jsonObject = new JSONObject();
+								try {
+									jsonObject.put("order_id", order_id);
+									jsonObject.put("type", "BuyPoint");
+								} catch (JSONException e) {
+									throw new RuntimeException(e);
+								}
+								uniapp_MP_cash.sendUniMPEvent("paySuccess", jsonObject);
+								uniapp_MP_cash.showUniMP();
+							}else{
+								targetPath = "/pages_app/myPoint/myPoint";
+								UniappUtil.showUniMp(UniappPayPointActivity.this, targetPath, pageParams);
+							}
+						}
+						UniappPayPointActivity.this.finish();
+						buildAlert.dismiss();
+					}
+				});
+		buildAlert.setTitle("提示");
+		buildAlert.setTitleColor(UniappPayPointActivity.this.getResources().getColor(R.color.top_title));
+		buildAlert.setCanceledOnTouchOutside(false);
+		buildAlert.show();
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		// TODO Auto-generated method stub
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == Pingpp.REQUEST_CODE_PAYMENT) {
+			if (resultCode == Activity.RESULT_OK) {
+				String result = data.getExtras().getString("pay_result");
+				if (result.equals("success")) {
+					getPaySucceedResult();
+				}
+				// 处理返回值
+				// "success" - 支付成功
+				// "fail" - 支付失败
+				// "cancel" - 取消支付
+				// "invalid" - 支付插件未安装（一般是微信客户端未安装的情况）
+				String errorMsg = data.getExtras().getString("error_msg"); // 错误信息
+				String extraMsg = data.getExtras().getString("extra_msg"); // 错误信息
+				// showMsg(result, errorMsg, extraMsg);
+				if (result.equals("cancel")) {
+					ToastUtil.showMessage("已取消支付");
+				}
+				if (result.equals("fail")) {
+					ToastUtil.showMessage("支付失败，请重新支付");
+				}
+				if (result.equals("invalid")) {
+					ToastUtil.showMessage("请安装微信客户端");
+				}
+			}
+		}
+	}
+
+	public void showMsg(String title, String msg1, String msg2) {
+		String str = title;
+		if (null != msg1 && msg1.length() != 0) {
+			str += "\n" + msg1;
+		}
+		if (null != msg2 && msg2.length() != 0) {
+			str += "\n" + msg2;
+		}
+		Builder builder = new Builder(this);
+		builder.setMessage(str);
+		builder.setTitle("提示");
+		builder.setPositiveButton("OK", null);
+		builder.create().show();
+	}
+
+	private Dialog dialog;
+	EditText mEt_getpassword;
+
+	protected void sendMessageDialog() {
+		// TODO Auto-generated method stub
+
+		LayoutInflater inflater = LayoutInflater.from(this);
+		RelativeLayout layout = (RelativeLayout) inflater.inflate(
+				R.layout.dialog_get_password, null);
+		// 2. 新建对话框对象
+		dialog = new Builder(this,
+				R.style.Theme_Light_FullScreenDialogAct).create();
+		dialog.setCancelable(false);
+		dialog.show();
+		Window window =dialog.getWindow();
+//                    window.setGravity(Gravity.CENTER);
+		WindowManager.LayoutParams layoutParams = window.getAttributes();
+		layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+		layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+		window.setAttributes(layoutParams);
+		dialog.getWindow().setContentView(layout);
+		// 只用下面这一行弹出对话框时需要点击输入框才能弹出软键盘
+		dialog.getWindow().clearFlags(
+				WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+		Button btn_cancel = (Button) layout.findViewById(R.id.dilaog_cancel);
+		Button btn_sure = (Button) layout.findViewById(R.id.dilaog_sure);
+		mEt_getpassword = (EditText) layout.findViewById(R.id.et_get_password);
+		btn_cancel.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+				hideSoftKeyboard(v);
+				dialog.dismiss();
+			}
+		});
+		btn_sure.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+				String password = mEt_getpassword.getText().toString().trim();
+				if (!StringUtil.isEmpty(password)) {
+					getPayChargeResult(password);
+					hideSoftKeyboard(v);
+					dialog.dismiss();
+				} else {
+					ToastUtil.showMessage("请输入您的登陆密码");
+				}
+
+			}
+		});
+
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		if (paySUCCESS) {
+			Log.d("aaa","4 paySUCCESS  "+paySUCCESS);
+			aaa();
+		} else {
+			getOrderStatus();
+		}
+
+//		if (!paySUCCESS) {
+//			getOrderStatus();
+//		}
+	}
+	private void getOrderStatus()
+	{   if(order_id==null)
+	{
+		order_id=getIntent().getStringExtra("order_id");
+	}
+		Map<String, String> param = new HashMap<>();
+//		param.put("trade_no","99361202930720");
+		param.put("trade_no",order_id);
+		Log.d("WXEntryActivity","orderId  "+order_id);
+		sendJsonPostParamtoNetSignMD5(Url.getOrderStatus,param,102,this);
+
+	}
+	@Override
+	public void finish() {
+		// TODO Auto-generated method stub
+		if (paySUCCESS) {
+			Intent intent = new Intent();
+			setResult(201, intent);
+		}
+		super.finish();
+	}
+
+	@Override
+	protected void onDestroy() {
+		paySUCCESS=false;
+		super.onDestroy();
+	}
+	public void hideSoftKeyboard(View localView) {
+		InputMethodManager inputMethodManager = (InputMethodManager) ct
+				.getSystemService(Context.INPUT_METHOD_SERVICE);
+		if (inputMethodManager != null) {
+//			View localView = ((Activity) ct).getCurrentFocus();
+			if (localView != null && localView.getWindowToken() != null) {
+				IBinder windowToken = localView.getWindowToken();
+				inputMethodManager.hideSoftInputFromWindow(windowToken, 0);
+			}
+		}
+	}
+}